Dray

README.md

@@ -31,4 +31,3 @@ or the following files in the Ascent source tree:
 Changelog
 =========
 - [Changelog](/CHANGELOG.md)
-

azure-pipelines.yml

@@ -28,12 +28,12 @@ stages:
           # run our sanity check script
           #######################################
           git fetch
-          python scripts/ci/check_blt_time_travel.py 
+          python scripts/ci/check_blt_time_travel.py
         displayName: 'BLT Time Travel Check'
 
 # main checks
 - stage: Main
-  jobs:  
+  jobs:
   ###############################################################################
   # Ubuntu build and test, using spack to build tpls
   ###############################################################################
@@ -136,8 +136,8 @@ stages:
            # vtkh
            if [ $ENABLE_VTKH  = 'OFF' ]; then export SPACK_SPEC="${SPACK_SPEC}~vtkh"; fi
            # mfem
-           if [ $ENABLE_MFEM  = 'ON' ];  then export SPACK_SPEC="${SPACK_SPEC}+mfem"; fi
-           if [ $ENABLE_MFEM  = 'OFF' ]; then export SPACK_SPEC="${SPACK_SPEC}~mfem"; fi
+           if [ $ENABLE_MFEM  = 'ON' ];  then export SPACK_SPEC="${SPACK_SPEC}+mfem+dray"; fi
+           if [ $ENABLE_MFEM  = 'OFF' ]; then export SPACK_SPEC="${SPACK_SPEC}~mfem~dray"; fi
            # babelflow
            if [ $ENABLE_BABELFLOW  = 'ON' ]; then export SPACK_SPEC="${SPACK_SPEC}+babelflow"; fi
            # python
@@ -329,8 +329,8 @@ stages:
            # vtkh
            if [ $ENABLE_VTKH  = 'OFF' ]; then export SPACK_SPEC="${SPACK_SPEC}~vtkh"; fi
            # mfem
-           if [ $ENABLE_MFEM  = 'ON' ];  then export SPACK_SPEC="${SPACK_SPEC}+mfem"; fi
-           if [ $ENABLE_MFEM  = 'OFF' ]; then export SPACK_SPEC="${SPACK_SPEC}~mfem"; fi
+           if [ $ENABLE_MFEM  = 'ON' ];  then export SPACK_SPEC="${SPACK_SPEC}+mfem+dray"; fi
+           if [ $ENABLE_MFEM  = 'OFF' ]; then export SPACK_SPEC="${SPACK_SPEC}~mfem~dray"; fi
            # babelflow
            if [ $ENABLE_BABELFLOW  = 'ON' ]; then export SPACK_SPEC="${SPACK_SPEC}+babelflow"; fi
            # python
@@ -670,7 +670,7 @@ stages:
 
 
 ###############################################################################
-# disable b/c macos recipie needs more work 
+# disable b/c macos recipie needs more work
 ###############################################################################
 
 ###############################################################################

hashes.txt

@@ -1,3 +1,3 @@
-vtkm branch='master' commit='124fb23c50c14b171ae91b27abca77c435968fa5'
-vtkh branch='develop' commit='828a63ff6e82e695eecb569b4346c4b36b599395'
+vtkm branch='master' commit='23a202b881ef58d08d9fa53f07e5f5532f58209a'
+vtkh branch='develop' commit='bef5bbe6169d877cb1493818b83b9f6e12c172c0'
 blt  branch='develop' commit='2373d6bc072f637ea0545df863c3d75a20c2185f'

scripts/uberenv/packages/ascent/package.py

@@ -69,6 +69,7 @@ class Ascent(Package, CudaPackage):
     variant("cuda", default=False, description="Build cuda 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")
 
     # variants for dev-tools (docs, etc)
     variant("doc", default=False, description="Build Conduit's documentation")
@@ -117,15 +118,15 @@ class Ascent(Package, CudaPackage):
     # TPLs for Runtime Features
     #############################
 
