From a06d93f6cb84f0e9b1be1ae954572347687d539e Mon Sep 17 00:00:00 2001
From: Vicente Bolea <vicente.bolea@kitware.com>
Date: Mon, 3 Jan 2022 05:36:11 -0500
Subject: VTKm: add v1.7.0 (#27864)
Co-authored-by: Cyrus Harrison <cyrush@llnl.gov>
---
var/spack/repos/builtin/packages/vtk-h/package.py | 20 ++++++++++----------
var/spack/repos/builtin/packages/vtk-m/package.py | 4 ++--
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/var/spack/repos/builtin/packages/vtk-h/package.py b/var/spack/repos/builtin/packages/vtk-h/package.py
index e876810637..a0579d0536 100644
--- a/var/spack/repos/builtin/packages/vtk-h/package.py
+++ b/var/spack/repos/builtin/packages/vtk-h/package.py
@@ -73,18 +73,18 @@ class VtkH(Package, CudaPackage):
depends_on("mpi", when="+mpi")
depends_on("cuda", when="+cuda")
- depends_on("vtk-m~tbb+openmp", when="+openmp")
- depends_on("vtk-m~tbb~openmp", when="~openmp")
+ depends_on("vtk-m@:1.6~tbb+openmp", when="+openmp")
+ depends_on("vtk-m@:1.6~tbb~openmp", when="~openmp")
for _arch in CudaPackage.cuda_arch_values:
- depends_on("vtk-m+cuda~tbb+openmp cuda_arch={0}".format(_arch), when="+cuda+openmp cuda_arch={0}".format(_arch))
- depends_on("vtk-m+cuda~tbb~openmp cuda_arch={0}".format(_arch), when="+cuda~openmp cuda_arch={0}".format(_arch))
+ depends_on("vtk-m@:1.6+cuda~tbb+openmp cuda_arch={0}".format(_arch), when="+cuda+openmp cuda_arch={0}".format(_arch))
+ depends_on("vtk-m@:1.6+cuda~tbb~openmp cuda_arch={0}".format(_arch), when="+cuda~openmp cuda_arch={0}".format(_arch))
- depends_on("vtk-m~tbb+openmp~shared", when="+openmp~shared")
- depends_on("vtk-m~tbb~openmp~shared", when="~openmp~shared")
+ depends_on("vtk-m@:1.6~tbb+openmp~shared", when="+openmp~shared")
+ depends_on("vtk-m@:1.6~tbb~openmp~shared", when="~openmp~shared")
- depends_on("vtk-m+cuda~tbb+openmp~shared", when="+cuda+openmp~shared")
- depends_on("vtk-m+cuda~tbb~openmp~shared", when="+cuda~openmp~shared")
+ depends_on("vtk-m@:1.6+cuda~tbb+openmp~shared", when="+cuda+openmp~shared")
+ depends_on("vtk-m@:1.6+cuda~tbb~openmp~shared", when="+cuda~openmp~shared")
def install(self, spec, prefix):
with working_dir('spack-build', create=True):
@@ -94,8 +94,8 @@ class VtkH(Package, CudaPackage):
"-DBUILD_TESTING=OFF"]
# shared vs static libs logic
- # force static when building with cuda
- if "+cuda" in spec:
+ # force static when building with CUDA <= 1.6
+ if "+cuda" in spec and spec["vtk-m"].satisfies('@:1.6'):
cmake_args.append('-DBUILD_SHARED_LIBS=OFF')
else:
if "+shared" in spec:
diff --git a/var/spack/repos/builtin/packages/vtk-m/package.py b/var/spack/repos/builtin/packages/vtk-m/package.py
index ca914fd662..2c6f71368c 100644
--- a/var/spack/repos/builtin/packages/vtk-m/package.py
+++ b/var/spack/repos/builtin/packages/vtk-m/package.py
@@ -28,8 +28,8 @@ class VtkM(CMakePackage, CudaPackage):
version('master', branch='master')
version('release', branch='release')
- version('1.7.0-rc1', sha256="e9cedc21f0ad326317acc7689ee0c7719a6cb8af41e87fd232aee5ab8d0620e4")
- version('1.6.0', sha256="14e62d306dd33f82eb9ddb1d5cee987b7a0b91bf08a7a02ca3bce3968c95fd76", preferred=True)
+ version('1.7.0', sha256="a86667ac22057462fc14495363cfdcc486da125b366cb568ec23c86946439be4", preferred=True)
+ version('1.6.0', sha256="14e62d306dd33f82eb9ddb1d5cee987b7a0b91bf08a7a02ca3bce3968c95fd76")
version('1.5.5', commit="d2d1c854adc8c0518802f153b48afd17646b6252")
version('1.5.4', commit="bbba2a1967b271cc393abd043716d957bca97972")
version('1.5.3', commit="a3b8525ef97d94996ae843db0dd4f675c38e8b1e")
--
cgit v1.2.3-70-g09d2