hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Ascent: Drop VTK-h dependency for 0.9 (#36458)

Browse source 
* Ascent: Drop VTK-h dependency for 0.9

* Ascent: Remove duplicate OpenMP constraints

* Ascent: 0.9.0 cannot build with vtk-m@2

* Ascent: Only needs vtkm when using vtkh

* Ascent: Require fides when building with ADIOS2
This commit is contained in:
kwryankrattiger 2023-03-31 11:24:45 -05:00 committed by GitHub
parent 7bb64b526f
commit 4064191fbc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
var/spack/repos/builtin/packages/ascent/package.py
View file

@ -169,13 +169,11 @@ class Ascent(CMakePackage, CudaPackage):
# VTK-m # VTK-m
####################### #######################
depends_on("vtk-m@1.9:", when="@0.9.0:") depends_on("vtk-m@1.9:1.9", when="@0.9.0: +vtkh")
depends_on("vtk-m~tbb", when="@0.9.0: +vtkh") depends_on("vtk-m~tbb", when="@0.9.0: +vtkh")
depends_on("vtk-m+openmp", when="@0.9.0: +vtkh+openmp") depends_on("vtk-m+openmp", when="@0.9.0: +vtkh+openmp")
depends_on("vtk-m~openmp", when="@0.9.0: +vtkh~openmp") depends_on("vtk-m~openmp", when="@0.9.0: +vtkh~openmp")
depends_on("vtk-m+openmp", when="@0.9.0: +vtkh+openmp")
depends_on("vtk-m~openmp", when="@0.9.0: +vtkh~openmp")
depends_on("vtk-m~cuda", when="@0.9.0: +vtkh~cuda") depends_on("vtk-m~cuda", when="@0.9.0: +vtkh~cuda")
depends_on("vtk-m+cuda", when="@0.9.0: +vtkh+cuda") depends_on("vtk-m+cuda", when="@0.9.0: +vtkh+cuda")
depends_on("vtk-m+fpic", when="@0.8.0: +vtkh") depends_on("vtk-m+fpic", when="@0.8.0: +vtkh")
@ -187,7 +185,7 @@ class Ascent(CMakePackage, CudaPackage):
# Ascent 0.9.0 includes VTK-h, prior to 0.9.0 # Ascent 0.9.0 includes VTK-h, prior to 0.9.0
# VTK-h was developed externally # VTK-h was developed externally
depends_on("vtk-h@:0.7", when="@:0.7 +vtkh") depends_on("vtk-h@:0.7", when="@:0.7 +vtkh")
depends_on("vtk-h@0.8.1:", when="@0.8: +vtkh") depends_on("vtk-h@0.8.1:", when="@0.8:0.8 +vtkh")
# propagate relevent variants to vtk-h # propagate relevent variants to vtk-h
depends_on("vtk-h+openmp", when="@:0.8.0 +vtkh+openmp") depends_on("vtk-h+openmp", when="@:0.8.0 +vtkh+openmp")
depends_on("vtk-h~openmp", when="@:0.8.0 +vtkh~openmp") depends_on("vtk-h~openmp", when="@:0.8.0 +vtkh~openmp")
@ -256,6 +254,9 @@ class Ascent(CMakePackage, CudaPackage):
conflicts( conflicts(
"+shared", when="@:0.7 +cuda", msg="Ascent needs to be built with ~shared for CUDA builds." "+shared", when="@:0.7 +cuda", msg="Ascent needs to be built with ~shared for CUDA builds."
) )
conflicts(
"~fides", when="@0.9: +adios2", msg="Ascent >= 0.9 assumes FIDES when building ADIOS2"
)
def setup_build_environment(self, env): def setup_build_environment(self, env):
env.set("CTEST_OUTPUT_ON_FAILURE", "1") env.set("CTEST_OUTPUT_ON_FAILURE", "1")