From 513d3bac04f031608622ea654ddf27b584da9610 Mon Sep 17 00:00:00 2001 From: Cyrus Harrison Date: Fri, 26 Mar 2021 13:47:46 -0700 Subject: update ascent and friends for the ascent 0.7.0 release (#22428) --- var/spack/repos/builtin/packages/ascent/package.py | 37 ++++++++++++---------- .../repos/builtin/packages/babelflow/package.py | 6 ++-- var/spack/repos/builtin/packages/dray/package.py | 27 ++++++++-------- var/spack/repos/builtin/packages/mfem/package.py | 6 ++-- .../builtin/packages/parallelmergetree/package.py | 28 +++++++++++----- var/spack/repos/builtin/packages/vtk-h/package.py | 20 +++++++----- var/spack/repos/builtin/packages/vtk-m/package.py | 31 ++++++++++++------ 7 files changed, 95 insertions(+), 60 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/ascent/package.py b/var/spack/repos/builtin/packages/ascent/package.py index a8b3e6491e..ba04001026 100644 --- a/var/spack/repos/builtin/packages/ascent/package.py +++ b/var/spack/repos/builtin/packages/ascent/package.py @@ -42,11 +42,16 @@ class Ascent(Package, CudaPackage): version('develop', branch='develop', submodules=True) - version('0.6.0', - tag='v0.6.0', + + version('0.7.0', + tag='v0.7.0', submodules=True, preferred=True) + version('0.6.0', + tag='v0.6.0', + submodules=True) + ########################################################################### # package variants ########################################################################### @@ -110,8 +115,8 @@ class Ascent(Package, CudaPackage): ####################### # BabelFlow ####################### - depends_on('babelflow@develop', when='+babelflow+mpi') - depends_on('parallelmergetree@develop', when='+babelflow+mpi') + depends_on('babelflow', when='+babelflow+mpi') + depends_on('parallelmergetree', when='+babelflow+mpi') ############################# # TPLs for Runtime Features @@ -138,22 +143,22 @@ class Ascent(Package, CudaPackage): # devil ray variants with mpi # we have to specify both because mfem makes us - depends_on("dray@develop+mpi~test~utils+shared+cuda", when="+dray+mpi+cuda+shared") - depends_on("dray@develop+mpi~test~utils+shared+openmp", when="+dray+mpi+openmp+shared") - depends_on("dray@develop+mpi~test~utils+shared~openmp~cuda", when="+dray+mpi~openmp~cuda+shared") + depends_on("dray+mpi~test~utils+shared+cuda", when="+dray+mpi+cuda+shared") + depends_on("dray+mpi~test~utils+shared+openmp", when="+dray+mpi+openmp+shared") + depends_on("dray+mpi~test~utils+shared~openmp~cuda", when="+dray+mpi~openmp~cuda+shared") - depends_on("dray@develop+mpi~test~utils~shared+cuda", when="+dray+mpi+cuda~shared") - depends_on("dray@develop+mpi~test~utils~shared+openmp", when="+dray+mpi+openmp~shared") - depends_on("dray@develop+mpi~test~utils~shared~openmp~cuda", when="+dray+mpi~openmp~cuda~shared") + depends_on("dray+mpi~test~utils~shared+cuda", when="+dray+mpi+cuda~shared") + depends_on("dray+mpi~test~utils~shared+openmp", when="+dray+mpi+openmp~shared") + depends_on("dray+mpi~test~utils~shared~openmp~cuda", when="+dray+mpi~openmp~cuda~shared") # devil ray variants without mpi - depends_on("dray@develop~mpi~test~utils+shared+cuda", when="+dray~mpi+cuda+shared") - depends_on("dray@develop~mpi~test~utils+shared+openmp", when="+dray~mpi+openmp+shared") - depends_on("dray@develop~mpi~test~utils+shared~openmp~cuda", when="+dray~mpi~openmp~cuda+shared") + depends_on("dray~mpi~test~utils+shared+cuda", when="+dray~mpi+cuda+shared") + depends_on("dray~mpi~test~utils+shared+openmp", when="+dray~mpi+openmp+shared") + depends_on("dray~mpi~test~utils+shared~openmp~cuda", when="+dray~mpi~openmp~cuda+shared") - depends_on("dray@develop~mpi~test~utils~shared+cuda", when="+dray~mpi+cuda~shared") - depends_on("dray@develop~mpi~test~utils~shared+openmp", when="+dray~mpi+openmp~shared") - depends_on("dray@develop~mpi~test~utils~shared~openmp~cuda", when="+dray~mpi~openmp~cuda~shared") + depends_on("dray~mpi~test~utils~shared+cuda", when="+dray~mpi+cuda~shared") + depends_on("dray~mpi~test~utils~shared+openmp", when="+dray~mpi+openmp~shared") + depends_on("dray~mpi~test~utils~shared~openmp~cuda", when="+dray~mpi~openmp~cuda~shared") ####################### # Documentation related diff --git a/var/spack/repos/builtin/packages/babelflow/package.py b/var/spack/repos/builtin/packages/babelflow/package.py index 403ec79228..d6d84c5625 100644 --- a/var/spack/repos/builtin/packages/babelflow/package.py +++ b/var/spack/repos/builtin/packages/babelflow/package.py @@ -12,13 +12,13 @@ class Babelflow(CMakePackage): executed on top of one of several available runtime systems.""" homepage = "https://github.com/sci-visus/BabelFlow" + url = "https://github.com/sci-visus/BabelFlow/archive/v1.0.1.tar.gz" git = 'https://github.com/sci-visus/BabelFlow.git' maintainers = ['spetruzza'] - version('develop', - branch='ascent', - submodules=True) + version('1.0.1', sha256='b7817870b7a1d7ae7ae2eff1a1acec2824675fb856f666d5dc95c41ce453ae91') + version('1.0.0', sha256='4c4d7ddf60e25e8d3550c07875dba3e46e7c9e61b309cc47a409461b7ffa405e') depends_on('mpi') diff --git a/var/spack/repos/builtin/packages/dray/package.py b/var/spack/repos/builtin/packages/dray/package.py index 4da3be6afb..5e31d8352e 100644 --- a/var/spack/repos/builtin/packages/dray/package.py +++ b/var/spack/repos/builtin/packages/dray/package.py @@ -33,7 +33,8 @@ class Dray(Package, CudaPackage): maintainers = ['mclarsen', 'cyrush'] - version('develop', branch='develop', submodules='True', preferred=True) + version('develop', branch='develop', submodules='True') + version('0.1.5', sha256='aaf0975561a8e7910b9353e2dc30bd78abf9f01c306ec042422b7da223d3a8b8') version('0.1.4', sha256='e763a3aa537b23486a4788f9d68db0a3eb545f6a2e617cd7c8a876682ca2d0a0') version('0.1.3', sha256='b2f624a072463189997343b1ed911cc34c9bb1b6c7f0c3e48efeb40c05dd0d92') version('0.1.2', sha256='46937f20124b28dc78a634e8e063a3e7a3bbfd9f424ce2680b08417010c376da') @@ -67,20 +68,20 @@ class Dray(Package, CudaPackage): depends_on("apcomp~shared~openmp~mpi", when="~shared~openmp~mpi") depends_on("apcomp+shared~openmp~mpi", when="+shared~openmp~mpi") - depends_on("raja@0.9.0+cuda~openmp+shared", when="+cuda~openmp+shared") - depends_on("raja@0.9.0+cuda+openmp+shared", when="+cuda+openmp+shared") - depends_on("raja@0.9.0+cuda~openmp~shared", when="+cuda~openmp~shared") - depends_on("raja@0.9.0+cuda+openmp~shared", when="+cuda+openmp~shared") + depends_on("raja+cuda~openmp+shared", when="+cuda~openmp+shared") + depends_on("raja+cuda+openmp+shared", when="+cuda+openmp+shared") + depends_on("raja+cuda~openmp~shared", when="+cuda~openmp~shared") + depends_on("raja+cuda+openmp~shared", when="+cuda+openmp~shared") - depends_on("raja@0.9.0~cuda~openmp+shared", when="~cuda~openmp+shared") - depends_on("raja@0.9.0~cuda+openmp+shared", when="~cuda+openmp+shared") - depends_on("raja@0.9.0~cuda~openmp~shared", when="~cuda~openmp~shared") - depends_on("raja@0.9.0~cuda+openmp~shared", when="~cuda+openmp~shared") + depends_on("raja~cuda~openmp+shared", when="~cuda~openmp+shared") + depends_on("raja~cuda+openmp+shared", when="~cuda+openmp+shared") + depends_on("raja~cuda~openmp~shared", when="~cuda~openmp~shared") + depends_on("raja~cuda+openmp~shared", when="~cuda+openmp~shared") - depends_on("umpire@1.0.0+cuda+shared", when="+cuda+shared") - depends_on("umpire@1.0.0+cuda~shared", when="+cuda~shared") - depends_on("umpire@1.0.0~cuda+shared", when="~cuda+shared") - depends_on("umpire@1.0.0~cuda~shared", when="~cuda~shared") + depends_on("umpire+cuda+shared", when="+cuda+shared") + depends_on("umpire+cuda~shared", when="+cuda~shared") + depends_on("umpire~cuda+shared", when="~cuda+shared") + depends_on("umpire~cuda~shared", when="~cuda~shared") depends_on("mfem+shared+conduit~threadsafe", when="+shared") depends_on("mfem~shared+conduit~threadsafe", when="~shared") diff --git a/var/spack/repos/builtin/packages/mfem/package.py b/var/spack/repos/builtin/packages/mfem/package.py index 3b4c31c4b4..d9e88be3d0 100644 --- a/var/spack/repos/builtin/packages/mfem/package.py +++ b/var/spack/repos/builtin/packages/mfem/package.py @@ -725,9 +725,9 @@ class Mfem(Package): skip_missing=False, work_dir='.') make('clean') - # The files referenced in this patch method do not exist in stable - # versions earlier than 4.1. - @when('@4.1:') + # this patch is only needed for mfem 4.1, where a few + # released files include byte order marks + @when('@4.1.0') def patch(self): # Remove the byte order mark since it messes with some compilers filter_file(u'\uFEFF', '', 'fem/gslib.hpp') diff --git a/var/spack/repos/builtin/packages/parallelmergetree/package.py b/var/spack/repos/builtin/packages/parallelmergetree/package.py index 2741becb1c..54c246f0b0 100644 --- a/var/spack/repos/builtin/packages/parallelmergetree/package.py +++ b/var/spack/repos/builtin/packages/parallelmergetree/package.py @@ -17,18 +17,30 @@ class Parallelmergetree(CMakePackage): maintainers = ['spetruzza'] - version('develop', - commit='6774ed74fd13b9747ac792978a676ce6e8b05cab', + version('1.0.2', + git='https://bitbucket.org/cedmav/parallelmergetree.git', + tag='v1.0.2', submodules=True) - depends_on('babelflow@develop') + version('1.0.0', + git='https://bitbucket.org/cedmav/parallelmergetree.git', + tag='v1.0.0', + submodules=True) + + depends_on('babelflow') variant("shared", default=True, description="Build ParallelMergeTree as shared libs") def cmake_args(self): - args = [ - '-DBUILD_SHARED_LIBS:BOOL={0}'.format( - 'ON' if '+shared' in spec else 'OFF'), - '-DLIBRARY_ONLY=ON' - ] + args = [] + + if "+shared" in self.spec: + args.append('-DBUILD_SHARED_LIBS=ON') + else: + args.append('-DBUILD_SHARED_LIBS=OFF') + + args.append('-DLIBRARY_ONLY=ON') + args.append('-DBabelFlow_DIR={0}'.format( + self.spec['babelflow'].prefix)) + return args diff --git a/var/spack/repos/builtin/packages/vtk-h/package.py b/var/spack/repos/builtin/packages/vtk-h/package.py index ee78f09f75..514fe6d484 100644 --- a/var/spack/repos/builtin/packages/vtk-h/package.py +++ b/var/spack/repos/builtin/packages/vtk-h/package.py @@ -40,6 +40,10 @@ class VtkH(Package, CudaPackage): maintainers = ['cyrush'] version('develop', branch='develop', submodules=True) + version('0.7.0', sha256="1b3c15c1340c5f66edcc2962ffe2f0d86e155f45a4932cf9c407261c203fbc19") + version('0.6.9', sha256="8111f59c3528f02cb3c5083c17a1737dff9472266b156732794612471f3393c7") + version('0.6.8', sha256="0a37468ca65fdc12509b9fd53c74d5afb090630280e1161415d7377cad7d45f1") + version('0.6.7', sha256="aff3ab94cf137fbc3019149363d5d8a39d052b02ecef42c6bf6d076e538af3f2") version('0.6.6', sha256="5fe8bae5f55dbeb3047a37499cc41f3b548e4d86f0058993069f1df57f7915a1") version('0.6.5', sha256="3e566ee06150edece8a61711d9347de216c1ae45f3b4585784b2252ee9ff2a9b") version('0.6.4', sha256="c1345679fa4110cba449a9e27d40774d53c1f0bbddd41e52f5eb395cec1ee2d0") @@ -69,17 +73,17 @@ class VtkH(Package, CudaPackage): depends_on("mpi", when="+mpi") depends_on("cuda", when="+cuda") - depends_on("vtk-m@ascent_ver~tbb+openmp", when="+openmp") - depends_on("vtk-m@ascent_ver~tbb~openmp", when="~openmp") + depends_on("vtk-m~tbb+openmp", when="+openmp") + depends_on("vtk-m~tbb~openmp", when="~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+cuda~tbb+openmp", when="+cuda+openmp") + depends_on("vtk-m+cuda~tbb~openmp", when="+cuda~openmp") - 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~tbb+openmp~shared", when="+openmp~shared") + depends_on("vtk-m~tbb~openmp~shared", when="~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") + depends_on("vtk-m+cuda~tbb+openmp~shared", when="+cuda+openmp~shared") + depends_on("vtk-m+cuda~tbb~openmp~shared", when="+cuda~openmp~shared") def install(self, spec, prefix): with working_dir('spack-build', create=True): diff --git a/var/spack/repos/builtin/packages/vtk-m/package.py b/var/spack/repos/builtin/packages/vtk-m/package.py index fa5e5babfd..fb2e433240 100644 --- a/var/spack/repos/builtin/packages/vtk-m/package.py +++ b/var/spack/repos/builtin/packages/vtk-m/package.py @@ -25,17 +25,16 @@ class VtkM(CMakePackage, CudaPackage): git = "https://gitlab.kitware.com/vtk/vtk-m.git" version('master', branch='master') + version('1.5.5', commit="d2d1c854adc8c0518802f153b48afd17646b6252") + version('1.5.4', commit="bbba2a1967b271cc393abd043716d957bca97972") + version('1.5.3', commit="a3b8525ef97d94996ae843db0dd4f675c38e8b1e") + version('1.5.2', commit="c49390f2537c5ba8cf25bd39aa5c212d6eafcf61") version('1.5.1', sha256="64c19e66c0d579cfb21bb0df10d649b523b470b0c9a6c2ea5fd979dfeda2c25e") version('1.5.0', sha256="b1b13715c7fcc8d17f5c7166ff5b3e9025f6865dc33eb9b06a63471c21349aa8") version('1.4.0', sha256="8d83cca7cd5e204d10da151ce4f1846c1f7414c7c1e579173d15c5ea0631555a") version('1.3.0', sha256="f88c1b0a1980f695240eeed9bcccfa420cc089e631dc2917c9728a2eb906df2e") version('1.2.0', sha256="607272992e05f8398d196f0acdcb4af025a4a96cd4f66614c6341f31d4561763") version('1.1.0', sha256="78618c81ca741b1fbba0853cb5d7af12c51973b514c268fc96dfb36b853cdb18") - # version used by ascent - version('ascent_ver', commit="a3b8525ef97d94996ae843db0dd4f675c38e8b1e") - # patches, required for ascent - patch('vtkmdiy_fpic.patch', when='@ascent_ver') - patch('disable_flying_edges.patch', when='@ascent_ver') # use release, instead of release with debug symbols b/c vtkm libs # can overwhelm compilers with too many symbols variant('build_type', default='Release', description='CMake build type', @@ -45,6 +44,8 @@ class VtkM(CMakePackage, CudaPackage): variant("doubleprecision", default=True, description='enable double precision') variant("logging", default=False, description="build logging support") + variant("ascent_types", default=True, description="build support for ascent types") + variant("virtuals", default=False, description="enable support for deprecated virtual functions") variant("mpi", default=False, description="build mpi support") variant("rendering", default=True, description="build rendering support") variant("64bitids", default=False, @@ -68,7 +69,7 @@ class VtkM(CMakePackage, CudaPackage): depends_on("cmake@3.12:", type="build") # CMake >= 3.12 depends_on("cmake@3.18:", when="+hip", type="build") # CMake >= 3.18 - depends_on('cuda@10.2.0:', when='+cuda') + depends_on('cuda@10.1.0:', when='+cuda') depends_on("tbb", when="+tbb") depends_on("mpi", when="+mpi") @@ -108,7 +109,7 @@ class VtkM(CMakePackage, CudaPackage): # logging support if "+logging" in spec: - if not spec.satisfies('@1.3.0:,ascent_ver'): + if not spec.satisfies('@1.3.0:'): raise InstallError('logging is not supported for\ vtkm version lower than 1.3') options.append("-DVTKm_ENABLE_LOGGING:BOOL=ON") @@ -117,7 +118,7 @@ class VtkM(CMakePackage, CudaPackage): # mpi support if "+mpi" in spec: - if not spec.satisfies('@1.3.0:,ascent_ver'): + if not spec.satisfies('@1.3.0:'): raise InstallError('mpi is not supported for\ vtkm version lower than 1.3') options.append("-DVTKm_ENABLE_MPI:BOOL=ON") @@ -130,6 +131,18 @@ class VtkM(CMakePackage, CudaPackage): else: options.append("-DVTKm_ENABLE_RENDERING:BOOL=OFF") + # Support for ascent types + if "+ascent_types" in spec: + options.append("-DVTKm_USE_DEFAULT_TYPES_FOR_ASCENT:BOOL=ON") + else: + options.append("-DVTKm_USE_DEFAULT_TYPES_FOR_ASCENT:BOOL=OFF") + + # Support for deprecated virtual functions + if "+virtuals" in spec: + options.append("-DVTKm_NO_DEPRECATED_VIRTUAL:BOOL=OFF") + else: + options.append("-DVTKm_NO_DEPRECATED_VIRTUAL:BOOL=ON") + # 64 bit ids if "+64bitids" in spec: options.append("-DVTKm_USE_64BIT_IDS:BOOL=ON") @@ -174,7 +187,7 @@ class VtkM(CMakePackage, CudaPackage): # openmp support if "+openmp" in spec: # openmp is added since version 1.3.0 - if not spec.satisfies('@1.3.0:,ascent_ver'): + if not spec.satisfies('@1.3.0:'): raise InstallError('OpenMP is not supported for\ vtkm version lower than 1.3') options.append("-DVTKm_ENABLE_OPENMP:BOOL=ON") -- cgit v1.2.3-70-g09d2