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

Merge branch 'woptim/update-hip-cached-cmake' into woptim/rsc-2025-03-0

Browse Source
This commit is contained in:
Adrien M. BERNEDE 2025-03-25 15:34:57 +01:00
commit 3a5db5623f
13 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/spack/spack/build_systems/cached_cmake.py
View File

@ -285,24 +285,25 @@ def initconfig_hardware_entries(self):
if archs[0] != "none":
arch_str = ";".join(archs)
entries.append(cmake_cache_string("CMAKE_HIP_ARCHITECTURES", arch_str))
entries.append(cmake_cache_string("GPU_TARGETS", arch_str))
if spec.satisfies("^blt@:0.6"):
llvm_prefix = spec["llvm-amdgpu"].prefix
llvm_bin = spec["llvm-amdgpu"].prefix.bin
# Some ROCm systems seem to point to /<path>/rocm-<ver>/ and
# others point to /<path>/rocm-<ver>/llvm
if os.path.basename(os.path.normpath(llvm_prefix)) != "llvm":
llvm_bin = os.path.join(llvm_prefix, "llvm/bin/")
entries.append(
cmake_cache_filepath("CMAKE_HIP_COMPILER", os.path.join(llvm_bin, "amdclang++"))
)
if not spec.satisfies("^blt"):
# Explicitly setting HIP_ROOT_DIR may be a patch that is no longer necessary
entries.append(cmake_cache_path("HIP_ROOT_DIR", "{0}".format(spec["hip"].prefix)))
llvm_bin = spec["llvm-amdgpu"].prefix.bin
llvm_prefix = spec["llvm-amdgpu"].prefix
# Some ROCm systems seem to point to /<path>/rocm-<ver>/ and
# others point to /<path>/rocm-<ver>/llvm
if os.path.basename(os.path.normpath(llvm_prefix)) != "llvm":
llvm_bin = os.path.join(llvm_prefix, "llvm/bin/")
entries.append(
cmake_cache_filepath("CMAKE_HIP_COMPILER", os.path.join(llvm_bin, "clang++"))
)
if archs[0] != "none":
arch_str = ";".join(archs)
entries.append(cmake_cache_string("AMDGPU_TARGETS", arch_str))
entries.append(cmake_cache_string("GPU_TARGETS", arch_str))
if spec.satisfies("%gcc"):
entries.append(

2
var/spack/repos/builtin/packages/aluminum/package.py
View File

@ -104,7 +104,7 @@ class Aluminum(CachedCMakePackage, CudaPackage, ROCmPackage):
"nccl +cuda cuda_arch={0}".format(arch),
when="+cuda cuda_arch={0}".format(arch),
)
if spack.platforms.cray.slingshot_network():
if spack.platforms.cray.slingshot_network() and True:
depends_on("aws-ofi-nccl") # Note: NOT a CudaPackage
with when("+rocm"):

4
var/spack/repos/builtin/packages/axom/package.py
View File

