update

Author: nicolemarsaglia

.github/workflows/build_ascent_win.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   build_windows_msvc_base:
     name: MSVC Base Release
-    runs-on: windows-2019
+    runs-on: windows-2025
     steps:
     - name: Setup MPI
       uses: mpi4py/setup-mpi@v1

CHANGELOG.md

@@ -47,6 +47,7 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
 
 ### Fixed
 - Fix parse_camera where order you apply camera operations matters.
+- Fixed WarpX filter that was not allowing for rendering of the output streamlines
 - Fixed Uniform Grid bug only accepting 2D slices along the Z-axis.
 - Resolved a few cases where MPI_COMM_WORLD was used instead instead of the selected MPI communicator.
 - Resolved a bug where a sharing a coordset between multiple polytopal topologies would corrupt mesh processing.

scripts/build_ascent/2025_06_18_vtkm_z_extents_ray_culling_bugfix_viskores_mr109.patch

@@ -0,0 +1,25 @@
+diff --git a/vtkm/rendering/raytracing/Camera.cxx b/vtkm/rendering/raytracing/Camera.cxx
+index 10febf39f..5b6500c20 100644
+--- a/vtkm/rendering/raytracing/Camera.cxx
++++ b/vtkm/rendering/raytracing/Camera.cxx
+@@ -830,11 +830,6 @@ void Camera::FindSubset(const vtkm::Bounds& bounds)
+         transformed[2] = (transformed[2] * 0.5f + 0.5f);
+         zmin = vtkm::Min(zmin, transformed[2]);
+         zmax = vtkm::Max(zmax, transformed[2]);
+-        // skip if outside near and far clipping
+-        if (transformed[2] < 0 || transformed[2] > 1)
+-        {
+-          continue;
+-        }
+         xmin = vtkm::Min(xmin, transformed[0]);
+         ymin = vtkm::Min(ymin, transformed[1]);
+         xmax = vtkm::Max(xmax, transformed[0]);
+@@ -861,7 +856,7 @@ void Camera::FindSubset(const vtkm::Bounds& bounds)
+   //
+   //  scene is behind the camera
+   //
+-  if (zmax < 0 || xmin >= xmax || ymin >= ymax)
++  if (xmin >= xmax || ymin >= ymax)
+   {
+     this->SubsetWidth = 1;
+     this->SubsetHeight = 1;

scripts/build_ascent/build_ascent.sh

@@ -655,6 +655,11 @@ if [ ! -d ${vtkm_src_dir} ]; then
   echo "**** Downloading ${vtkm_tarball}"
   curl -L https://gitlab.kitware.com/vtk/vtk-m/-/archive/${vtkm_version}/vtk-m-${vtkm_version}.tar.gz -o ${vtkm_tarball}
   tar ${tar_extra_args} -xzf ${vtkm_tarball} -C ${source_dir}
+
+  # apply patches
+  cd ${vtkm_src_dir}
+  patch -p1 < ${script_dir}/2025_06_18_vtkm_z_extents_ray_culling_bugfix_viskores_mr109.patch
+  cd ${root_dir}
 fi
 
 
@@ -766,7 +771,7 @@ fi # build_camp
 ################
 # RAJA
 ################
-raja_version=v2025.03.1
+raja_version=v2025.03.2
 raja_src_dir=$(ospath ${source_dir}/RAJA-${raja_version})
 raja_build_dir=$(ospath ${build_dir}/raja-${raja_version})
 raja_install_dir=$(ospath ${install_dir}/raja-${raja_version}/)

scripts/uberenv_configs/packages/ascent/package.py

@@ -198,14 +198,14 @@ class Ascent(CMakePackage, CudaPackage):
     #######################
     with when("+raja"):
         depends_on("raja")
-        depends_on("[email protected]:2024.02.99", when="@0.9.3:")
+        depends_on("[email protected]:2026.12.99", when="@0.9.3:")
         depends_on("raja+openmp", when="+openmp")
         depends_on("raja~openmp", when="~openmp")
 
     with when("+umpire"):
         depends_on("umpire")
         depends_on("umpire@:2023.06.0", when="@:0.9.2")
-        depends_on("[email protected]:2024.02.99", when="@0.9.3:")
+        depends_on("[email protected]:2026.12.99", when="@0.9.3:")
 
     #######################
     # BabelFlow

scripts/uberenv_configs/packages/raja/package.py

@@ -33,6 +33,13 @@ class Raja(CachedCMakePackage, CudaPackage, ROCmPackage):
 
     version("develop", branch="develop", submodules=submodules)
     version("main", branch="main", submodules=submodules)
+    version(
+        "2025.03.2",
+        tag="v2025.03.2",
+        commit="6e36a94380adbe88fed11a3213fc08461428ece0",
+        submodules=submodules,
+        preferred=True,
+    )
     version(
         "2025.03.1",
         tag="v2025.03.1",

scripts/uberenv_configs/packages/umpire/package.py

@@ -30,6 +30,7 @@ class Umpire(CachedCMakePackage, CudaPackage, ROCmPackage):
         tag="v2025.03.0",
         commit="1ed0669c57f041baa1f1070693991c3a7a43e7ee",
         submodules=False,
+        preferred=True,
     )
     version(
         "2024.07.0",

scripts/uberenv_configs/packages/vtk-m/package.py

@@ -1,12 +1,12 @@
-# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
+# Copyright Spack Project Developers. See COPYRIGHT file for details.
 #
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 
 import os
 import sys
 
+from spack.build_systems.cmake import CMakeBuilder
 from spack.package import *
 
 
@@ -21,7 +21,7 @@ class VtkM(CMakePackage, CudaPackage, ROCmPackage):
     homepage = "https://m.vtk.org/"
     maintainers("kmorel", "vicentebolea")
 
-    url = "https://github.com/Kitware/VTK-m/archive/refs/tags/v2.3.0.tar.gz"
+    url = "https://github.com/Kitware/VTK-m/archive/refs/tags/v2.2.0.tar.gz"
     git = "https://github.com/Kitware/VTK-m.git"
     tags = ["e4s"]
 
@@ -31,10 +31,10 @@ class VtkM(CMakePackage, CudaPackage, ROCmPackage):
     version("release", branch="release")
     version(
         "2.3.0",
-        sha256="f40d6b39ca1bcecd232571c92ce606627811909f4e21972d1823e605f686bcf5",
+        sha256="d105ee2de5cfa600f1b4b3d2061f97bebd581a0ae1c86c6174af4e8128f83c54",
         preferred=True,
     )
-    version("2.2.0", sha256="d105ee2de5cfa600f1b4b3d2061f97bebd581a0ae1c86c6174af4e8128f83c54")
+    version("2.2.0", sha256="f40d6b39ca1bcecd232571c92ce606627811909f4e21972d1823e605f686bcf5")
     version("2.1.0", sha256="7b224f1f91e5ef140e193338bf091133b1e9f40d323bccdc8bb80bfc2675e6ea")
     version("2.0.0", sha256="21c8b2cb8f3d4116a4f90c1d08c9f5e27b25c7a0951f7b403eced94576f84880")
     version("1.9.0", sha256="f9862d9d24deae32063ba1ea3d9a42900ac0cdd7f98412d960249a7cac35d47f")
@@ -53,8 +53,6 @@ class VtkM(CMakePackage, CudaPackage, ROCmPackage):
     version("1.2.0", sha256="44596e88b844e7626248fb8e96a38be25a0e585a22256b1c859208b23ef45171")
     version("1.1.0", sha256="55f42c417d3a41893230b2fd3b5c192daeee689a2193de10bf22a1ef5c24c7ad")
 
-    depends_on("cxx", type="build")  # generated
-
     variant("shared", default=False, description="build shared libs")
 
     variant("doubleprecision", default=True, description="enable double precision")
@@ -88,6 +86,9 @@ class VtkM(CMakePackage, CudaPackage, ROCmPackage):
     variant("tbb", default=(sys.platform == "darwin"), description="build TBB support")
     variant("sycl", default=False, description="Build with SYCL backend")
 
+    depends_on("c", type="build")
+    depends_on("cxx", type="build")
+
     depends_on("[email protected]:", type="build")  # CMake >= 3.12
     depends_on("[email protected]:", when="+rocm", type="build")  # CMake >= 3.18
 
@@ -153,23 +154,23 @@ class VtkM(CMakePackage, CudaPackage, ROCmPackage):
 
     # VTK-M PR#3215
     # https://gitlab.kitware.com/vtk/vtk-m/-/merge_requests/3215
-    patch("vtkm-mr3215-ext-geom-fix.patch", when="@2.1:2.2")
+    patch("vtkm-mr3215-ext-geom-fix.patch", when="@2.1")
 
     # VTK-M PR#2972
     # https://gitlab.kitware.com/vtk/vtk-m/-/merge_requests/2972
     patch("vtkm-cuda-swap-conflict-pr2972.patch", when="@1.9 +cuda ^cuda@12:")
 
     # VTK-M PR#3160
     # https://gitlab.kitware.com/vtk/vtk-m/-/merge_requests/3160
-    patch("mr3160-rocthrust-fix.patch", when="@2.1:2.2")
+    patch("mr3160-rocthrust-fix.patch", when="@2.1")
 
     # VTK-M PR#3258
     # https://gitlab.kitware.com/vtk/vtk-m/-/merge_requests/3258
-    patch("mr3258-fix-typo-thrust-dependency-with-rocm.patch", when="@:2.2.0")
+    patch("mr3258-fix-typo-thrust-dependency-with-rocm.patch", when="@2.2.0")
 
     # VTK-M PR#3259
     # https://gitlab.kitware.com/vtk/vtk-m/-/merge_requests/3259
-    patch("mr3259-thrust-is_arithmetic-fix.patch", when="@2.0.0:2.3.0 +cuda ^[email protected]:")
+    patch("mr3259-thrust-is_arithmetic-fix.patch", when="@2.0.0:2.2.0 +cuda ^[email protected]:")
 
     # VTK-m PR#3271
     # https://gitlab.kitware.com/vtk/vtk-m/-/merge_requests/3271
@@ -238,7 +239,7 @@ def cmake_args(self):
                 os.environ["TBB_ROOT"] = spec["tbb"].prefix
 
             if "+kokkos" in spec and "+rocm" in spec and spec.satisfies("^kokkos@4:"):
-                options.append(f"-DCMAKE_CXX_COMPILER:BOOL={spec['hip'].prefix.bin.hipcc}")
+                options.append(f"-DCMAKE_CXX_COMPILER:FILEPATH={spec['hip'].prefix.bin.hipcc}")
 
             # Support for relocatable code
             if "~shared" in spec and "+fpic" in spec:
@@ -250,7 +251,7 @@ def cmake_args(self):
                 options.append("-DCMAKE_CUDA_HOST_COMPILER={0}".format(env["SPACK_CXX"]))
 
                 if spec.satisfies("@1.9.0:") and spec.satisfies("^[email protected]:"):
-                    options.append(self.builder.define_cuda_architectures(self))
+                    options.append(CMakeBuilder.define_cuda_architectures(self))
 
                 else:
                     # VTKm_CUDA_Architecture only accepts a single CUDA arch
@@ -270,28 +271,24 @@ def cmake_args(self):
 
             # hip support
             if "+rocm" in spec:
-                options.append(self.builder.define_hip_architectures(self))
+                options.append(CMakeBuilder.define_hip_architectures(self))
 
         return options
 
     def test_smoke_test(self):
         """Build and run ctests"""
-        spec = self.spec
-
-        if "+examples" not in spec:
+        if "+examples" not in self.spec:
             raise SkipTest("Package must be installed with +examples")
 
         testdir = "smoke_test_build"
         with working_dir(testdir, create=True):
-            cmake = Executable(spec["cmake"].prefix.bin.cmake)
-            ctest = Executable(spec["cmake"].prefix.bin.ctest)
-            cmakeExampleDir = spec["vtk-m"].prefix.share.doc.VTKm.examples.smoke_test
-
-            cmake(*([cmakeExampleDir, "-DVTKm_ROOT=" + spec["vtk-m"].prefix]))
-            cmake(*(["--build", "."]))
-            ctest(*(["--verbose"]))
+            cmake = Executable(self.spec["cmake"].prefix.bin.cmake)
+            ctest = Executable(self.spec["cmake"].prefix.bin.ctest)
+            cmake(self.prefix.share.doc.VTKm.examples.smoke_test, f"-DVTKm_ROOT={self.prefix}")
+            cmake("--build", ".")
+            ctest("--verbose")
 
     @run_after("install")
     @on_package_attributes(run_tests=True)
     def build_test(self):
-        self.test_smoke_test()
+        self.test_smoke_test()

scripts/uberenv_configs/spack_configs

@@ -152,7 +152,7 @@ if(MFEM_MPI_ENABLED)
     message(FATAL_ERROR "MFEM was build with MPI support (config.mk has MFEM_USE_MPI = YES)"
                         " but MPI::MPI_CXX target is missing.")
     endif()
-    list(APPEND MFEM_LIBRARIES MPI::MPI_CXX)
+    list(APPEND MFEM_LIBRARIES ${ascent_blt_mpi_deps})
 endif()
 
 if(NOT MFEM_FOUND)