diff options
| author | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2023-03-01 11:03:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-01 11:03:12 +0100 |
| commit | 07e251c887a4daffdcc18d6738517687595eef0f (patch) | |
| tree | 382d194ae31488711f42da802be789a8bfdbe794 | |
| parent | f9f51cb930bc58d8009b636b2fe17f68c4a314b9 (diff) | |
| download | spack-07e251c887a4daffdcc18d6738517687595eef0f.tar.gz spack-07e251c887a4daffdcc18d6738517687595eef0f.tar.bz2 spack-07e251c887a4daffdcc18d6738517687595eef0f.tar.xz spack-07e251c887a4daffdcc18d6738517687595eef0f.zip | |
Remove handling of deprecated target names (graviton) (#35537)
* Update target names for Gitlab pipelines
* Remove handling of deprecated names for graviton
4 files changed, 3 insertions, 16 deletions
diff --git a/lib/spack/spack/target.py b/lib/spack/spack/target.py index d911eb4a25..06e87dd10c 100644 --- a/lib/spack/spack/target.py +++ b/lib/spack/spack/target.py @@ -3,7 +3,6 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) import functools -import warnings import archspec.cpu @@ -33,14 +32,6 @@ def _ensure_other_is_target(method): return _impl -#: Translation table from archspec deprecated names -_DEPRECATED_ARCHSPEC_NAMES = { - "graviton": "cortex_a72", - "graviton2": "neoverse_n1", - "graviton3": "neoverse_v1", -} - - class Target(object): def __init__(self, name, module_name=None): """Target models microarchitectures and their compatibility. @@ -52,10 +43,6 @@ class Target(object): like Cray (e.g. craype-compiler) """ if not isinstance(name, archspec.cpu.Microarchitecture): - if name in _DEPRECATED_ARCHSPEC_NAMES: - msg = "'target={}' is deprecated, use 'target={}' instead" - name, old_name = _DEPRECATED_ARCHSPEC_NAMES[name], name - warnings.warn(msg.format(old_name, name)) name = archspec.cpu.TARGETS.get(name, archspec.cpu.generic_microarchitecture(name)) self.microarchitecture = name self.module_name = module_name diff --git a/share/spack/gitlab/cloud_pipelines/stacks/aws-ahug-aarch64/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/aws-ahug-aarch64/spack.yaml index 800df31b92..bd0aa1170b 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/aws-ahug-aarch64/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/aws-ahug-aarch64/spack.yaml @@ -218,7 +218,7 @@ spack: - target: - 'target=aarch64' - - 'target=graviton2' + - 'target=neoverse_n1' specs: diff --git a/share/spack/gitlab/cloud_pipelines/stacks/aws-isc-aarch64/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/aws-isc-aarch64/spack.yaml index 6bc1cc4975..6c36b4e1f2 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/aws-isc-aarch64/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/aws-isc-aarch64/spack.yaml @@ -125,7 +125,7 @@ spack: - target: - 'target=aarch64' - - 'target=graviton2' + - 'target=neoverse_n1' specs: diff --git a/share/spack/gitlab/cloud_pipelines/stacks/radiuss-aws-aarch64/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/radiuss-aws-aarch64/spack.yaml index 273f6167a9..f5a12df7b2 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/radiuss-aws-aarch64/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/radiuss-aws-aarch64/spack.yaml @@ -43,7 +43,7 @@ spack: - target: - 'target=aarch64' - - 'target=graviton2' + - 'target=neoverse_n1' specs: |