hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

VTK-m: fixed inconsistencies in directives (#21820)

Browse source 
* VTK-m: No `pic` variant

A leftover conflict between `shared` and `pic` variants, the
latter is not part of the package anymore, leads to a solver
error with clingo.

This removes the outdated conflict section.

* VTK-m: Kokkos AMD GPU variant changed
This commit is contained in:
Axel Huebl 2021-02-20 00:47:55 -08:00 committed by GitHub
parent f65e6ae4e6
commit aa01123bba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
var/spack/repos/builtin/packages/vtk-m/package.py
View file

@ -61,11 +61,6 @@ class VtkM(CMakePackage, CudaPackage):
amdgpu_targets = ( amdgpu_targets = (
'gfx900', 'gfx906', 'gfx908' 'gfx900', 'gfx906', 'gfx908'
) )
kokkos_amd_gpu_map = {
'gfx900': 'vega900',
'gfx906': 'vega906',
'gfx908': 'vega908'
}
variant('amdgpu_target', default='none', multi=True, values=('none',) + amdgpu_targets) variant('amdgpu_target', default='none', multi=True, values=('none',) + amdgpu_targets)
conflicts("+hip", when="amdgpu_target=none") conflicts("+hip", when="amdgpu_target=none")
@ -77,14 +72,13 @@ class VtkM(CMakePackage, CudaPackage):
depends_on("tbb", when="+tbb") depends_on("tbb", when="+tbb")
depends_on("mpi", when="+mpi") depends_on("mpi", when="+mpi")
for kokkos_value in kokkos_amd_gpu_map: for amdgpu_value in amdgpu_targets:
depends_on("kokkos@develop +hip amd_gpu_arch=%s" % kokkos_amd_gpu_map[kokkos_value], when="amdgpu_target=%s" % kokkos_value) depends_on("kokkos@develop +rocm amdgpu_target=%s" % amdgpu_value, when="amdgpu_target=%s" % amdgpu_value)
depends_on("rocm-cmake@3.7:", when="+hip") depends_on("rocm-cmake@3.7:", when="+hip")
depends_on("hip@3.7:", when="+hip") depends_on("hip@3.7:", when="+hip")
conflicts("+hip", when="+cuda") conflicts("+hip", when="+cuda")
conflicts("~shared", when="~pic")
def cmake_args(self): def cmake_args(self):
spec = self.spec spec = self.spec