Synchronize RADIUSS packages with all local additions #2856
+508
−10
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| diff --git a/cmake/FindLibunwind.cmake b/cmake/FindLibunwind.cmake | ||
| index 04f325d9..7868138f 100644 | ||
| --- a/cmake/FindLibunwind.cmake | ||
| +++ b/cmake/FindLibunwind.cmake | ||
| @@ -3,20 +3,38 @@ | ||
| # | ||
| # LIBUNWIND_PREFIX - Set to the libunwind installation directory | ||
| # | ||
| -# LIBUNWIND_INCLUDE_DIR - Path to libunwind.h | ||
| +# LIBUNWIND_INCLUDE_DIRS - Path to libunwind.h | ||
| # LIBUNWIND_LIBRARIES - List of libraries for using libunwind | ||
| # LIBUNWIND_FOUND - True if libunwind was found | ||
|
|
||
| -find_path(LIBUNWIND_PREFIX | ||
| - include/libunwind.h) | ||
| +if(LIBUNWIND_PREFIX) | ||
| + # When prefix is explicitly provided, only look there | ||
| + find_library(LIBUNWIND_LIBRARIES | ||
| + NAMES unwind | ||
| + PATHS ${LIBUNWIND_PREFIX}/lib | ||
| + NO_DEFAULT_PATH) | ||
|
|
||
| -find_library(LIBUNWIND_LIBRARIES | ||
| - NAMES unwind | ||
| - HINTS ${LIBUNWIND_PREFIX}/lib) | ||
| + find_path(LIBUNWIND_INCLUDE_DIRS | ||
| + NAMES libunwind.h | ||
| + PATHS ${LIBUNWIND_PREFIX}/include | ||
| + NO_DEFAULT_PATH) | ||
|
|
||
| -find_path(LIBUNWIND_INCLUDE_DIRS | ||
| - NAMES libunwind.h | ||
| - HINTS ${LIBUNWIND_PREFIX}/include) | ||
| + if(NOT LIBUNWIND_LIBRARIES OR NOT LIBUNWIND_INCLUDE_DIRS) | ||
| + message(WARNING "LIBUNWIND_PREFIX was set to '${LIBUNWIND_PREFIX}' but libunwind was not found there") | ||
| + endif() | ||
| +else() | ||
| + # Try to find libunwind in standard locations | ||
| + find_path(LIBUNWIND_PREFIX | ||
| + include/libunwind.h) | ||
| + | ||
| + find_library(LIBUNWIND_LIBRARIES | ||
| + NAMES unwind | ||
| + HINTS ${LIBUNWIND_PREFIX}/lib) | ||
| + | ||
| + find_path(LIBUNWIND_INCLUDE_DIRS | ||
| + NAMES libunwind.h | ||
| + HINTS ${LIBUNWIND_PREFIX}/include) | ||
| +endif() | ||
|
|
||
| include(FindPackageHandleStandardArgs) | ||
| find_package_handle_standard_args(Libunwind DEFAULT_MSG LIBUNWIND_LIBRARIES LIBUNWIND_INCLUDE_DIRS) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,13 +3,15 @@ | |
| # SPDX-License-Identifier: (Apache-2.0 OR MIT) | ||
|
|
||
| import os | ||
| import re | ||
| import socket | ||
| import sys | ||
|
|
||
| from spack_repo.builtin.build_systems.cached_cmake import ( | ||
| CachedCMakePackage, | ||
| cmake_cache_option, | ||
| cmake_cache_path, | ||
| cmake_cache_string, | ||
| ) | ||
| from spack_repo.builtin.build_systems.cuda import CudaPackage | ||
| from spack_repo.builtin.build_systems.rocm import ROCmPackage | ||
|
|
@@ -36,6 +38,8 @@ class Caliper(CachedCMakePackage, CudaPackage, ROCmPackage): | |
| license("BSD-3-Clause") | ||
|
|
||
| version("master", branch="master") | ||
| version("2.13.1", sha256="7cef0173e0e0673abb7943a2641b660adfbc3d6bc4b33941ab4f431f92a4d016") | ||
| version("2.13.0", sha256="28c6e8fd940bdee9e80d1e8ae1ce0f76d6a690cbb6242d4eec115d6c0204e331") | ||
| version("2.12.1", sha256="2b5a8f98382c94dc75cc3f4517c758eaf9a3f9cea0a8dbdc7b38506060d6955c") | ||
| version("2.11.0", sha256="b86b733cbb73495d5f3fe06e6a9885ec77365c8aa9195e7654581180adc2217c") | ||
| version("2.10.0", sha256="14c4fb5edd5e67808d581523b4f8f05ace8549698c0e90d84b53171a77f58565") | ||
|
|
@@ -65,9 +69,9 @@ class Caliper(CachedCMakePackage, CudaPackage, ROCmPackage): | |
| variant("tools", default=True, description="Enable tools") | ||
| variant("python", default=False, description="Build Python bindings") | ||
|
|
||
| depends_on("c", type="build") | ||
| depends_on("cxx", type="build") | ||
| depends_on("fortran", when="+fortran", type="build") | ||
|
|
||
| depends_on("adiak@0.1:0", when="@:2.10 +adiak") | ||
| depends_on("adiak@0.4:0", when="@2.11: +adiak") | ||
|
|
@@ -90,8 +94,14 @@ class Caliper(CachedCMakePackage, CudaPackage, ROCmPackage): | |
|
|
||
| conflicts("+rocm+cuda") | ||
| # Legacy nvtx is only supported until cuda@12.8, newer cuda only provides nvtx3. | ||
| conflicts("^cuda@12.9:", "@:2.13.1") | ||
|
|
||
| patch("libunwind.patch", when="@:2.13") | ||
| patch( | ||
| "https://github.com/LLNL/Caliper/commit/648f8ab496a4a2c3f38e0cfa572340e429d8c76e.patch?full_index=1", | ||
| sha256="d947b5df6b68a24f516bb3b4ec04c28d4b8246ac0cbe664cf113dd2b6ca92073", | ||
| when="@2.12:2.13", | ||
| ) | ||
| patch("for_aarch64.patch", when="@:2.11 target=aarch64:") | ||
| patch( | ||
| "sampler-service-missing-libunwind-include-dir.patch", | ||
|
|
@@ -143,13 +153,60 @@ def initconfig_hardware_entries(self): | |
| entries.append(cmake_cache_option("WITH_NVTX", True)) | ||
| entries.append(cmake_cache_path("CUDA_TOOLKIT_ROOT_DIR", spec["cuda"].prefix)) | ||
| entries.append(cmake_cache_path("CUPTI_PREFIX", spec["cuda"].prefix)) | ||
|
|
||
| # CUDA configuration from cuda_for_radiuss_projects | ||
| cuda_flags = [] | ||
| if not spec.satisfies("cuda_arch=none"): | ||
| cuda_archs = ";".join(spec.variants["cuda_arch"].value) | ||
| entries.append(cmake_cache_string("CMAKE_CUDA_ARCHITECTURES", cuda_archs)) | ||
|
|
||
| # gcc-toolchain support | ||
| gcc_toolchain_regex = re.compile(".*gcc-toolchain.*") | ||
| using_toolchain = list( | ||
| filter(gcc_toolchain_regex.match, spec.compiler_flags["cxxflags"]) | ||
| ) | ||
| if using_toolchain: | ||
| cuda_flags.append("-Xcompiler {}".format(using_toolchain[0])) | ||
|
|
||
| # ppc64le workaround | ||
| if spec.satisfies("target=ppc64le %gcc@8.1:"): | ||
| cuda_flags.append("-Xcompiler -mno-float128") | ||
|
|
||
| if cuda_flags: | ||
| entries.append(cmake_cache_string("CMAKE_CUDA_FLAGS", " ".join(cuda_flags))) | ||
| else: | ||
| entries.append(cmake_cache_option("WITH_CUPTI", False)) | ||
| entries.append(cmake_cache_option("WITH_NVTX", False)) | ||
|
|
||
| if spec.satisfies("+rocm"): | ||
| entries.append(cmake_cache_option("WITH_ROCTRACER", True)) | ||
| entries.append(cmake_cache_option("WITH_ROCTX", True)) | ||
|
|
||
| # HIP configuration from hip_for_radiuss_projects | ||
| rocm_root = spec["llvm-amdgpu"].prefix | ||
| gcc_toolchain_regex = re.compile(".*gcc-toolchain.*") | ||
| using_toolchain = list( | ||
| filter(gcc_toolchain_regex.match, spec.compiler_flags["cxxflags"]) | ||
| ) | ||
| hip_link_flags = "" | ||
|
|
||
| if using_toolchain: | ||
| gcc_prefix = using_toolchain[0] | ||
| entries.append( | ||
| cmake_cache_string("HIP_CLANG_FLAGS", "--gcc-toolchain={0}".format(gcc_prefix)) | ||
| ) | ||
| entries.append( | ||
| cmake_cache_string( | ||
| "CMAKE_EXE_LINKER_FLAGS", | ||
| hip_link_flags + " -Wl,-rpath={0}/lib64".format(gcc_prefix), | ||
| ) | ||
| ) | ||
| else: | ||
| entries.append( | ||
| cmake_cache_string( | ||
| "CMAKE_EXE_LINKER_FLAGS", "-Wl,-rpath={0}/llvm/lib/".format(rocm_root) | ||
| ) | ||
| ) | ||
| else: | ||
| entries.append(cmake_cache_option("WITH_ROCTRACER", False)) | ||
| entries.append(cmake_cache_option("WITH_ROCTX", False)) | ||
|
|
@@ -162,6 +219,31 @@ def initconfig_mpi_entries(self): | |
|
|
||
| entries.append(cmake_cache_option("WITH_MPI", spec.satisfies("+mpi"))) | ||
|
|
||
| if spec.satisfies("+mpi"): | ||
| # MPI configuration from mpi_for_radiuss_projects | ||
| if spec["mpi"].name == "spectrum-mpi" and spec.satisfies("^blt"): | ||
|
Contributor
There was a problem hiding this comment. I also don't think any spectrum-mpi sections are needed any longer. |
||
| entries.append(cmake_cache_string("BLT_MPI_COMMAND_APPEND", "mpibind")) | ||
|
|
||
| sys_type = spec.architecture | ||
| if "SYS_TYPE" in env: | ||
| sys_type = env["SYS_TYPE"] | ||
|
|
||
| # Replace /usr/bin/srun path with srun flux wrapper path on TOSS 4 | ||
| if "toss_4" in sys_type: | ||
|
Contributor
There was a problem hiding this comment. Is this still needed after the update to the CachedCMakePackage that @tdrwenski did?
Contributor
There was a problem hiding this comment. I agree, I think this block can be removed here (and for care, chai, raja-perf, umpire), it looks like the workaround we deleted here for axom: spack/spack#49033
Contributor
There was a problem hiding this comment. @white238 @tdrwenski thank you for the review !
Contributor
There was a problem hiding this comment. (because I can't apply them here) |
||
| srun_wrapper = which_string("srun") | ||
| mpi_exec_index = [ | ||
| index for index, entry in enumerate(entries) if "MPIEXEC_EXECUTABLE" in entry | ||
| ] | ||
| if len(mpi_exec_index) > 0: | ||
| del entries[mpi_exec_index[0]] | ||
| mpi_exec_flag_index = [ | ||
| index for index, entry in enumerate(entries) if "MPIEXEC_NUMPROC_FLAG" in entry | ||
| ] | ||
| if len(mpi_exec_flag_index) > 0: | ||
| del entries[mpi_exec_flag_index[0]] | ||
| entries.append(cmake_cache_path("MPIEXEC_EXECUTABLE", srun_wrapper)) | ||
| entries.append(cmake_cache_string("MPIEXEC_NUMPROC_FLAG", "-n")) | ||
|
|
||
| return entries | ||
|
|
||
| def initconfig_package_entries(self): | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
With Sierra being retired, do we need this anymore?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed.