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

petsc: enable +rocm+kokkos (#27779)

Browse Source 
Also fix kokkos-kernels when kokkos is built with +rocm
This commit is contained in:
Satish Balay 2021-12-16 16:47:31 -06:00 committed by GitHub
parent 2310da0070
commit 40886599ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
var/spack/repos/builtin/packages/kokkos-kernels/package.py
View File

@ -102,8 +102,11 @@ def cmake_args(self):
options.append("-DSpack_WORKAROUND=On") options.append("-DSpack_WORKAROUND=On")
options.append("-DKokkos_ROOT=%s" % spec["kokkos"].prefix) options.append("-DKokkos_ROOT=%s" % spec["kokkos"].prefix)
# Compiler weirdness due to nvcc_wrapper if spec.satisfies('^kokkos+rocm'):
options.append("-DCMAKE_CXX_COMPILER=%s" % spec["kokkos"].kokkos_cxx) options.append("-DCMAKE_CXX_COMPILER=%s" % spec['hip'].hipcc)
else:
# Compiler weirdness due to nvcc_wrapper
options.append("-DCMAKE_CXX_COMPILER=%s" % spec["kokkos"].kokkos_cxx)
if self.run_tests: if self.run_tests:
options.append("-DKokkosKernels_ENABLE_TESTS=ON") options.append("-DKokkosKernels_ENABLE_TESTS=ON")

25
var/spack/repos/builtin/packages/petsc/package.py
View File

@ -221,6 +221,12 @@ class Petsc(Package, CudaPackage, ROCmPackage):
depends_on('hip', when='+rocm') depends_on('hip', when='+rocm')
depends_on('hipblas', when='+rocm') depends_on('hipblas', when='+rocm')
depends_on('hipsparse', when='+rocm') depends_on('hipsparse', when='+rocm')
depends_on('rocsparse', when='+rocm')
depends_on('rocsolver', when='+rocm')
depends_on('rocblas', when='+rocm')
depends_on('rocrand', when='+rocm')
depends_on('rocthrust', when='+rocm')
depends_on('rocprim', when='+rocm')
# Build dependencies # Build dependencies
depends_on('python@2.6:2.8', type='build', when='@:3.10') depends_on('python@2.6:2.8', type='build', when='@:3.10')
@ -321,6 +327,7 @@ class Petsc(Package, CudaPackage, ROCmPackage):
depends_on('kokkos-kernels', when='+kokkos') depends_on('kokkos-kernels', when='+kokkos')
depends_on('kokkos+cuda+wrapper+cuda_lambda', when='+kokkos +cuda') depends_on('kokkos+cuda+wrapper+cuda_lambda', when='+kokkos +cuda')
depends_on('kokkos-kernels+cuda', when='+kokkos +cuda') depends_on('kokkos-kernels+cuda', when='+kokkos +cuda')
depends_on('kokkos+rocm', when='+kokkos +rocm')
# Using the following tarballs # Using the following tarballs
# * petsc-3.12 (and older) - includes docs # * petsc-3.12 (and older) - includes docs
@ -414,7 +421,7 @@ def install(self, spec, prefix):
# if not (useinc || uselib): usedir - i.e (False, False) # if not (useinc || uselib): usedir - i.e (False, False)
for library in ( for library in (
('cuda', 'cuda', False, False), ('cuda', 'cuda', False, False),
('hip', 'hip', False, False), ('hip', 'hip', True, False),
'metis', 'metis',
'hypre', 'hypre',
'parmetis', 'parmetis',
@ -496,6 +503,22 @@ def install(self, spec, prefix):
else: else:
options.append('CUDAFLAGS=-gencode arch=compute_{0},code=sm_{0}' options.append('CUDAFLAGS=-gencode arch=compute_{0},code=sm_{0}'
.format(cuda_arch[0])) .format(cuda_arch[0]))
if '+rocm' in spec:
if not spec.satisfies('amdgpu_target=none'):
hip_arch = spec.variants['amdgpu_target'].value
options.append('--with-hip-arch={0}'.format(hip_arch[0]))
hip_pkgs = ['hipsparse', 'hipblas', 'rocsparse', 'rocsolver', 'rocblas']
hip_ipkgs = hip_pkgs + ['rocthrust', 'rocprim']
hip_lpkgs = hip_pkgs + ['rocrand']
hip_inc = ''
hip_lib = ''
for pkg in hip_ipkgs:
hip_inc += spec[pkg].headers.include_flags + ' '
for pkg in hip_lpkgs:
hip_lib += spec[pkg].libs.joined() + ' '
options.append('HIPPPFLAGS=%s' % hip_inc)
options.append('with-hip-lib=%s -L%s -lamdhip64' %
(hip_lib, spec['hip'].prefix.lib))
if 'superlu-dist' in spec: if 'superlu-dist' in spec:
if spec.satisfies('@3.10.3:3.15'): if spec.satisfies('@3.10.3:3.15'):