From 936c6045fc0686e683c6b3da20967d2e30a7ec87 Mon Sep 17 00:00:00 2001 From: Aiden Grossman <39388941+boomanaiden154@users.noreply.github.com> Date: Wed, 26 Jul 2023 23:08:59 -0700 Subject: ROCm packages: remove build type variants (#39089) After #36679, the default build type is Release, so there is no need to explicitly set the build type as a custom variant. --- var/spack/repos/builtin/packages/atmi/package.py | 7 ------- var/spack/repos/builtin/packages/comgr/package.py | 7 ------- var/spack/repos/builtin/packages/hip-rocclr/package.py | 7 ------- var/spack/repos/builtin/packages/hip/package.py | 7 ------- var/spack/repos/builtin/packages/hipblas/package.py | 7 ------- var/spack/repos/builtin/packages/hipcub/package.py | 7 ------- var/spack/repos/builtin/packages/hipfft/package.py | 7 ------- var/spack/repos/builtin/packages/hipfort/package.py | 7 ------- var/spack/repos/builtin/packages/hipify-clang/package.py | 6 ------ var/spack/repos/builtin/packages/hipsparse/package.py | 7 ------- var/spack/repos/builtin/packages/hsa-rocr-dev/package.py | 6 ------ var/spack/repos/builtin/packages/hsakmt-roct/package.py | 6 ------ var/spack/repos/builtin/packages/llvm-amdgpu/package.py | 6 ------ var/spack/repos/builtin/packages/migraphx/package.py | 7 ------- var/spack/repos/builtin/packages/miopen-hip/package.py | 7 ------- var/spack/repos/builtin/packages/miopen-opencl/package.py | 7 ------- var/spack/repos/builtin/packages/miopengemm/package.py | 7 ------- var/spack/repos/builtin/packages/mivisionx/package.py | 6 ------ var/spack/repos/builtin/packages/rccl/package.py | 6 ------ var/spack/repos/builtin/packages/rdc/package.py | 7 ------- var/spack/repos/builtin/packages/rocalution/package.py | 6 ------ var/spack/repos/builtin/packages/rocblas/package.py | 6 ------ var/spack/repos/builtin/packages/rocfft/package.py | 6 ------ var/spack/repos/builtin/packages/rocm-bandwidth-test/package.py | 7 ------- var/spack/repos/builtin/packages/rocm-clang-ocl/package.py | 7 ------- var/spack/repos/builtin/packages/rocm-cmake/package.py | 7 ------- var/spack/repos/builtin/packages/rocm-dbgapi/package.py | 7 ------- var/spack/repos/builtin/packages/rocm-debug-agent/package.py | 7 ------- var/spack/repos/builtin/packages/rocm-device-libs/package.py | 7 ------- var/spack/repos/builtin/packages/rocm-opencl/package.py | 7 ------- var/spack/repos/builtin/packages/rocm-smi-lib/package.py | 6 ------ var/spack/repos/builtin/packages/rocm-tensile/package.py | 6 ------ var/spack/repos/builtin/packages/rocm-validation-suite/package.py | 7 ------- var/spack/repos/builtin/packages/rocminfo/package.py | 7 ------- var/spack/repos/builtin/packages/rocprim/package.py | 6 ------ var/spack/repos/builtin/packages/rocprofiler-dev/package.py | 7 ------- var/spack/repos/builtin/packages/rocrand/package.py | 6 ------ var/spack/repos/builtin/packages/rocsolver/package.py | 7 ------- var/spack/repos/builtin/packages/rocsparse/package.py | 6 ------ var/spack/repos/builtin/packages/rocthrust/package.py | 6 ------ var/spack/repos/builtin/packages/roctracer-dev/package.py | 7 ------- 41 files changed, 272 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/atmi/package.py b/var/spack/repos/builtin/packages/atmi/package.py index be8664fcd3..d213104c63 100644 --- a/var/spack/repos/builtin/packages/atmi/package.py +++ b/var/spack/repos/builtin/packages/atmi/package.py @@ -100,13 +100,6 @@ class Atmi(CMakePackage): deprecated=True, ) - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) - depends_on("cmake@3:", type="build") depends_on("rsync") diff --git a/var/spack/repos/builtin/packages/comgr/package.py b/var/spack/repos/builtin/packages/comgr/package.py index 60169c4aca..44455ce534 100644 --- a/var/spack/repos/builtin/packages/comgr/package.py +++ b/var/spack/repos/builtin/packages/comgr/package.py @@ -102,13 +102,6 @@ class Comgr(CMakePackage): deprecated=True, ) - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) - # Disable the hip compile tests. Spack should not be using # /opt/rocm, and this breaks the build when /opt/rocm exists. patch("hip-tests.patch", when="@:4.2.0") diff --git a/var/spack/repos/builtin/packages/hip-rocclr/package.py b/var/spack/repos/builtin/packages/hip-rocclr/package.py index febde10d81..5a5c2bd98d 100644 --- a/var/spack/repos/builtin/packages/hip-rocclr/package.py +++ b/var/spack/repos/builtin/packages/hip-rocclr/package.py @@ -108,13 +108,6 @@ class HipRocclr(CMakePackage): deprecated=True, ) - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) - depends_on("cmake@3:", type="build") depends_on("gl@4.5:", type="link") depends_on("libelf", type="link", when="@3.7.0:3.8.0") diff --git a/var/spack/repos/builtin/packages/hip/package.py b/var/spack/repos/builtin/packages/hip/package.py index 9747193713..23c6f6087e 100644 --- a/var/spack/repos/builtin/packages/hip/package.py +++ b/var/spack/repos/builtin/packages/hip/package.py @@ -106,13 +106,6 @@ class Hip(CMakePackage): deprecated=True, ) - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) - variant("rocm", default=True, description="Enable ROCm support") variant("cuda", default=False, description="Build with CUDA") conflicts("+cuda +rocm", msg="CUDA and ROCm support are mutually exclusive") diff --git a/var/spack/repos/builtin/packages/hipblas/package.py b/var/spack/repos/builtin/packages/hipblas/package.py index 7212facf07..e38d95537f 100644 --- a/var/spack/repos/builtin/packages/hipblas/package.py +++ b/var/spack/repos/builtin/packages/hipblas/package.py @@ -119,13 +119,6 @@ class Hipblas(CMakePackage, CudaPackage, ROCmPackage): conflicts("+cuda +rocm", msg="CUDA and ROCm support are mutually exclusive") conflicts("~cuda ~rocm", msg="CUDA or ROCm support is required") - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) - depends_on("cmake@3.5:", type="build") depends_on("googletest@1.10.0:", type="test") diff --git a/var/spack/repos/builtin/packages/hipcub/package.py b/var/spack/repos/builtin/packages/hipcub/package.py index 95364a2a54..61cf8ae2d2 100644 --- a/var/spack/repos/builtin/packages/hipcub/package.py +++ b/var/spack/repos/builtin/packages/hipcub/package.py @@ -112,13 +112,6 @@ class Hipcub(CMakePackage, CudaPackage, ROCmPackage): conflicts("+cuda +rocm", msg="CUDA and ROCm support are mutually exclusive") conflicts("~cuda ~rocm", msg="CUDA or ROCm support is required") - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) - depends_on("cmake@3.10.2:", type="build", when="@4.2.0:") depends_on("cmake@3.5.1:", type="build") diff --git a/var/spack/repos/builtin/packages/hipfft/package.py b/var/spack/repos/builtin/packages/hipfft/package.py index c0c15611c4..304bd3b43e 100644 --- a/var/spack/repos/builtin/packages/hipfft/package.py +++ b/var/spack/repos/builtin/packages/hipfft/package.py @@ -89,13 +89,6 @@ class Hipfft(CMakePackage, CudaPackage, ROCmPackage): conflicts("+cuda +rocm", msg="CUDA and ROCm support are mutually exclusive") conflicts("~cuda ~rocm", msg="CUDA or ROCm support is required") - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) - depends_on("cmake@3.5:", type="build") depends_on("hip +cuda", when="+cuda") diff --git a/var/spack/repos/builtin/packages/hipfort/package.py b/var/spack/repos/builtin/packages/hipfort/package.py index 0231fd6f56..de741ec583 100644 --- a/var/spack/repos/builtin/packages/hipfort/package.py +++ b/var/spack/repos/builtin/packages/hipfort/package.py @@ -86,13 +86,6 @@ class Hipfort(CMakePackage): deprecated=True, ) - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) - depends_on("cmake@3.0.2:", type="build") depends_on("rocm-cmake@3.8.0:", type="build") diff --git a/var/spack/repos/builtin/packages/hipify-clang/package.py b/var/spack/repos/builtin/packages/hipify-clang/package.py index 5c65c55e96..d8183a8d3f 100644 --- a/var/spack/repos/builtin/packages/hipify-clang/package.py +++ b/var/spack/repos/builtin/packages/hipify-clang/package.py @@ -99,12 +99,6 @@ class HipifyClang(CMakePackage): deprecated=True, ) - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) # the patch was added to install the targets in the correct directory structure # this will fix the issue https://github.com/spack/spack/issues/30711 diff --git a/var/spack/repos/builtin/packages/hipsparse/package.py b/var/spack/repos/builtin/packages/hipsparse/package.py index 51399c59d5..267f7edc18 100644 --- a/var/spack/repos/builtin/packages/hipsparse/package.py +++ b/var/spack/repos/builtin/packages/hipsparse/package.py @@ -116,13 +116,6 @@ class Hipsparse(CMakePackage, CudaPackage, ROCmPackage): conflicts("+cuda +rocm", msg="CUDA and ROCm support are mutually exclusive") conflicts("~cuda ~rocm", msg="CUDA or ROCm support is required") - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) - depends_on("hip +cuda", when="+cuda") depends_on("cmake@3.5:", type="build") diff --git a/var/spack/repos/builtin/packages/hsa-rocr-dev/package.py b/var/spack/repos/builtin/packages/hsa-rocr-dev/package.py index 04d22e2ff8..b000016b84 100644 --- a/var/spack/repos/builtin/packages/hsa-rocr-dev/package.py +++ b/var/spack/repos/builtin/packages/hsa-rocr-dev/package.py @@ -105,12 +105,6 @@ class HsaRocrDev(CMakePackage): deprecated=True, ) - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) variant("shared", default=True, description="Build shared or static library") variant("image", default=True, description="build with or without image support") diff --git a/var/spack/repos/builtin/packages/hsakmt-roct/package.py b/var/spack/repos/builtin/packages/hsakmt-roct/package.py index dc45723a99..5b23e6c8b3 100644 --- a/var/spack/repos/builtin/packages/hsakmt-roct/package.py +++ b/var/spack/repos/builtin/packages/hsakmt-roct/package.py @@ -103,12 +103,6 @@ class HsakmtRoct(CMakePackage): deprecated=True, ) - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) variant("shared", default=True, description="Build shared or static library") depends_on("pkgconfig", type="build", when="@4.5.0:") diff --git a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py index 25d24cfc45..ca6fcd1410 100644 --- a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py +++ b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py @@ -104,12 +104,6 @@ class LlvmAmdgpu(CMakePackage): deprecated=True, ) - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) variant( "rocm-device-libs", default=True, diff --git a/var/spack/repos/builtin/packages/migraphx/package.py b/var/spack/repos/builtin/packages/migraphx/package.py index 5a1f037242..402134c90d 100644 --- a/var/spack/repos/builtin/packages/migraphx/package.py +++ b/var/spack/repos/builtin/packages/migraphx/package.py @@ -108,13 +108,6 @@ class Migraphx(CMakePackage): return url - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) - patch("0001-Adding-nlohmann-json-include-directory.patch", when="@3.9.0:") # Restrict Python 2.7 usage to fix the issue below # https://github.com/spack/spack/issues/24429 diff --git a/var/spack/repos/builtin/packages/miopen-hip/package.py b/var/spack/repos/builtin/packages/miopen-hip/package.py index 98c610f52b..115b8c707f 100644 --- a/var/spack/repos/builtin/packages/miopen-hip/package.py +++ b/var/spack/repos/builtin/packages/miopen-hip/package.py @@ -100,13 +100,6 @@ class MiopenHip(CMakePackage): deprecated=True, ) - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) - depends_on("cmake@3.5:", type="build") depends_on("pkgconfig", type="build") diff --git a/var/spack/repos/builtin/packages/miopen-opencl/package.py b/var/spack/repos/builtin/packages/miopen-opencl/package.py index d0fe124bc0..73a8fec15c 100644 --- a/var/spack/repos/builtin/packages/miopen-opencl/package.py +++ b/var/spack/repos/builtin/packages/miopen-opencl/package.py @@ -100,13 +100,6 @@ class MiopenOpencl(CMakePackage): deprecated=True, ) - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) - depends_on("cmake@3.5:", type="build") depends_on("boost@1.67.0:1.73.0", type="link") diff --git a/var/spack/repos/builtin/packages/miopengemm/package.py b/var/spack/repos/builtin/packages/miopengemm/package.py index 321ca28156..6abc2354da 100644 --- a/var/spack/repos/builtin/packages/miopengemm/package.py +++ b/var/spack/repos/builtin/packages/miopengemm/package.py @@ -106,13 +106,6 @@ class Miopengemm(CMakePackage): deprecated=True, ) - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) - depends_on("cmake@3:", type="build") depends_on("rocm-cmake@3.5.0", type="build", when="@1.1.6") depends_on("rocm-opencl@3.5.0", when="@1.1.6") diff --git a/var/spack/repos/builtin/packages/mivisionx/package.py b/var/spack/repos/builtin/packages/mivisionx/package.py index 7d15d26aef..17a9ebe7c1 100644 --- a/var/spack/repos/builtin/packages/mivisionx/package.py +++ b/var/spack/repos/builtin/packages/mivisionx/package.py @@ -105,12 +105,6 @@ class Mivisionx(CMakePackage): deprecated=True, ) - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) # Adding 2 variants OPENCL ,HIP which HIP as default. earlier to 5.0.0,OPENCL # was the default but has change dto HIP from 5.0.0 onwards. # when tested with HIP as true for versions before 5.1.0, build errors were encountered diff --git a/var/spack/repos/builtin/packages/rccl/package.py b/var/spack/repos/builtin/packages/rccl/package.py index bdae9578de..f9fe58d836 100644 --- a/var/spack/repos/builtin/packages/rccl/package.py +++ b/var/spack/repos/builtin/packages/rccl/package.py @@ -105,12 +105,6 @@ class Rccl(CMakePackage): amdgpu_targets = ROCmPackage.amdgpu_targets variant("amdgpu_target", values=auto_or_any_combination_of(*amdgpu_targets), sticky=True) - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) patch("0001-Fix-numactl-path-issue.patch", when="@3.7.0:4.3.2") patch("0002-Fix-numactl-rocm-smi-path-issue.patch", when="@4.5.0:5.2.1") diff --git a/var/spack/repos/builtin/packages/rdc/package.py b/var/spack/repos/builtin/packages/rdc/package.py index 92b6ae06a2..701270a528 100644 --- a/var/spack/repos/builtin/packages/rdc/package.py +++ b/var/spack/repos/builtin/packages/rdc/package.py @@ -94,13 +94,6 @@ class Rdc(CMakePackage): deprecated=True, ) - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) - depends_on("cmake@3.15:3.19.7", type="build", when="@:4.3.1") depends_on("cmake@3.15:", type="build", when="@4.5.0:") depends_on("grpc@1.28.1+shared", type="build", when="@:5.3") diff --git a/var/spack/repos/builtin/packages/rocalution/package.py b/var/spack/repos/builtin/packages/rocalution/package.py index c089cc1da8..08378aa08d 100644 --- a/var/spack/repos/builtin/packages/rocalution/package.py +++ b/var/spack/repos/builtin/packages/rocalution/package.py @@ -107,12 +107,6 @@ class Rocalution(CMakePackage): amdgpu_targets = ROCmPackage.amdgpu_targets variant("amdgpu_target", values=auto_or_any_combination_of(*amdgpu_targets), sticky=True) - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) depends_on("cmake@3.5:", type="build") for ver in ["3.5.0", "3.7.0", "3.8.0"]: diff --git a/var/spack/repos/builtin/packages/rocblas/package.py b/var/spack/repos/builtin/packages/rocblas/package.py index ba92d43aec..4b3bb45170 100644 --- a/var/spack/repos/builtin/packages/rocblas/package.py +++ b/var/spack/repos/builtin/packages/rocblas/package.py @@ -106,12 +106,6 @@ class Rocblas(CMakePackage): 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", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) # gfx906, gfx908,gfx803,gfx900 are valid for @:4.0.0 # gfx803,gfx900,gfx:xnack-,gfx908:xnack- are valid gpus for @4.1.0:4.2.0 diff --git a/var/spack/repos/builtin/packages/rocfft/package.py b/var/spack/repos/builtin/packages/rocfft/package.py index 63aca05616..3896ffdd4f 100644 --- a/var/spack/repos/builtin/packages/rocfft/package.py +++ b/var/spack/repos/builtin/packages/rocfft/package.py @@ -101,12 +101,6 @@ class Rocfft(CMakePackage): amdgpu_targets = ROCmPackage.amdgpu_targets - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) 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 diff --git a/var/spack/repos/builtin/packages/rocm-bandwidth-test/package.py b/var/spack/repos/builtin/packages/rocm-bandwidth-test/package.py index 866bb5dd27..96b286e144 100644 --- a/var/spack/repos/builtin/packages/rocm-bandwidth-test/package.py +++ b/var/spack/repos/builtin/packages/rocm-bandwidth-test/package.py @@ -99,13 +99,6 @@ class RocmBandwidthTest(CMakePackage): deprecated=True, ) - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) - depends_on("cmake@3:", type="build") for ver in [ diff --git a/var/spack/repos/builtin/packages/rocm-clang-ocl/package.py b/var/spack/repos/builtin/packages/rocm-clang-ocl/package.py index d797cb8289..56de380355 100644 --- a/var/spack/repos/builtin/packages/rocm-clang-ocl/package.py +++ b/var/spack/repos/builtin/packages/rocm-clang-ocl/package.py @@ -97,13 +97,6 @@ class RocmClangOcl(CMakePackage): deprecated=True, ) - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) - depends_on("cmake@3.5:", type="build") for ver in [ diff --git a/var/spack/repos/builtin/packages/rocm-cmake/package.py b/var/spack/repos/builtin/packages/rocm-cmake/package.py index b0fd752678..95a3bc06e2 100644 --- a/var/spack/repos/builtin/packages/rocm-cmake/package.py +++ b/var/spack/repos/builtin/packages/rocm-cmake/package.py @@ -99,13 +99,6 @@ class RocmCmake(CMakePackage): deprecated=True, ) - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) - depends_on("cmake@3:", type="build") depends_on("cmake@3.6:", type="build", when="@4.1.0:") diff --git a/var/spack/repos/builtin/packages/rocm-dbgapi/package.py b/var/spack/repos/builtin/packages/rocm-dbgapi/package.py index da26d7f704..4991bc9165 100644 --- a/var/spack/repos/builtin/packages/rocm-dbgapi/package.py +++ b/var/spack/repos/builtin/packages/rocm-dbgapi/package.py @@ -104,13 +104,6 @@ class RocmDbgapi(CMakePackage): deprecated=True, ) - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) - depends_on("cmake@3:", type="build") for ver in [ diff --git a/var/spack/repos/builtin/packages/rocm-debug-agent/package.py b/var/spack/repos/builtin/packages/rocm-debug-agent/package.py index dbca1e5c35..d7d5a6af0f 100644 --- a/var/spack/repos/builtin/packages/rocm-debug-agent/package.py +++ b/var/spack/repos/builtin/packages/rocm-debug-agent/package.py @@ -108,13 +108,6 @@ class RocmDebugAgent(CMakePackage): return url - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) - depends_on("cmake@3:", type="build") depends_on("elfutils@:0.168", type="link") diff --git a/var/spack/repos/builtin/packages/rocm-device-libs/package.py b/var/spack/repos/builtin/packages/rocm-device-libs/package.py index fff38c1e62..d14cf5484a 100644 --- a/var/spack/repos/builtin/packages/rocm-device-libs/package.py +++ b/var/spack/repos/builtin/packages/rocm-device-libs/package.py @@ -99,13 +99,6 @@ class RocmDeviceLibs(CMakePackage): deprecated=True, ) - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) - depends_on("cmake@3.13.4:", type="build", when="@3.9.0:") depends_on("cmake@3.4.3:", type="build") diff --git a/var/spack/repos/builtin/packages/rocm-opencl/package.py b/var/spack/repos/builtin/packages/rocm-opencl/package.py index 38c8aa9df8..a0bb2b294f 100644 --- a/var/spack/repos/builtin/packages/rocm-opencl/package.py +++ b/var/spack/repos/builtin/packages/rocm-opencl/package.py @@ -110,13 +110,6 @@ class RocmOpencl(CMakePackage): deprecated=True, ) - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) - depends_on("cmake@3:", type="build") depends_on("gl@4.5:", type="link") depends_on("numactl", type="link", when="@3.7.0:") diff --git a/var/spack/repos/builtin/packages/rocm-smi-lib/package.py b/var/spack/repos/builtin/packages/rocm-smi-lib/package.py index 485b46e878..d831b6bf7c 100644 --- a/var/spack/repos/builtin/packages/rocm-smi-lib/package.py +++ b/var/spack/repos/builtin/packages/rocm-smi-lib/package.py @@ -106,12 +106,6 @@ class RocmSmiLib(CMakePackage): deprecated=True, ) - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) variant("shared", default=True, description="Build shared or static library") depends_on("cmake@3:", type="build") diff --git a/var/spack/repos/builtin/packages/rocm-tensile/package.py b/var/spack/repos/builtin/packages/rocm-tensile/package.py index 6ab928332c..32b59e5159 100644 --- a/var/spack/repos/builtin/packages/rocm-tensile/package.py +++ b/var/spack/repos/builtin/packages/rocm-tensile/package.py @@ -113,12 +113,6 @@ class RocmTensile(CMakePackage): "gfx1030", ) - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) variant("tensile_architecture", default="all", values=tensile_architecture, multi=True) variant("openmp", default=True, description="Enable OpenMP") conflicts("tensile_architecture=gfx906", when="@4.0.1:") diff --git a/var/spack/repos/builtin/packages/rocm-validation-suite/package.py b/var/spack/repos/builtin/packages/rocm-validation-suite/package.py index d99cb1c7e7..d97329786d 100644 --- a/var/spack/repos/builtin/packages/rocm-validation-suite/package.py +++ b/var/spack/repos/builtin/packages/rocm-validation-suite/package.py @@ -101,13 +101,6 @@ class RocmValidationSuite(CMakePackage): deprecated=True, ) - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) - patch("001-fixes-for-rocblas-rocm-smi-install-prefix-path.patch", when="@4.1.0:4.3.2") patch("002-remove-force-setting-hip-inc-path.patch", when="@4.1.0:4.3.2") patch("003-cmake-change-to-remove-installs-and-sudo.patch", when="@4.1.0:4.3.2") diff --git a/var/spack/repos/builtin/packages/rocminfo/package.py b/var/spack/repos/builtin/packages/rocminfo/package.py index dc731e501e..91ed752ba1 100644 --- a/var/spack/repos/builtin/packages/rocminfo/package.py +++ b/var/spack/repos/builtin/packages/rocminfo/package.py @@ -99,13 +99,6 @@ class Rocminfo(CMakePackage): deprecated=True, ) - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) - depends_on("cmake@3:", type="build") for ver in [ diff --git a/var/spack/repos/builtin/packages/rocprim/package.py b/var/spack/repos/builtin/packages/rocprim/package.py index 16a99d5ff7..b594c57e52 100644 --- a/var/spack/repos/builtin/packages/rocprim/package.py +++ b/var/spack/repos/builtin/packages/rocprim/package.py @@ -99,12 +99,6 @@ class Rocprim(CMakePackage): amdgpu_targets = ROCmPackage.amdgpu_targets variant("amdgpu_target", values=auto_or_any_combination_of(*amdgpu_targets), sticky=True) - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) depends_on("cmake@3.10.2:", type="build", when="@4.2.0:") depends_on("cmake@3.5.1:", type="build") diff --git a/var/spack/repos/builtin/packages/rocprofiler-dev/package.py b/var/spack/repos/builtin/packages/rocprofiler-dev/package.py index c2bb3854cc..09f32fb8b6 100644 --- a/var/spack/repos/builtin/packages/rocprofiler-dev/package.py +++ b/var/spack/repos/builtin/packages/rocprofiler-dev/package.py @@ -99,13 +99,6 @@ class RocprofilerDev(CMakePackage): deprecated=True, ) - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) - depends_on("cmake@3:", type="build") for ver in [ "3.5.0", diff --git a/var/spack/repos/builtin/packages/rocrand/package.py b/var/spack/repos/builtin/packages/rocrand/package.py index 3d1f0d16aa..b63958463f 100644 --- a/var/spack/repos/builtin/packages/rocrand/package.py +++ b/var/spack/repos/builtin/packages/rocrand/package.py @@ -107,12 +107,6 @@ class Rocrand(CMakePackage): amdgpu_targets = ROCmPackage.amdgpu_targets variant("amdgpu_target", values=auto_or_any_combination_of(*amdgpu_targets), sticky=True) - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) variant("hiprand", default=True, when="@5.1.0:", description="Build the hiprand library") depends_on("cmake@3.10.2:", type="build", when="@4.5.0:") diff --git a/var/spack/repos/builtin/packages/rocsolver/package.py b/var/spack/repos/builtin/packages/rocsolver/package.py index b9becd57f5..f7ab497485 100644 --- a/var/spack/repos/builtin/packages/rocsolver/package.py +++ b/var/spack/repos/builtin/packages/rocsolver/package.py @@ -115,13 +115,6 @@ class Rocsolver(CMakePackage): deprecated=True, ) - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) - depends_on("cmake@3.8:", type="build", when="@4.1.0:") depends_on("cmake@3.5:", type="build") depends_on("fmt@7:", type="build", when="@4.5.0:") diff --git a/var/spack/repos/builtin/packages/rocsparse/package.py b/var/spack/repos/builtin/packages/rocsparse/package.py index ec41e97d27..da6cfe3b81 100644 --- a/var/spack/repos/builtin/packages/rocsparse/package.py +++ b/var/spack/repos/builtin/packages/rocsparse/package.py @@ -26,12 +26,6 @@ class Rocsparse(CMakePackage): amdgpu_targets = ROCmPackage.amdgpu_targets variant("amdgpu_target", values=auto_or_any_combination_of(*amdgpu_targets), sticky=True) - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) variant("test", default=False, description="Build rocsparse-test client") version("5.4.3", sha256="9fb633f235eb0567cc54fae6bdc779f16bf0bb4e6f5bdddb40312c6d11ca8478") diff --git a/var/spack/repos/builtin/packages/rocthrust/package.py b/var/spack/repos/builtin/packages/rocthrust/package.py index 522d7a2ac8..1dd4c73c02 100644 --- a/var/spack/repos/builtin/packages/rocthrust/package.py +++ b/var/spack/repos/builtin/packages/rocthrust/package.py @@ -104,12 +104,6 @@ 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), sticky=True) - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) depends_on("cmake@3.10.2:", type="build", when="@4.2.0:") depends_on("cmake@3.5.1:", type="build") diff --git a/var/spack/repos/builtin/packages/roctracer-dev/package.py b/var/spack/repos/builtin/packages/roctracer-dev/package.py index 2823b81436..06c97c776f 100644 --- a/var/spack/repos/builtin/packages/roctracer-dev/package.py +++ b/var/spack/repos/builtin/packages/roctracer-dev/package.py @@ -51,13 +51,6 @@ class RoctracerDev(CMakePackage, ROCmPackage): deprecated=True, ) - variant( - "build_type", - default="Release", - values=("Release", "Debug", "RelWithDebInfo"), - description="CMake build type", - ) - depends_on("cmake@3:", type="build") depends_on("python@3:", type="build") depends_on("py-cppheaderparser", type="build") -- cgit v1.2.3-60-g2f50