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

update vtk-h package with new version and options (#17499)

Browse Source
This commit is contained in:
Cyrus Harrison 2020-07-13 14:55:38 -07:00 committed by GitHub
parent e0f13b298d
commit 299dcdd3eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
var/spack/repos/builtin/packages/vtk-h/package.py
View File

@ -34,13 +34,20 @@ class VtkH(Package, CudaPackage):
and DIY2 to provide a toolkit with hybrid parallel capabilities."""
homepage = "https://github.com/Alpine-DAV/vtk-h"
url = "https://github.com/Alpine-DAV/vtk-h/releases/download/v0.5.0/vtkh-v0.5.0.tar.gz"
url = "https://github.com/Alpine-DAV/vtk-h/releases/download/v0.5.8/vtkh-v0.5.8.tar.gz"
git = "https://github.com/Alpine-DAV/vtk-h.git"
maintainers = ['cyrush']
version('develop', branch='develop', submodules=True)
version('0.5.0', sha256="9014a8a61a8d7ff636866c6e3b1ebb918ff23fa67cf8d4de801c4a2981de8c96")
version('0.6.1', sha256="ca30b5ff1a48fa247cd20b3f19452f7744eb744465e0b64205135aece42d274f")
version('0.6.0', sha256="2fc054f88ae253fb1bfcae22a156bcced08eca963ba90384dcd5b5791e6dfbf4")
version('0.5.8', sha256="203b337f4280a24a2b75722384f77e0e2f5965058b541efc153db76b7ab98133")
version('0.5.7', sha256="e8c1925dc34ee6be17cec734121e43002e3c02b54ef8dac341b51a455b95e402")
version('0.5.6', sha256="c78c0fa71a9687c2951a06d2112b52aa81fdcdcfbc9464d1578326d03fbb205e")
version('0.5.4', sha256="92bf3741df7a15e36ff41a9a783f3b88eecc86e55cad1defba76f141baa2610b")
version('0.5.3', sha256="0c4aae3bd2a5906738a6806de2b62ea2049ac8b40ebe7fc2ba25505272c2d359")
version('0.5.2', sha256="db2e6250c0ece6381fc90540317ad7b5869dbcce0231ce9be125916a77bfdb25")
variant("shared", default=True, description="Build vtk-h as shared libs")
variant("mpi", default=True, description="build mpi support")
@ -48,6 +55,8 @@ class VtkH(Package, CudaPackage):
variant("cuda", default=False, description="build cuda support")
variant("openmp", default=(sys.platform != 'darwin'),
description="build openmp support")
variant("logging", default=False, description="Build vtk-h with logging enabled")
variant("contourtree", default=False, description="Enable contour tree support")
# use cmake 3.14, newest that provides proper cuda support
# and we have seen errors with cuda in 3.15
@ -56,17 +65,17 @@ class VtkH(Package, CudaPackage):
depends_on("mpi", when="+mpi")
depends_on("cuda", when="+cuda")
depends_on("vtk-m@1.5.0~tbb+openmp", when="+openmp")
depends_on("vtk-m@1.5.0~tbb~openmp", when="~openmp")
depends_on("vtk-m@ascent_ver~tbb+openmp", when="+openmp")
depends_on("vtk-m@ascent_ver~tbb~openmp", when="~openmp")
depends_on("vtk-m@1.5.0+cuda~tbb+openmp", when="+cuda+openmp")
depends_on("vtk-m@1.5.0+cuda~tbb~openmp", when="+cuda~openmp")
depends_on("vtk-m@ascent_ver+cuda~tbb+openmp", when="+cuda+openmp")
depends_on("vtk-m@ascent_ver+cuda~tbb~openmp", when="+cuda~openmp")
depends_on("vtk-m@1.5.0~tbb+openmp~shared", when="+openmp~shared")
depends_on("vtk-m@1.5.0~tbb~openmp~shared", when="~openmp~shared")
depends_on("vtk-m@ascent_ver~tbb+openmp~shared", when="+openmp~shared")
depends_on("vtk-m@ascent_ver~tbb~openmp~shared", when="~openmp~shared")
depends_on("vtk-m@1.5.0+cuda~tbb+openmp~shared", when="+cuda+openmp~shared")
depends_on("vtk-m@1.5.0+cuda~tbb~openmp~shared", when="+cuda~openmp~shared")
depends_on("vtk-m@ascent_ver+cuda~tbb+openmp~shared", when="+cuda+openmp~shared")
depends_on("vtk-m@ascent_ver+cuda~tbb~openmp~shared", when="+cuda~openmp~shared")
def install(self, spec, prefix):
with working_dir('spack-build', create=True):
@ -99,6 +108,13 @@ def install(self, spec, prefix):
if "+openmp" in spec:
cmake_args.append("-DENABLE_OPENMP=ON")
# build with logging
if "+logging" in spec:
cmake_args.append("-DENABLE_LOGGING=ON")
if "+contourtree" in spec:
cmake_args.append("-DENABLE_FILTER_CONTOUR_TREE=ON")
# cuda support
if "+cuda" in spec:
cmake_args.append("-DVTKm_ENABLE_CUDA:BOOL=ON")
@ -215,6 +231,14 @@ def create_host_config(self, spec, prefix, py_site_pkgs_dir=None):
else:
cfg.write(cmake_cache_entry("ENABLE_SERIAL", "OFF"))
#######################
# Logging
#######################
if "+logging" in spec:
cfg.write(cmake_cache_entry("ENABLE_LOGGING", "ON"))
else:
cfg.write(cmake_cache_entry("ENABLE_LOGGING", "OFF"))
#######################
# MPI
#######################

16
var/spack/repos/builtin/packages/vtk-h/vtkm_lagrange_cuda_fix.patch
View File

@ -1,16 +0,0 @@
diff --git a/src/vtkh/filters/CMakeLists.txt b/src/vtkh/filters/CMakeLists.txt
index 4a42d61..f586155 100644
--- a/src/vtkh/filters/CMakeLists.txt
+++ b/src/vtkh/filters/CMakeLists.txt
@@ -41,6 +41,11 @@ set(vtkh_filters_deps vtkh_core vtkh_utils )
if(CUDA_FOUND)
# triggers cuda compile
list(APPEND vtkh_filters_deps cuda)
+
+ if(CMAKE_CUDA_COMPILER_VERSION VERSION_LESS 10.0.0)
+ set(particle_cuda_src "${CMAKE_CURRENT_SOURCE_DIR}/Lagrangian.cpp")
+ set_source_files_properties(${particle_cuda_src} PROPERTIES COMPILE_FLAGS "-Xptxas --opt-level=0")
+ endif()
endif()