diff options
| author | Cory Bloor <Cordell.Bloor@amd.com> | 2022-12-21 12:21:20 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-21 20:21:20 +0100 |
| commit | e60e74694f4464c57c7637ce315f4b5a05492112 (patch) | |
| tree | ef2f32d5dc85445928d18bd18f59493d22a850ed /var | |
| parent | 2ef026b8c69354ea738bc2340eaac9954734a5bb (diff) | |
| download | spack-e60e74694f4464c57c7637ce315f4b5a05492112.tar.gz spack-e60e74694f4464c57c7637ce315f4b5a05492112.tar.bz2 spack-e60e74694f4464c57c7637ce315f4b5a05492112.tar.xz spack-e60e74694f4464c57c7637ce315f4b5a05492112.zip | |
rocm: make amdgpu_target sticky (#34591)
The sticky property will prevent clingo from changing the amdgpu_target
to work around conflicts. This is the same behaviour as was adopted for
cuda_arch in 055c9d125d29606947f2fd88a06e279667a74648.
Diffstat (limited to 'var')
10 files changed, 13 insertions, 11 deletions
diff --git a/var/spack/repos/builtin/packages/rccl/package.py b/var/spack/repos/builtin/packages/rccl/package.py index 8e6e5ef973..15280cc40c 100644 --- a/var/spack/repos/builtin/packages/rccl/package.py +++ b/var/spack/repos/builtin/packages/rccl/package.py @@ -101,7 +101,7 @@ class Rccl(CMakePackage): amdgpu_targets = ROCmPackage.amdgpu_targets - variant("amdgpu_target", values=auto_or_any_combination_of(*amdgpu_targets)) + variant("amdgpu_target", values=auto_or_any_combination_of(*amdgpu_targets), sticky=True) variant( "build_type", default="Release", diff --git a/var/spack/repos/builtin/packages/rocalution/package.py b/var/spack/repos/builtin/packages/rocalution/package.py index 9753dbd371..ef87dfa2b2 100644 --- a/var/spack/repos/builtin/packages/rocalution/package.py +++ b/var/spack/repos/builtin/packages/rocalution/package.py @@ -103,7 +103,7 @@ class Rocalution(CMakePackage): amdgpu_targets = ROCmPackage.amdgpu_targets - variant("amdgpu_target", values=auto_or_any_combination_of(*amdgpu_targets)) + variant("amdgpu_target", values=auto_or_any_combination_of(*amdgpu_targets), sticky=True) variant( "build_type", default="Release", diff --git a/var/spack/repos/builtin/packages/rocblas/package.py b/var/spack/repos/builtin/packages/rocblas/package.py index 00fa3b46ec..31346227be 100644 --- a/var/spack/repos/builtin/packages/rocblas/package.py +++ b/var/spack/repos/builtin/packages/rocblas/package.py @@ -101,7 +101,7 @@ class Rocblas(CMakePackage): amdgpu_targets = ROCmPackage.amdgpu_targets - variant("amdgpu_target", values=auto_or_any_combination_of(*amdgpu_targets)) + variant("amdgpu_target", values=auto_or_any_combination_of(*amdgpu_targets), sticky=True) variant("tensile", default=True, description="Use Tensile as a backend") variant( "build_type", diff --git a/var/spack/repos/builtin/packages/rocfft/package.py b/var/spack/repos/builtin/packages/rocfft/package.py index 5dfca74379..f8eaaa55d8 100644 --- a/var/spack/repos/builtin/packages/rocfft/package.py +++ b/var/spack/repos/builtin/packages/rocfft/package.py @@ -104,8 +104,10 @@ class Rocfft(CMakePackage): values=("Release", "Debug", "RelWithDebInfo"), description="CMake build type", ) - variant("amdgpu_target", values=auto_or_any_combination_of(*amdgpu_targets)) - variant("amdgpu_target_sram_ecc", values=auto_or_any_combination_of(*amdgpu_targets)) + variant("amdgpu_target", values=auto_or_any_combination_of(*amdgpu_targets), sticky=True) + variant( + "amdgpu_target_sram_ecc", values=auto_or_any_combination_of(*amdgpu_targets), sticky=True + ) depends_on("cmake@3.16:", type="build", when="@4.5.0:") depends_on("cmake@3.5:", type="build") diff --git a/var/spack/repos/builtin/packages/rocprim/package.py b/var/spack/repos/builtin/packages/rocprim/package.py index 27e6422a48..b2f732b47a 100644 --- a/var/spack/repos/builtin/packages/rocprim/package.py +++ b/var/spack/repos/builtin/packages/rocprim/package.py @@ -95,7 +95,7 @@ class Rocprim(CMakePackage): amdgpu_targets = ROCmPackage.amdgpu_targets - variant("amdgpu_target", values=auto_or_any_combination_of(*amdgpu_targets)) + variant("amdgpu_target", values=auto_or_any_combination_of(*amdgpu_targets), sticky=True) variant( "build_type", default="Release", diff --git a/var/spack/repos/builtin/packages/rocrand/package.py b/var/spack/repos/builtin/packages/rocrand/package.py index a868b08cb0..3d70af072e 100644 --- a/var/spack/repos/builtin/packages/rocrand/package.py +++ b/var/spack/repos/builtin/packages/rocrand/package.py @@ -101,7 +101,7 @@ class Rocrand(CMakePackage): amdgpu_targets = ROCmPackage.amdgpu_targets - variant("amdgpu_target", values=auto_or_any_combination_of(*amdgpu_targets)) + variant("amdgpu_target", values=auto_or_any_combination_of(*amdgpu_targets), sticky=True) variant( "build_type", default="Release", diff --git a/var/spack/repos/builtin/packages/rocsolver/package.py b/var/spack/repos/builtin/packages/rocsolver/package.py index 4f5859af98..20c4b5b9bf 100644 --- a/var/spack/repos/builtin/packages/rocsolver/package.py +++ b/var/spack/repos/builtin/packages/rocsolver/package.py @@ -23,7 +23,7 @@ class Rocsolver(CMakePackage): amdgpu_targets = ROCmPackage.amdgpu_targets - variant("amdgpu_target", values=auto_or_any_combination_of(*amdgpu_targets)) + variant("amdgpu_target", values=auto_or_any_combination_of(*amdgpu_targets), sticky=True) variant( "optimal", default=True, diff --git a/var/spack/repos/builtin/packages/rocsparse/package.py b/var/spack/repos/builtin/packages/rocsparse/package.py index b36d8aa89e..13fec9f5ee 100644 --- a/var/spack/repos/builtin/packages/rocsparse/package.py +++ b/var/spack/repos/builtin/packages/rocsparse/package.py @@ -25,7 +25,7 @@ class Rocsparse(CMakePackage): amdgpu_targets = ROCmPackage.amdgpu_targets - variant("amdgpu_target", values=auto_or_any_combination_of(*amdgpu_targets)) + variant("amdgpu_target", values=auto_or_any_combination_of(*amdgpu_targets), sticky=True) variant( "build_type", default="Release", diff --git a/var/spack/repos/builtin/packages/rocthrust/package.py b/var/spack/repos/builtin/packages/rocthrust/package.py index 19ed0b7010..2eb8d7c959 100644 --- a/var/spack/repos/builtin/packages/rocthrust/package.py +++ b/var/spack/repos/builtin/packages/rocthrust/package.py @@ -100,7 +100,7 @@ class Rocthrust(CMakePackage): # the rocthrust library itself is header-only, but the build_type and amdgpu_target # are relevant to the test client - variant("amdgpu_target", values=auto_or_any_combination_of(*amdgpu_targets)) + variant("amdgpu_target", values=auto_or_any_combination_of(*amdgpu_targets), sticky=True) variant( "build_type", default="Release", diff --git a/var/spack/repos/builtin/packages/rocwmma/package.py b/var/spack/repos/builtin/packages/rocwmma/package.py index 7fe59679cc..a0b9d121d5 100644 --- a/var/spack/repos/builtin/packages/rocwmma/package.py +++ b/var/spack/repos/builtin/packages/rocwmma/package.py @@ -35,7 +35,7 @@ class Rocwmma(CMakePackage): # releases amdgpu_targets = ("gfx908:xnack-", "gfx90a", "gfx90a:xnack-", "gfx90a:xnack+") - variant("amdgpu_target", values=auto_or_any_combination_of(*amdgpu_targets)) + variant("amdgpu_target", values=auto_or_any_combination_of(*amdgpu_targets), sticky=True) variant( "build_type", default="Release", |