stdlib, resources: removed deprecated if statement in obtain_resource for workload resources (#611)

- The resources field in workload now changed to a dict of id and
version from a string with just the id.
There was an if statement added to support both versions in develop.
Removing the if statement so that 23.1 supports the new changes only.

Change-Id: Id8dc3f932f53a156e4fb609a215db7d85bd81a44
This commit is contained in:
Harshil Patel
2023-11-29 14:27:23 -08:00
committed by GitHub
parent fcbcd1ce72
commit 392086b43d

View File

@@ -965,22 +965,14 @@ def obtain_resource(
assert isinstance(key, str)
value = resource_json["resources"][key]
if isinstance(value, str):
warn(
"Deprecation warning: resources field in workloads has changed"
"from { category: id } to"
"{ category: { id: id, resource_version: resource_version } }"
"The current develop branch of gem5 supports both formats"
"but this will be removed in the 23.1 release."
)
params[key] = obtain_resource(
value,
)
elif isinstance(value, dict):
params[key] = obtain_resource(
value["id"],
resource_version=value["resource_version"],
)
assert isinstance(value, dict)
params[key] = obtain_resource(
value["id"],
resource_version=value["resource_version"],
resource_directory=resource_directory,
clients=clients,
gem5_version=gem5_version,
)
if "additional_params" in resource_json:
for key in resource_json["additional_params"].keys():
assert isinstance(key, str)