diff options
| author | kwryankrattiger <80296582+kwryankrattiger@users.noreply.github.com> | 2023-03-31 11:24:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-31 11:24:45 -0500 |
| commit | 4064191fbc461055e85bd3c4e920a8edb888e86f (patch) | |
| tree | e82ead7815b9bb5fc87f165cf22a22aca249e9fb | |
| parent | 7bb64b526fd8abc2713fb728fd55c1e32eff1e2c (diff) | |
| download | spack-4064191fbc461055e85bd3c4e920a8edb888e86f.tar.gz spack-4064191fbc461055e85bd3c4e920a8edb888e86f.tar.bz2 spack-4064191fbc461055e85bd3c4e920a8edb888e86f.tar.xz spack-4064191fbc461055e85bd3c4e920a8edb888e86f.zip | |
Ascent: Drop VTK-h dependency for 0.9 (#36458)
* 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
| -rw-r--r-- | var/spack/repos/builtin/packages/ascent/package.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/ascent/package.py b/var/spack/repos/builtin/packages/ascent/package.py index 8c4fccc717..c229f7fba1 100644 --- a/var/spack/repos/builtin/packages/ascent/package.py +++ b/var/spack/repos/builtin/packages/ascent/package.py @@ -169,13 +169,11 @@ class Ascent(CMakePackage, CudaPackage): # 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+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+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 # VTK-h was developed externally 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 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( "+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): env.set("CTEST_OUTPUT_ON_FAILURE", "1") |