derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

python: Rename 'artifact' to 'resources' in downloader

Browse Source 
As part of an upcoming change in the gem5 resources resources.json file,
https://gem5-review.googlesource.com/c/public/gem5-resources/+/51169,
the terminology 'artifact' will be replaced with 'resources'. This is
in-keeping with the terminology we use elsewhere in the project. This
patch is designed to work with both 'artifact' and 'resource' type name
while the resources.json schema is changed.

Change-Id: Ia1facc86000b9abf1e426b9b0eb0c7e0245bdcfa
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/51328
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
This commit is contained in:
Bobby R. Bruce
2021-10-06 16:33:45 -07:00
parent f5ea0fa3f8
commit 1e7a312e03
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/python/gem5/resources/downloader.py
View File

@@ -88,12 +88,15 @@ def _get_resources(resources_group: Dict) -> Dict[str, Dict]:
to_return = {}
for resource in resources_group:
if resource["type"] == "artifact":
# If the type is "artifact" then we add it directly to the map
# 'artifact' is the old naming, we keep it here for
# backwards compatibility, but it can be removed with time:
# https://gem5-review.googlesource.com/c/public/gem5-resources/+/51169.
if resource["type"] == "artifact" or resource["type"] == "resource":
# If the type is "resource" then we add it directly to the map
# after a check that the name is unique.
if resource["name"] in to_return.keys():
raise Exception(
"Error: Duplicate artifact with name '{}'.".format(
"Error: Duplicate resource with name '{}'.".format(
resource["name"]
)
)
@@ -108,7 +111,7 @@ def _get_resources(resources_group: Dict) -> Dict[str, Dict]:
# the resources.json file. The resources names need to be
# unique keyes.
raise Exception(
"Error: Duplicate artifacts with names: {}.".format(
"Error: Duplicate resources with names: {}.".format(
str(intersection)
)
)
@@ -179,16 +182,16 @@ def get_resources_json_obj(resource_name: str) -> Dict:
:raises Exception: An exception is raised if the specified resources does
not exist.
"""
artifact_map = _get_resources(_get_resources_json()["resources"])
resource_map = _get_resources(_get_resources_json()["resources"])
if resource_name not in artifact_map:
if resource_name not in resource_map:
raise Exception(
"Error: Resource with name '{}' does not exist".format(
resource_name
)
)
return artifact_map[resource_name]
return resource_map[resource_name]
def get_resource(