@@ -217,41 +217,41 @@ class Ascent(CMakePackage, CudaPackage):
217217 # Viskores
218218 #######################
219219 with when ("+vtkh" ):
220- # viskores if greater than 0.9.6
221- depends_on ("viskores +doubleprecision ~64bitids" , when = "@0.9.6 :" )
222- depends_on ("vtk-m @1.0.0:" , when = "@0.9.6 :" )
223- depends_on ("viskores~tbb" , when = "@0.9.6 :" )
224- depends_on ("viskores+openmp" , when = "@0.9.6 : +openmp" )
225- depends_on ("viskores~openmp" , when = "@0.9.6 : ~openmp" )
226- depends_on ("viskores~cuda" , when = "@0.9.6 : ~cuda" )
227- depends_on ("viskores+cuda" , when = "@0.9.6 : +cuda" )
228- depends_on ("viskores+fpic" , when = "@0.9.6 :" )
229- depends_on ("viskores~shared+fpic" , when = "@0.9.6 : ~shared" )
220+ # viskores if greater than 0.9.5
221+ depends_on ("viskores +doubleprecision ~64bitids" , when = "@0.9.5 :" )
222+ depends_on ("viskores @1.0.0:" , when = "@0.9.5 :" )
223+ depends_on ("viskores~tbb" , when = "@0.9.5 :" )
224+ depends_on ("viskores+openmp" , when = "@0.9.5 : +openmp" )
225+ depends_on ("viskores~openmp" , when = "@0.9.5 : ~openmp" )
226+ depends_on ("viskores~cuda" , when = "@0.9.5 : ~cuda" )
227+ depends_on ("viskores+cuda" , when = "@0.9.5 : +cuda" )
228+ depends_on ("viskores+fpic" , when = "@0.9.5 :" )
229+ depends_on ("viskores~shared+fpic" , when = "@0.9.5 : ~shared" )
230230
231231 # Ascent defaults to C++11
232- depends_on ("kokkos cxxstd=11" , when = "@0.9.6 : +vtkh ^viskores +kokkos" )
233- depends_on (
"[email protected] " ,
when = "@0.9.6 : +vtkh ^viskores +kokkos" )
234-
235- # use vtk-m if prior to 0.9.6
236- depends_on ("vtk-m +doubleprecision ~64bitids" , when = "@:0.9.5 " )
237- depends_on (
"[email protected] :" ,
when = "@0.9.3:0.9.5 " )
238- depends_on (
"[email protected] :" ,
when = "@0.9.3:0.9.5 " )
239- depends_on (
"[email protected] :" ,
when = "@0.9.2:0.9.5 " )
232+ depends_on ("kokkos cxxstd=11" , when = "@0.9.5 : +vtkh ^viskores +kokkos" )
233+ depends_on (
"[email protected] " ,
when = "@0.9.5 : +vtkh ^viskores +kokkos" )
234+
235+ # use vtk-m if prior to 0.9.5
236+ depends_on ("vtk-m +doubleprecision ~64bitids" , when = "@:0.9.4 " )
237+ depends_on (
"[email protected] :" ,
when = "@0.9.3:0.9.4 " )
238+ depends_on (
"[email protected] :" ,
when = "@0.9.3:0.9.4 " )
239+ depends_on (
"[email protected] :" ,
when = "@0.9.2:0.9.4 " )
240240 # 2.1 support needs commit e52b7bb8c9fd131f2fd49edf58037cc5ef77a166
241241 depends_on ("vtk-m@:2.0" , when = "@:0.9.2" )
242242 depends_on (
"[email protected] " ,
when = "@0.9.0:0.9.1" )
243243
244- depends_on ("vtk-m~tbb" , when = "@0.9.0:0.9.5 " )
245- depends_on ("vtk-m+openmp" , when = "@0.9.0:0.9.5 +openmp" )
246- depends_on ("vtk-m~openmp" , when = "@0.9.0:0.9.5 ~openmp" )
247- depends_on ("vtk-m~cuda" , when = "@0.9.0:0.9.5 ~cuda" )
248- depends_on ("vtk-m+cuda" , when = "@0.9.0:0.9.5 +cuda" )
249- depends_on ("vtk-m+fpic" , when = "@0.8.0:0.9.5 " )
250- depends_on ("vtk-m~shared+fpic" , when = "@0.8.0:0.9.5 ~shared" )
244+ depends_on ("vtk-m~tbb" , when = "@0.9.0:0.9.4 " )
245+ depends_on ("vtk-m+openmp" , when = "@0.9.0:0.9.4 +openmp" )
246+ depends_on ("vtk-m~openmp" , when = "@0.9.0:0.9.4 ~openmp" )
247+ depends_on ("vtk-m~cuda" , when = "@0.9.0:0.9.4 ~cuda" )
248+ depends_on ("vtk-m+cuda" , when = "@0.9.0:0.9.4 +cuda" )
249+ depends_on ("vtk-m+fpic" , when = "@0.8.0:0.9.4 " )
250+ depends_on ("vtk-m~shared+fpic" , when = "@0.8.0:0.9.4 ~shared" )
251251
252252 # Ascent defaults to C++11
253- depends_on ("kokkos cxxstd=11" , when = "@:0.9.5 +vtkh ^vtk-m +kokkos" )
254- depends_on (
"[email protected] " ,
when = "@0.9.3:0.9.5 +vtkh ^vtk-m +kokkos" )
253+ depends_on ("kokkos cxxstd=11" , when = "@:0.9.4 +vtkh ^vtk-m +kokkos" )
254+ depends_on (
"[email protected] " ,
when = "@0.9.3:0.9.4 +vtkh ^vtk-m +kokkos" )
255255
256256 #######################
257257 # VTK-h
0 commit comments