diff options
| author | Harmen Stoppels <me@harmenstoppels.nl> | 2024-04-19 11:18:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-19 11:18:12 +0200 |
| commit | d6154645c72a6ee1c23a6eb24006fdf7a1dcce5d (patch) | |
| tree | 39d9a2a0fe9e0d1097a94c6f59fd6837d437ccf5 /var | |
| parent | faed43704b0d1bae88124000254f8aa312eaa567 (diff) | |
| download | spack-d6154645c72a6ee1c23a6eb24006fdf7a1dcce5d.tar.gz spack-d6154645c72a6ee1c23a6eb24006fdf7a1dcce5d.tar.bz2 spack-d6154645c72a6ee1c23a6eb24006fdf7a1dcce5d.tar.xz spack-d6154645c72a6ee1c23a6eb24006fdf7a1dcce5d.zip | |
chai / raja / umpire: compile entire project with hipcc again (#43738)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/chai/package.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/raja/package.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/umpire/package.py | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/chai/package.py b/var/spack/repos/builtin/packages/chai/package.py index 724ccf124d..0f4b8457fe 100644 --- a/var/spack/repos/builtin/packages/chai/package.py +++ b/var/spack/repos/builtin/packages/chai/package.py @@ -191,6 +191,9 @@ class Chai(CachedCMakePackage, CudaPackage, ROCmPackage): # Default entries are already defined in CachedCMakePackage, inherit them: entries = super().initconfig_compiler_entries() + if "+rocm" in spec: + entries.insert(0, cmake_cache_path("CMAKE_CXX_COMPILER", spec["hip"].hipcc)) + llnl_link_helpers(entries, spec, compiler) return entries diff --git a/var/spack/repos/builtin/packages/raja/package.py b/var/spack/repos/builtin/packages/raja/package.py index f2cd52bcb6..f6432b4d1e 100644 --- a/var/spack/repos/builtin/packages/raja/package.py +++ b/var/spack/repos/builtin/packages/raja/package.py @@ -252,6 +252,9 @@ class Raja(CachedCMakePackage, CudaPackage, ROCmPackage): # Default entries are already defined in CachedCMakePackage, inherit them: entries = super().initconfig_compiler_entries() + if "+rocm" in spec: + entries.insert(0, cmake_cache_path("CMAKE_CXX_COMPILER", spec["hip"].hipcc)) + llnl_link_helpers(entries, spec, compiler) return entries diff --git a/var/spack/repos/builtin/packages/umpire/package.py b/var/spack/repos/builtin/packages/umpire/package.py index bd6915623f..d7684c207a 100644 --- a/var/spack/repos/builtin/packages/umpire/package.py +++ b/var/spack/repos/builtin/packages/umpire/package.py @@ -307,6 +307,9 @@ class Umpire(CachedCMakePackage, CudaPackage, ROCmPackage): # Default entries are already defined in CachedCMakePackage, inherit them: entries = super().initconfig_compiler_entries() + if "+rocm" in spec: + entries.insert(0, cmake_cache_path("CMAKE_CXX_COMPILER", spec["hip"].hipcc)) + option_prefix = "UMPIRE_" if spec.satisfies("@2022.03.0:") else "" if "+fortran" in spec and compiler.fc is not None: |