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

Update the VTK-m package with better defaults and cuda corrections (#12850)

Browse Source
This commit is contained in:
Robert Maynard 2019-10-04 15:12:58 -04:00 committed by Chuck Atkins
parent 3cb4547348
commit b1cdf8bd57
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
var/spack/repos/builtin/packages/vtkm/package.py
View File

@ -6,6 +6,7 @@
from spack import * from spack import *
import os import os
import sys
class Vtkm(CMakePackage, CudaPackage): class Vtkm(CMakePackage, CudaPackage):
@ -21,6 +22,7 @@ class Vtkm(CMakePackage, CudaPackage):
git = "https://gitlab.kitware.com/vtk/vtk-m.git" git = "https://gitlab.kitware.com/vtk/vtk-m.git"
version('master', branch='master') version('master', branch='master')
version('1.4.0', "b0d76bbf5a69c18ec6f1fca4f7858047b65330bd")
version('1.3.0', "d9f6e274dec2ea01273cccaba356d23ca88c5a25") version('1.3.0', "d9f6e274dec2ea01273cccaba356d23ca88c5a25")
version('1.2.0', "3295fed86012226c107e1f2605ca7cc583586b63") version('1.2.0', "3295fed86012226c107e1f2605ca7cc583586b63")
version('1.1.0', "6aab1c0885f6ffaaffcf07930873d0df") version('1.1.0', "6aab1c0885f6ffaaffcf07930873d0df")
@ -29,15 +31,15 @@ class Vtkm(CMakePackage, CudaPackage):
# can overwhelm compilers with too many symbols # can overwhelm compilers with too many symbols
variant('build_type', default='Release', description='CMake build type', variant('build_type', default='Release', description='CMake build type',
values=('Debug', 'Release', 'RelWithDebInfo', 'MinSizeRel')) values=('Debug', 'Release', 'RelWithDebInfo', 'MinSizeRel'))
variant("shared", default=True, description="build shared libs") variant("shared", default=False, description="build shared libs")
variant("cuda", default=False, description="build cuda support") variant("cuda", default=False, description="build cuda support")
variant("doubleprecision", default=True, variant("doubleprecision", default=True,
description='enable double precision') description='enable double precision')
variant("logging", default=False, description="build logging support") variant("logging", default=True, description="build logging support")
variant("mpi", default=False, description="build mpi support") variant("mpi", default=False, description="build mpi support")
variant("openmp", default=False, description="build openmp support") variant("openmp", default=(sys.platform != 'darwin'), description="build openmp support")
variant("rendering", default=True, description="build rendering support") variant("rendering", default=True, description="build rendering support")
variant("tbb", default=True, description="build TBB support") variant("tbb", default=(sys.platform == 'darwin'), description="build TBB support")
variant("64bitids", default=False, variant("64bitids", default=False,
description="enable 64 bits ids") description="enable 64 bits ids")
@ -46,9 +48,16 @@ class Vtkm(CMakePackage, CudaPackage):
depends_on("cuda", when="+cuda") depends_on("cuda", when="+cuda")
depends_on("mpi", when="+mpi") depends_on("mpi", when="+mpi")
conflicts("~shared", when="~pic")
def cmake_args(self): def cmake_args(self):
spec = self.spec spec = self.spec
options = [] options = []
gpu_name_table = {'20': 'fermi',
'30': 'kepler', '32': 'kepler', '35': 'kepler',
'50': 'maxwell', '52': 'maxwell', '53': 'maxwell',
'60': 'pascal', '61': 'pascal', '62': 'pascal',
'70': 'turing', '72': 'turing', '75': 'turing'}
with working_dir('spack-build', create=True): with working_dir('spack-build', create=True):
options = ["-DVTKm_ENABLE_TESTING:BOOL=OFF"] options = ["-DVTKm_ENABLE_TESTING:BOOL=OFF"]
# shared vs static libs # shared vs static libs
@ -60,9 +69,10 @@ def cmake_args(self):
if "+cuda" in spec: if "+cuda" in spec:
options.append("-DVTKm_ENABLE_CUDA:BOOL=ON") options.append("-DVTKm_ENABLE_CUDA:BOOL=ON")
if 'cuda_arch' in spec.variants: if 'cuda_arch' in spec.variants:
cuda_arch = spec.variants['cuda_arch'].value cuda_value = spec.variants['cuda_arch'].value
name = gpu_name_table[cuda_value[0]]
options.append( options.append(
'-DVTKm_CUDA_Architecture={0}'.format(cuda_arch[0])) '-DVTKm_CUDA_Architecture={0}'.format(name))
else: else:
# this fix is necessary if compiling platform has cuda, but # this fix is necessary if compiling platform has cuda, but
# no devices (this's common for front end nodes on hpc clus # no devices (this's common for front end nodes on hpc clus