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

chai / raja / umpire: compile entire project with hipcc again (#43738)

Browse Source
This commit is contained in:
Harmen Stoppels
2024-04-19 11:18:12 +02:00
committed by GitHub
parent faed43704b
commit d6154645c7
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -191,6 +191,9 @@ def initconfig_compiler_entries(self):
# Default entries are already defined in CachedCMakePackage, inherit them: # Default entries are already defined in CachedCMakePackage, inherit them:
entries = super().initconfig_compiler_entries() 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) llnl_link_helpers(entries, spec, compiler)
return entries return entries

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

@@ -252,6 +252,9 @@ def initconfig_compiler_entries(self):
# Default entries are already defined in CachedCMakePackage, inherit them: # Default entries are already defined in CachedCMakePackage, inherit them:
entries = super().initconfig_compiler_entries() 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) llnl_link_helpers(entries, spec, compiler)
return entries return entries

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

@@ -307,6 +307,9 @@ def initconfig_compiler_entries(self):
# Default entries are already defined in CachedCMakePackage, inherit them: # Default entries are already defined in CachedCMakePackage, inherit them:
entries = super().initconfig_compiler_entries() 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 "" option_prefix = "UMPIRE_" if spec.satisfies("@2022.03.0:") else ""
if "+fortran" in spec and compiler.fc is not None: if "+fortran" in spec and compiler.fc is not None: