diff options
Diffstat (limited to 'src/mlia/backend/corstone')
| -rw-r--r-- | src/mlia/backend/corstone/install.py | 9 | ||||
| -rw-r--r-- | src/mlia/backend/corstone/performance.py | 8 |
2 files changed, 5 insertions, 12 deletions
diff --git a/src/mlia/backend/corstone/install.py b/src/mlia/backend/corstone/install.py index 5f11d5b..5c18334 100644 --- a/src/mlia/backend/corstone/install.py +++ b/src/mlia/backend/corstone/install.py @@ -19,7 +19,7 @@ from mlia.backend.install import CompoundPathChecker from mlia.backend.install import Installation from mlia.backend.install import PackagePathChecker from mlia.backend.install import StaticPathChecker -from mlia.utils.download import DownloadArtifact +from mlia.utils.download import DownloadConfig from mlia.utils.filesystem import working_directory @@ -159,8 +159,6 @@ def get_corstone_installation(corstone_name: str) -> Installation: archive = corstone_fvp.archive sha256_hash = corstone_fvp.sha256_hash url = ARM_ECOSYSTEM_FVP_URL + archive - filename = archive.split("/")[-1] - version = corstone_fvp.get_fvp_version() expected_files_fvp = corstone_fvp.fvp_expected_files expected_files_vht = corstone_fvp.get_vht_expected_files() backend_subfolder = expected_files_fvp[0].split("FVP")[0] @@ -169,11 +167,8 @@ def get_corstone_installation(corstone_name: str) -> Installation: name=corstone_name, description=corstone_name.capitalize() + " FVP", fvp_dir_name=corstone_name.replace("-", "_"), - download_artifact=DownloadArtifact( - name=corstone_name.capitalize() + " FVP", + download_config=DownloadConfig( url=url, - filename=filename, - version=version, sha256_hash=sha256_hash, ), supported_platforms=["Linux"], diff --git a/src/mlia/backend/corstone/performance.py b/src/mlia/backend/corstone/performance.py index fc50109..fe4e271 100644 --- a/src/mlia/backend/corstone/performance.py +++ b/src/mlia/backend/corstone/performance.py @@ -15,6 +15,7 @@ from mlia.backend.errors import BackendExecutionFailed from mlia.backend.repo import get_backend_repository from mlia.utils.filesystem import get_mlia_resources from mlia.utils.proc import Command +from mlia.utils.proc import OutputLogger from mlia.utils.proc import process_command_output @@ -187,15 +188,12 @@ def get_metrics( ) from err output_parser = GenericInferenceOutputParser() - - def redirect_to_log(line: str) -> None: - """Redirect FVP output to the logger.""" - logger.debug(line.strip()) + output_logger = OutputLogger(logger) try: process_command_output( command, - [output_parser, redirect_to_log], + [output_parser, output_logger], ) except subprocess.CalledProcessError as err: raise BackendExecutionFailed("Backend execution failed.") from err |