diff options
| author | Brian Van Essen <vanessen1@llnl.gov> | 2021-04-06 00:38:37 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-06 09:38:37 +0200 |
| commit | 023524365ce44f30e38c32d1f6ccecd8b8e7f3ea (patch) | |
| tree | d53b955d89bc0e29f2bef2750cf050b00470387b /var | |
| parent | 802f4d9ffa78bf94640b5a594e3afd93ba3de058 (diff) | |
| download | spack-023524365ce44f30e38c32d1f6ccecd8b8e7f3ea.tar.gz spack-023524365ce44f30e38c32d1f6ccecd8b8e7f3ea.tar.bz2 spack-023524365ce44f30e38c32d1f6ccecd8b8e7f3ea.tar.xz spack-023524365ce44f30e38c32d1f6ccecd8b8e7f3ea.zip | |
hydrogen, lbann: forward the CXXFLAGS to the HIP_HIPCC_FLAGS variable. (#22744)
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/hydrogen/package.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/lbann/package.py | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/hydrogen/package.py b/var/spack/repos/builtin/packages/hydrogen/package.py index 00b30c4d6b..d25034706d 100644 --- a/var/spack/repos/builtin/packages/hydrogen/package.py +++ b/var/spack/repos/builtin/packages/hydrogen/package.py @@ -169,9 +169,10 @@ class Hydrogen(CMakePackage, CudaPackage, ROCmPackage): archs = self.spec.variants['amdgpu_target'].value if archs != 'none': arch_str = ",".join(archs) + cxxflags_str = " ".join(self.spec.compiler_flags['cxxflags']) args.append( '-DHIP_HIPCC_FLAGS=--amdgpu-target={0}' - ' -g -fsized-deallocation -fPIC'.format(arch_str) + ' -g -fsized-deallocation -fPIC {1}'.format(arch_str, cxxflags_str) ) # Add support for OS X to find OpenMP (LLVM installed via brew) diff --git a/var/spack/repos/builtin/packages/lbann/package.py b/var/spack/repos/builtin/packages/lbann/package.py index cca38f266e..635f536e99 100644 --- a/var/spack/repos/builtin/packages/lbann/package.py +++ b/var/spack/repos/builtin/packages/lbann/package.py @@ -358,9 +358,11 @@ class Lbann(CMakePackage, CudaPackage, ROCmPackage): archs = self.spec.variants['amdgpu_target'].value if archs != 'none': arch_str = ",".join(archs) + cxxflags_str = " ".join(self.spec.compiler_flags['cxxflags']) args.append( '-DHIP_HIPCC_FLAGS=--amdgpu-target={0}' - ' -g -fsized-deallocation -fPIC -std=c++17'.format(arch_str) + ' -g -fsized-deallocation -fPIC -std=c++17 {1}'.format( + arch_str, cxxflags_str) ) return args |