-    depends_on("vtk-h@0.5.2",             when="+vtkh")
-    depends_on("vtk-h@0.5.2~openmp",      when="+vtkh~openmp")
-    depends_on("vtk-h@0.5.2+cuda+openmp", when="+vtkh+cuda+openmp")
-    depends_on("vtk-h@0.5.2+cuda~openmp", when="+vtkh+cuda~openmp")
+    depends_on("vtk-h@0.5.3",             when="+vtkh")
+    depends_on("vtk-h@0.5.3~openmp",      when="+vtkh~openmp")
+    depends_on("vtk-h@0.5.3+cuda+openmp", when="+vtkh+cuda+openmp")
+    depends_on("vtk-h@0.5.3+cuda~openmp", when="+vtkh+cuda~openmp")
 
-    depends_on("vtk-h@0.5.2~shared",             when="~shared+vtkh")
-    depends_on("vtk-h@0.5.2~shared~openmp",      when="~shared+vtkh~openmp")
-    depends_on("vtk-h@0.5.2~shared+cuda",        when="~shared+vtkh+cuda")
-    depends_on("vtk-h@0.5.2~shared+cuda~openmp", when="~shared+vtkh+cuda~openmp")
+    depends_on("vtk-h@0.5.3~shared",             when="~shared+vtkh")
+    depends_on("vtk-h@0.5.3~shared~openmp",      when="~shared+vtkh~openmp")
+    depends_on("vtk-h@0.5.3~shared+cuda",        when="~shared+vtkh+cuda")
+    depends_on("vtk-h@0.5.3~shared+cuda~openmp", when="~shared+vtkh+cuda~openmp")
 
     # mfem
     depends_on("mfem@4.0.2~threadsafe~openmp+shared+mpi+conduit", when="+shared+mfem+mpi")
@@ -136,6 +137,26 @@ class Ascent(Package, CudaPackage):
 
     depends_on("adios", when="+adios")
 
+    # devil ray variants wit mpi
+    # we have to specify both because mfem makes us
+    depends_on("dray@0.1.1+mpi~test~utils+shared+cuda",        when="+dray+mpi+cuda+shared")
+    depends_on("dray@0.1.1+mpi~test~utils+shared+openmp",      when="+dray+mpi+openmp+shared")
+    depends_on("dray@0.1.1+mpi~test~utils+shared~openmp~cuda", when="+dray+mpi~openmp~cuda+shared")
+
+    depends_on("dray@0.1.1+mpi~test~utils~shared+cuda",        when="+dray+mpi+cuda~shared")
+    depends_on("dray@0.1.1+mpi~test~utils~shared+openmp",      when="+dray+mpi+openmp~shared")
+    depends_on("dray@0.1.1+mpi~test~utils~shared~openmp~cuda", when="+dray+mpi~openmp~cuda~shared")
+
+    # devil ray variants 1ithout mpi
+    depends_on("dray@0.1.1~mpi~test~utils+shared+cuda",        when="+dray~mpi+cuda+shared")
+    depends_on("dray@0.1.1~mpi~test~utils+shared+openmp",      when="+dray~mpi+openmp+shared")
+    depends_on("dray@0.1.1~mpi~test~utils+shared~openmp~cuda", when="+dray~mpi~openmp~cuda+shared")
+
+    depends_on("dray@0.1.1~mpi~test~utils~shared+cuda",        when="+dray~mpi+cuda~shared")
+    depends_on("dray@0.1.1~mpi~test~utils~shared+openmp",      when="+dray~mpi+openmp~shared")
+    depends_on("dray@0.1.1~mpi~test~utils~shared~openmp~cuda", when="+dray~mpi~openmp~cuda~shared")
+
+
     #######################
     # Documentation related
     #######################
@@ -469,6 +490,15 @@ def create_host_config(self, spec, prefix, py_site_pkgs_dir=None):
         else:
             cfg.write("# mfem not built by spack \n")
 
+        #######################
+        # Devil Ray
+        #######################
+        if "+dray" in spec:
+            cfg.write("# devil ray from spack \n")
+            cfg.write(cmake_cache_entry("DRAY_DIR", spec['dray'].prefix))
+        else:
+            cfg.write("# devil ray not built by spack \n")
+
         #######################
         # Adios
         #######################