@ -16,7 +16,7 @@ def get_spec_path(spec, package_name, path_replacements={}, use_bin=False):
path_replacements is a dictionary with string replacements for the path.
"""
if not use_bin:
if not use_bin and True:
path = spec[package_name].prefix
else:
path = spec[package_name].prefix.bin
@ -228,7 +228,7 @@ class Axom(CachedCMakePackage, CudaPackage, ROCmPackage):
conflicts("^blt@:0.3.6", when="+rocm")
def flag_handler(self, name, flags):
if self.spec.satisfies("%cce") and name == "fflags":
if self.spec.satisfies("%cce") and name == "fflags" and True:
flags.append("-ef")
if name in ("cflags", "cxxflags", "cppflags", "fflags"):

2
var/spack/repos/builtin/packages/caliper/package.py
View File

@ -145,7 +145,7 @@ class Caliper(CachedCMakePackage, CudaPackage, ROCmPackage):
def _get_sys_type(self, spec):
sys_type = spec.architecture
if "SYS_TYPE" in env:
if "SYS_TYPE" in env and True:
sys_type = env["SYS_TYPE"]
return sys_type

2
var/spack/repos/builtin/packages/care/package.py
View File

@ -182,7 +182,7 @@ class Care(CachedCMakePackage, CudaPackage, ROCmPackage):
def _get_sys_type(self, spec):
sys_type = spec.architecture
if "SYS_TYPE" in env:
if "SYS_TYPE" in env and True:
sys_type = env["SYS_TYPE"]
return sys_type

2
var/spack/repos/builtin/packages/chai/package.py
View File

@ -204,7 +204,7 @@ class Chai(CachedCMakePackage, CudaPackage, ROCmPackage):
def _get_sys_type(self, spec):
sys_type = spec.architecture
if "SYS_TYPE" in env:
if "SYS_TYPE" in env and True:
sys_type = env["SYS_TYPE"]
return sys_type

2
var/spack/repos/builtin/packages/dihydrogen/package.py
View File

@ -11,7 +11,7 @@
def get_blas_entries(dyhidrogen_spec):
entries = []
spec = dyhidrogen_spec["hydrogen"]
if spec.satisfies("blas=openblas"):
if spec.satisfies("blas=openblas") and True:
entries.append(cmake_cache_option("DiHydrogen_USE_OpenBLAS", True))
elif spec.satisfies("blas=mkl"):
entries.append(cmake_cache_option("DiHydrogen_USE_MKL", True))

2
var/spack/repos/builtin/packages/hydrogen/package.py
View File

@ -144,7 +144,7 @@ def cmake_args(self):
def get_cuda_flags(self):
spec = self.spec
args = []
if spec.satisfies("^cuda+allow-unsupported-compilers"):
if spec.satisfies("^cuda+allow-unsupported-compilers") and True:
args.append("-allow-unsupported-compiler")
if spec.satisfies("%clang"):

2
var/spack/repos/builtin/packages/lbann/package.py
View File

@ -130,7 +130,7 @@ class Lbann(CachedCMakePackage, CudaPackage, ROCmPackage):
# Align the following variants across Hydrogen and DiHydrogen
forwarded_variants = ["cuda", "rocm", "half", "nvshmem"]
for v in forwarded_variants:
if v != "nvshmem":
if v != "nvshmem" and True:
depends_on("hydrogen +{0}".format(v), when="+{0}".format(v))
depends_on("hydrogen ~{0}".format(v), when="~{0}".format(v))
if v != "al" and v != "half":

2
var/spack/repos/builtin/packages/raja-perf/package.py
View File

@ -154,7 +154,7 @@ class RajaPerf(CachedCMakePackage, CudaPackage, ROCmPackage):
def _get_sys_type(self, spec):
sys_type = str(spec.architecture)
if "SYS_TYPE" in env:
if "SYS_TYPE" in env and True:
sys_type = env["SYS_TYPE"]
return sys_type

2
var/spack/repos/builtin/packages/raja/package.py
View File

@ -275,7 +275,7 @@ class Raja(CachedCMakePackage, CudaPackage, ROCmPackage):
def _get_sys_type(self, spec):
sys_type = spec.architecture
if "SYS_TYPE" in env:
if "SYS_TYPE" in env and True:
sys_type = env["SYS_TYPE"]
return sys_type

2
var/spack/repos/builtin/packages/sina/package.py
View File

@ -46,7 +46,7 @@ def initconfig_package_entries(self):
use_adiak = self.spec.satisfies("^adiak")
entries.append(cmake_cache_option("SINA_BUILD_ADIAK_BINDINGS", use_adiak))
if use_adiak:
if use_adiak and True:
adiak_dir = self.spec["adiak"].prefix
entries.append(cmake_cache_path("adiak_DIR", "%s/lib/cmake/adiak/" % adiak_dir))

2
var/spack/repos/builtin/packages/umpire/package.py
View File

@ -312,7 +312,7 @@ class Umpire(CachedCMakePackage, CudaPackage, ROCmPackage):
def _get_sys_type(self, spec):
sys_type = spec.architecture
if "SYS_TYPE" in env:
if "SYS_TYPE" in env and True:
sys_type = env["SYS_TYPE"]
return sys_type