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

Ascent: add dependency on adios2, remove deprecated variant (#28876)

Browse Source 
Also update specs to be less complicated for dray/mfem/vtk-h.
Removed deprecated adios variant.
This commit is contained in:
kwryankrattiger 2022-02-11 02:14:06 -06:00 committed by GitHub
parent 37728900e6
commit cba918c081
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
var/spack/repos/builtin/packages/ascent/package.py
View File

@ -78,7 +78,6 @@ class Ascent(CMakePackage, CudaPackage):
variant("openmp", default=(sys.platform != 'darwin'), variant("openmp", default=(sys.platform != 'darwin'),
description="build openmp support") description="build openmp support")
variant("mfem", default=False, description="Build MFEM filter support") variant("mfem", default=False, description="Build MFEM filter support")
variant("adios", default=False, description="Build Adios filter support")
variant("dray", default=False, description="Build with Devil Ray support") variant("dray", default=False, description="Build with Devil Ray support")
variant("adios2", default=False, description="Build Adios2 filter support") variant("adios2", default=False, description="Build Adios2 filter support")
variant("fides", default=False, description="Build Fides filter support") variant("fides", default=False, description="Build Fides filter support")
@ -103,8 +102,8 @@ class Ascent(CMakePackage, CudaPackage):
# Certain CMake versions have been found to break for our use cases # Certain CMake versions have been found to break for our use cases
depends_on("cmake@3.14.1:3.14,3.18.2:", type='build') depends_on("cmake@3.14.1:3.14,3.18.2:", type='build')
depends_on("conduit@:0.7.2", when="@:0.7.1") depends_on("conduit@:0.7.2", when="@:0.7.1")
depends_on("conduit~python", when="~python")
depends_on("conduit+python", when="+python") depends_on("conduit+python", when="+python")
depends_on("conduit~python", when="~python")
depends_on("conduit+mpi", when="+mpi") depends_on("conduit+mpi", when="+mpi")
depends_on("conduit~mpi", when="~mpi") depends_on("conduit~mpi", when="~mpi")
@ -136,43 +135,45 @@ class Ascent(CMakePackage, CudaPackage):
############################# #############################
depends_on("vtk-h", when="+vtkh") depends_on("vtk-h", when="+vtkh")
# propagate relevent variants to vtk-h
depends_on("vtk-h+openmp", when="+vtkh+openmp")
depends_on("vtk-h~openmp", when="+vtkh~openmp") depends_on("vtk-h~openmp", when="+vtkh~openmp")
depends_on("vtk-h+cuda+openmp", when="+vtkh+cuda+openmp") depends_on("vtk-h+cuda", when="+vtkh+cuda")
depends_on("vtk-h+cuda~openmp", when="+vtkh+cuda~openmp") depends_on("vtk-h~cuda", when="+vtkh~cuda")
depends_on("vtk-h+shared", when="+vtkh+shared")
depends_on("vtk-h~shared", when="~shared+vtkh") depends_on("vtk-h~shared", when="+vtkh~shared")
depends_on("vtk-h~shared~openmp", when="~shared+vtkh~openmp")
depends_on("vtk-h~shared+cuda", when="~shared+vtkh+cuda")
depends_on("vtk-h~shared+cuda~openmp", when="~shared+vtkh+cuda~openmp")
# mfem # mfem
depends_on("mfem~threadsafe~openmp+shared+mpi+conduit", when="+shared+mfem+mpi") depends_on("mfem~threadsafe~openmp+conduit", when="+mfem")
depends_on("mfem~threadsafe~openmp~shared+mpi+conduit", when="~shared+mfem+mpi") # propagate relevent variants to mfem
depends_on("mfem+mpi", when="+mfem+mpi")
depends_on("mfem~threadsafe~openmp+shared~mpi+conduit", when="+shared+mfem~mpi") depends_on("mfem~mpi", when="+mfem~mpi")
depends_on("mfem~threadsafe~openmp~shared~mpi+conduit", when="~shared+mfem~mpi") depends_on("mfem+shared", when="+mfem+shared")
depends_on("mfem~shared", when="+mfem~shared")
# fides # fides
depends_on("fides", when="+fides") depends_on("fides", when="+fides")
# devil ray variants with mpi # devil ray variants with mpi
# we have to specify both because mfem makes us # we have to specify both because mfem makes us
depends_on("dray+mpi~test~utils+shared+cuda", when="+dray+mpi+cuda+shared") depends_on('dray~test~utils', when='+dray')
depends_on("dray+mpi~test~utils+shared+openmp", when="+dray+mpi+openmp+shared") # propagate relevent variants to dray
depends_on("dray+mpi~test~utils+shared~openmp~cuda", when="+dray+mpi~openmp~cuda+shared") depends_on('dray+cuda', when='+dray+cuda')
depends_on('dray~cuda', when='+dray~cuda')
depends_on('dray+mpi', when='+dray+mpi')
depends_on('dray~mpi', when='+dray~mpi')
depends_on('dray+shared', when='+dray+shared')
depends_on('dray~shared', when='+dray~shared')
depends_on('dray+openmp', when='+dray+openmp')
depends_on('dray~openmp', when='+dray~openmp')
depends_on("dray+mpi~test~utils~shared+cuda", when="+dray+mpi+cuda~shared") # Adios2
depends_on("dray+mpi~test~utils~shared+openmp", when="+dray+mpi+openmp~shared") depends_on('adios2', when='+adios2')
depends_on("dray+mpi~test~utils~shared~openmp~cuda", when="+dray+mpi~openmp~cuda~shared") # propagate relevent variants to adios2
depends_on('adios2+mpi', when='+adios2+mpi')
# devil ray variants without mpi depends_on('adios2~mpi', when='+adios2~mpi')
depends_on("dray~mpi~test~utils+shared+cuda", when="+dray~mpi+cuda+shared") depends_on('adios2+shared', when='+adios2+shared')
depends_on("dray~mpi~test~utils+shared+openmp", when="+dray~mpi+openmp+shared") depends_on('adios2~shared', when='+adios2~shared')
depends_on("dray~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 # Documentation related