zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ROCm packages: remove build type variants (#39089)

Browse Source 
After #36679, the default build type is Release, so there is no need to
explicitly set the build type as a custom variant.
This commit is contained in:
Aiden Grossman 2023-07-26 23:08:59 -07:00 committed by GitHub
parent ca2e9cf090
commit 936c6045fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
41 changed files with 0 additions and 272 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
var/spack/repos/builtin/packages/atmi/package.py
View File

@ -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")

7
var/spack/repos/builtin/packages/comgr/package.py
View File

@ -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")

7
var/spack/repos/builtin/packages/hip-rocclr/package.py
View File

@ -108,13 +108,6 @@ def url_for_version(self, version):
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")

7
var/spack/repos/builtin/packages/hip/package.py
View File

@ -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")

7
var/spack/repos/builtin/packages/hipblas/package.py
View File

@ -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")

7
var/spack/repos/builtin/packages/hipcub/package.py
View File

@ -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")

7
var/spack/repos/builtin/packages/hipfft/package.py
View File

@ -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")

7
var/spack/repos/builtin/packages/hipfort/package.py
View File

@ -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")

6
var/spack/repos/builtin/packages/hipify-clang/package.py
View File

@ -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

7
var/spack/repos/builtin/packages/hipsparse/package.py
View File

@ -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")

6
var/spack/repos/builtin/packages/hsa-rocr-dev/package.py
View File

@ -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")

6
var/spack/repos/builtin/packages/hsakmt-roct/package.py
View File

@ -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:")

6
var/spack/repos/builtin/packages/llvm-amdgpu/package.py
View File

@ -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,

7
var/spack/repos/builtin/packages/migraphx/package.py
View File

@ -108,13 +108,6 @@ def url_for_version(self, version):
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

7
var/spack/repos/builtin/packages/miopen-hip/package.py
View File

@ -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")

7
var/spack/repos/builtin/packages/miopen-opencl/package.py
View File

@ -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")

7
var/spack/repos/builtin/packages/miopengemm/package.py
View File

@ -106,13 +106,6 @@ def url_for_version(self, version):
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")

6
var/spack/repos/builtin/packages/mivisionx/package.py
View File

@ -105,12 +105,6 @@ def url_for_version(self, version):
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

6
var/spack/repos/builtin/packages/rccl/package.py
View File

@ -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")

7
var/spack/repos/builtin/packages/rdc/package.py
View File

@ -94,13 +94,6 @@ def url_for_version(self, version):
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")

6
var/spack/repos/builtin/packages/rocalution/package.py
View File

@ -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"]:

6
var/spack/repos/builtin/packages/rocblas/package.py
View File

@ -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

6
var/spack/repos/builtin/packages/rocfft/package.py
View File

@ -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

7
var/spack/repos/builtin/packages/rocm-bandwidth-test/package.py
View File

@ -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 [

7
var/spack/repos/builtin/packages/rocm-clang-ocl/package.py
View File

@ -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 [

7
var/spack/repos/builtin/packages/rocm-cmake/package.py
View File

@ -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:")

7
var/spack/repos/builtin/packages/rocm-dbgapi/package.py
View File

@ -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 [

7
var/spack/repos/builtin/packages/rocm-debug-agent/package.py
View File

@ -108,13 +108,6 @@ def url_for_version(self, version):
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")

7
var/spack/repos/builtin/packages/rocm-device-libs/package.py
View File

@ -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")

7
var/spack/repos/builtin/packages/rocm-opencl/package.py
View File

@ -110,13 +110,6 @@ def url_for_version(self, version):
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:")

6
var/spack/repos/builtin/packages/rocm-smi-lib/package.py
View File

@ -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")

6
var/spack/repos/builtin/packages/rocm-tensile/package.py
View File

@ -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:")

7
var/spack/repos/builtin/packages/rocm-validation-suite/package.py
View File

@ -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")

7
var/spack/repos/builtin/packages/rocminfo/package.py
View File

@ -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 [

6
var/spack/repos/builtin/packages/rocprim/package.py
View File

@ -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")

7
var/spack/repos/builtin/packages/rocprofiler-dev/package.py
View File

@ -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",

6
var/spack/repos/builtin/packages/rocrand/package.py
View File

@ -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:")

7
var/spack/repos/builtin/packages/rocsolver/package.py
View File

@ -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:")

6
var/spack/repos/builtin/packages/rocsparse/package.py
View File

@ -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")

6
var/spack/repos/builtin/packages/rocthrust/package.py
View File

@ -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")

7
var/spack/repos/builtin/packages/roctracer-dev/package.py
View File

@ -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")