hypre-space · rfalgout · Sep 26, 2025 · Feb 19, 2025 · Feb 19, 2025 · Feb 20, 2025
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,11 @@
 *.o
 *.obj
+*.o_flt
+*.o_dbl
+*.o_ldbl
+*.obj_flt
+*.obj_dbl
+*.obj_ldbl
 *.a
 *.so
 *.out.*
@@ -18,9 +24,11 @@ config.status
 Makefile.config
 HYPRE_config.h
 autom4te.cache
+*.TVD.v4breakpoints*
 src/TAGS
 hypre/
-install/
+build*/
+install*/
 AUTOTEST/*.dir
 out/
 .vscode
@@ -52,18 +60,25 @@ src/test/ij_mv
 src/test/ij_mv.exe
 src/test/ij_mm
 src/test/ij_mm.exe
-src/test/maxwell_unscaled
-src/test/maxwell_unscaled.exe
+src/test/ij_mp
 src/test/sstruct
 src/test/sstruct.exe
-src/test/sstruct_fac
-src/test/sstruct_fac.exe
+src/test/sstructmat
+src/test/sstructmat.exe
 src/test/struct
 src/test/struct.exe
+src/test/structmat
+src/test/structmat.exe
 src/test/struct_migrate
 src/test/struct_migrate.exe
+src/test/test_mp
+src/test/test_mp_pcg
+src/test/test_mp_pcg_3d
 src/test/zboxloop
 src/test/zboxloop.exe
+src/test/test_mp
+src/test/test_mp_pcg
+src/test/test_mp_pcg_3d
 src/examples/ex[0-9]
 src/examples/ex[0-9].exe
 src/examples/ex1[0-8]

diff --git a/AUTOTEST/check-double.sh b/AUTOTEST/check-double.sh
@@ -35,7 +35,12 @@ find . -type f -print | egrep '[.]*[.](c|cc|cpp|cxx|C|h|hpp|hxx|H)$' |
   egrep -v '/docs' |
   egrep -v '/examples' |
   egrep -v '/FEI_mv' |
-  egrep -v '/hypre/include' > check-double.files
+  egrep -v '/hypre/include' |
+  egrep -v '/test/ij_mp.c' |
+  egrep -v '/test/struct_mp.c' |
+  egrep -v '/test/test_mp.c' |
+  egrep -v '/test/test_mp_pcg.c' |
+  egrep -v '/test/test_mp_pcg_3d.c' > check-double.files
 
 egrep '(^|[^[:alnum:]_-]+)double([^[:alnum:]_-]+|$)' `cat check-double.files` >&2
 

diff --git a/AUTOTEST/check-headers.filters b/AUTOTEST/check-headers.filters
@@ -1,7 +1,7 @@
 mpicc
 mpif77
-include/fortran_matrix.h
-include/multivector.h
-include/interpreter.h
-include/temp_multivector.h
+include/_hypre_fortran_matrix.h
+include/_hypre_lobpcg_multivector.h
+include/_hypre_lobpcg_interpreter.h
+include/_hypre_lobpcg_temp_multivector.h
 fatal: No names found, cannot describe anything.
diff --git a/AUTOTEST/check-int.sh b/AUTOTEST/check-int.sh
@@ -35,7 +35,12 @@ find . -type f -print | egrep '[.]*[.](c|cc|cpp|cxx|C|h|hpp|hxx|H)$' |
   egrep -v '/docs' |
   egrep -v '/examples' |
   egrep -v '/FEI_mv' |
-  egrep -v '/hypre/include' > check-int.files
+  egrep -v '/hypre/include' |
+  egrep -v '/test/ij_mp.c' |
+  egrep -v '/test/struct_mp.c' |
+  egrep -v '/test/test_mp.c' |
+  egrep -v '/test/test_mp_pcg.c' |
+  egrep -v '/test/test_mp_pcg_3d.c' > check-int.files
 
 egrep '(^|[^[:alnum:]_]+)int([^[:alnum:]_]+|$)' `cat check-int.files` >&2
 

diff --git a/AUTOTEST/check-license.filters b/AUTOTEST/check-license.filters
@@ -4,8 +4,6 @@
 ./AUTOTEST/.*.log
 ./AUTOTEST/runtests-.*
 ./src/test/struct_migrate
-./src/test/maxwell_unscaled
-./src/test/sstruct_fac
 ./src/test/ams_driver
 ./src/test/zboxloop
 ./src/test/ij

diff --git a/AUTOTEST/check-license.sh b/AUTOTEST/check-license.sh
@@ -42,7 +42,10 @@ egrep -LR "$LicStr" . | egrep -v '[.](o|obj|a|filters|pdf|svg|gif|png)$' |
   egrep -v '[.]/[.]git' |
   egrep -v '[.]/.*HYPRE_config[.]h' |
   egrep -v '[.]/src/(blas|lapack)/.*[.]c' |
+  egrep -v '[.]/src/.*functions[.]saved$' |
+  egrep -v '[.]/src/.*mup[.](exclude|fixed|functions|methods)$' |
   egrep -v '[.]/src/examples/docs' |
+  egrep -v '[.]/src/docs/wiki-dev' |
   egrep -v '[.]/src/test/TEST_.*'    > check-license.files
 
 # Add these file back to the list
@@ -89,4 +92,5 @@ rm -f check-license.remove check-license.files
 ### Next check for files that should not have the license, but do
 
 # blas and lapack '.c' files should not have an LLNL license
-egrep -lR "$LicStr" ./src/blas ./src/lapack | egrep '[.]/src/(blas|lapack)/.*[.]c' >&2
+egrep -lR "$LicStr" ./src/blas ./src/lapack | egrep '[.]/src/(blas|lapack)/.*[.]c' |
+  egrep -v 'mup.*[.]c' >&2
diff --git a/AUTOTEST/check-mem.sh b/AUTOTEST/check-mem.sh
@@ -39,7 +39,12 @@ find . -type f -print | egrep '[.]*[.](c|cc|cpp|cxx|C|h|hpp|hxx|H)$' |
   egrep -v '/utilities/memory_tracker.c' |
   egrep -v '/utilities/memory.c' |
   egrep -v '/utilities/general.c' |
-  egrep -v '/utilities/device_utils.c' > check-mem.files
+  egrep -v '/utilities/device_utils.c' |
+  egrep -v '/test/ij_mp.c' |
+  egrep -v '/test/struct_mp.c' |
+  egrep -v '/test/test_mp.c' |
+  egrep -v '/test/test_mp_pcg.c' |
+  egrep -v '/test/test_mp_pcg_3d.c' > check-mem.files
 
 egrep '(^|[^[:alnum:]_]+)malloc[[:space:]]*\('  `cat check-mem.files` >&2
 egrep '(^|[^[:alnum:]_]+)calloc[[:space:]]*\('  `cat check-mem.files` >&2

diff --git a/AUTOTEST/check-mpi.sh b/AUTOTEST/check-mpi.sh
@@ -35,7 +35,12 @@ find . -type f -print | egrep '[.]*[.](c|cc|cpp|cxx|C|h|hpp|hxx|H)$' |
   egrep -v '/docs' |
   egrep -v '/examples' |
   egrep -v '/FEI_mv' |
-  egrep -v '/hypre/include' > check-mpi.files
+  egrep -v '/hypre/include' |
+  egrep -v '/test/ij_mp.c' |
+  egrep -v '/test/struct_mp.c' |
+  egrep -v '/test/test_mp.c' |
+  egrep -v '/test/test_mp_pcg.c' |
+  egrep -v '/test/test_mp_pcg_3d.c' > check-mpi.files
 
 egrep '(^|[^[:alnum:]_]+)MPI_' `cat check-mpi.files` |
   egrep -v 'MPI_Comm([^_]|$)' >&2

diff --git a/AUTOTEST/cmake.filters b/AUTOTEST/cmake.filters
@@ -1,3 +1,11 @@
 fatal: No names found, cannot describe anything.
 Additional optimization may be attained by recompiling and specifying MAXMEM option with a value greater than 8192.
 warning: 1501-264 The options qsmp and O0 are incompatible. Option O0 is ignored.
+CMake Warning at config/cmake/HYPRE_SetupGPUToolkit.cmake:97 (message):
+  ===============================================================
+
+   Umpire is explicitly disabled while building hypre for GPUs.
+   This is not recommended for performance reasons!
+   Enable it with -DHYPRE_ENABLE_UMPIRE=ON.
+Call Stack (most recent call first):
+  CMakeLists.txt:400 (include)
diff --git a/AUTOTEST/cmake.sh b/AUTOTEST/cmake.sh
@@ -6,7 +6,7 @@
 
 testname=`basename $0 .sh`
 
-drivers="ij sstruct struct ams_driver maxwell_unscaled sstruct_fac struct_migrate ij_assembly"
+drivers="ij sstruct struct ams_driver struct_migrate ij_assembly"
 
 # Echo usage information
 case $1 in

diff --git a/AUTOTEST/configure.filters b/AUTOTEST/configure.filters
@@ -1,2 +1,7 @@
 fatal: No names found, cannot describe anything.
 WARNING: unknown Fortran name-mangling scheme
+configure: WARNING: ***************************************************************
+configure: WARNING:  Umpire is explicitly disabled while building hypre for GPUs.
+configure: WARNING:  This is not recommended for performance reasons!
+configure: WARNING:  Enable it with --with-umpire.
+configure: WARNING: ***************************************************************
diff --git a/AUTOTEST/machine-lassen.sh b/AUTOTEST/machine-lassen.sh
@@ -55,56 +55,56 @@ module -q load cuda
 module -q load xl
 
 # CUDA with UM in debug mode [ij, ams, struct, sstruct]
-co="--with-cuda --enable-unified-memory --enable-persistent --enable-debug --with-gpu-arch=70 --with-memory-tracker --with-extra-CFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\'"
+co="--with-cuda --with-cxxstandard=11 --without-umpire --enable-unified-memory --enable-persistent --enable-debug --with-gpu-arch=70 --with-memory-tracker --with-extra-CFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\'"
 ro="-ij-gpu -ams -struct -sstruct -rt -mpibind -save ${save} -rtol ${rtol} -atol ${atol}"
 eo="-gpu -rt -mpibind -save ${save} -rtol ${rtol} -atol ${atol}"
 ./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro -eo: $eo
 ./renametest.sh basic $output_dir/basic-cuda-um
 
-# CUDA with UM in debug mode [ij, ams, struct, sstruct]
-co="--with-cuda --enable-unified-memory --enable-persistent --enable-debug --with-print-errors --with-gpu-arch=70 --with-memory-tracker --with-extra-CFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\'"
+# CUDA with UM in debug mode with print errors [error]
+co="--with-cuda --with-cxxstandard=11 --without-umpire --enable-unified-memory --enable-persistent --enable-debug --with-print-errors --with-gpu-arch=70 --with-memory-tracker --with-extra-CFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\'"
 ro="-error -rt -mpibind -save ${save} -rtol ${rtol} -atol ${atol}"
 ./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro
 ./renametest.sh basic $output_dir/basic-cuda-um-with-errors
 
 # CUDA with UM and mixed-int
-co="--with-cuda --enable-unified-memory --enable-mixedint --enable-debug --with-gpu-arch=70 --with-extra-CFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\'"
+co="--with-cuda --with-cxxstandard=11 --without-umpire --enable-unified-memory --enable-mixedint --enable-debug --with-gpu-arch=70 --with-extra-CFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\'"
 ro="-ij-mixed -ams -struct -sstruct-mixed -rt -mpibind -save ${save} -rtol ${rtol} -atol ${atol}"
 ./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro
 ./renametest.sh basic $output_dir/basic-cuda-um-mixedint
 
 # CUDA with UM with shared library
-co="--with-cuda --enable-unified-memory --with-openmp --enable-hopscotch --enable-shared --with-gpu-arch=70 --with-extra-CFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\'"
+co="--with-cuda --with-cxxstandard=11 --without-umpire --enable-unified-memory --with-openmp --enable-hopscotch --enable-shared --with-gpu-arch=70 --with-extra-CFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\'"
 ro="-gpumemcheck -rt -mpibind -cudamemcheck -save ${save}"
 ./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro
 ./renametest.sh basic $output_dir/basic-cuda-um-shared
 
 # CUDA with UM and single precision
-co="--with-cuda --enable-unified-memory --enable-single --enable-cusolver --enable-debug --with-gpu-arch=70 --with-extra-CFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\'"
+co="--with-cuda --with-cxxstandard=11 --without-umpire --enable-unified-memory --enable-single --enable-cusolver --enable-debug --with-gpu-arch=70 --with-extra-CFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\'"
 ro="-single -rt -mpibind -save ${save}"
 ./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: ${ro}
 ./renametest.sh basic $output_dir/basic-cuda-um-single
 
 # CUDA with UM without MPI [no run]
-#co="--with-cuda --enable-unified-memory --without-MPI --with-gpu-arch=70 --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\'"
+#co="--with-cuda --with-cxxstandard=11 --without-umpire --enable-unified-memory --without-MPI --with-gpu-arch=70 --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\'"
 #./test.sh basic.sh $src_dir -co: $co -mo: $mo
 #./renametest.sh basic $output_dir/basic-cuda-um-without-MPI
 
 # CUDA without UM with device memory pool [struct]
-co="--with-cuda --enable-device-memory-pool --with-gpu-arch=70 --with-extra-CFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\'"
+co="--with-cuda --with-cxxstandard=11 --without-umpire --enable-device-memory-pool --with-gpu-arch=70 --with-extra-CFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\'"
 ro="-struct -rt -mpibind -save ${save}"
 ./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro
 ./renametest.sh basic $output_dir/basic-cuda-nonum
 
 # CUDA without UM with umpire [benchmark]
 UMPIRE_DIR=/usr/workspace/hypre/ext-libs/Umpire/install_umpire-2025.03.0_nvcc11.2-sm_70-xl2023.06.28-cuda-11.2.0-gcc-8.3.1
-co="--with-cuda --with-gpu-arch=70 --with-umpire --with-umpire-include=${UMPIRE_DIR}/include --with-umpire-lib-dirs=${UMPIRE_DIR}/lib --with-umpire-libs=\\'camp umpire\\' --with-extra-CFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\'"
+co="--with-cuda --with-cxxstandard=11 --with-gpu-arch=70 --with-umpire --with-umpire-include=${UMPIRE_DIR}/include --with-umpire-lib-dirs=${UMPIRE_DIR}/lib --with-umpire-libs=\\'camp umpire\\' --with-extra-CFLAGS=\\'-qsuppress=1500-029\\' --with-extra-CXXFLAGS=\\'-qsuppress=1500-029\\'"
 ro="-bench -rt -mpibind -save ${save}"
 ./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro
 ./renametest.sh basic $output_dir/basic-cuda-bench
 
 # run on CPU
-co="--with-cuda --with-test-using-host --with-memory-tracker --enable-debug --with-gpu-arch=70"
+co="--with-cuda --with-cxxstandard=11 --without-umpire --with-test-using-host --with-memory-tracker --enable-debug --with-gpu-arch=70"
 ro="-ij-noilu -ams -struct -sstruct -rt -mpibind -save lassen_cpu"
 ./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro
 ./renametest.sh basic $output_dir/basic-cuda-cpu
@@ -133,17 +133,17 @@ module list cmake/3.22 |& grep "None found"
 mo="-j"
 
 # CUDA with UM + CMake
-co="-DCMAKE_C_COMPILER=$(which xlc) -DCMAKE_CXX_COMPILER=$(which xlc++) -DCMAKE_CUDA_COMPILER=$(which nvcc) -DMPI_C_COMPILER=$(which mpicc) -DMPI_CXX_COMPILER=$(which mpicxx) -DHYPRE_ENABLE_CUDA=ON -DHYPRE_ENABLE_UNIFIED_MEMORY=ON -DCMAKE_BUILD_TYPE=Debug -DHYPRE_ENABLE_PERSISTENT_COMM=ON -DHYPRE_ENABLE_DEVICE_POOL=ON -DHYPRE_WITH_EXTRA_CFLAGS="\'"-qsuppress=1500-029"\'" -DHYPRE_WITH_EXTRA_CXXFLAGS="\'"-qsuppress=1500-029"\'" -DCMAKE_CUDA_ARCHITECTURES=70"
+co="-DCMAKE_C_COMPILER=$(which xlc) -DCMAKE_CXX_COMPILER=$(which xlc++) -DCMAKE_CUDA_COMPILER=$(which nvcc) -DMPI_C_COMPILER=$(which mpicc) -DMPI_CXX_COMPILER=$(which mpicxx) -DCMAKE_CXX_STANDARD=11 -DHYPRE_ENABLE_CUDA=ON -DHYPRE_ENABLE_UMPIRE=OFF -DHYPRE_ENABLE_UNIFIED_MEMORY=ON -DCMAKE_BUILD_TYPE=Debug -DHYPRE_ENABLE_PERSISTENT_COMM=ON -DHYPRE_ENABLE_DEVICE_POOL=ON -DHYPRE_WITH_EXTRA_CFLAGS="\'"-qsuppress=1500-029"\'" -DHYPRE_WITH_EXTRA_CXXFLAGS="\'"-qsuppress=1500-029"\'" -DCMAKE_CUDA_ARCHITECTURES=70"
 ./test.sh cmake.sh $root_dir -co: $co -mo: $mo
 ./renametest.sh cmake $output_dir/cmake-cuda-um-ij
 
 # CUDA with UM [shared library] + CMake
-co="-DCMAKE_C_COMPILER=$(which xlc) -DCMAKE_CXX_COMPILER=$(which xlc++) -DCMAKE_CUDA_COMPILER=$(which nvcc) -DMPI_C_COMPILER=$(which mpicc) -DMPI_CXX_COMPILER=$(which mpicxx) -DHYPRE_ENABLE_CUDA=ON -DHYPRE_ENABLE_UNIFIED_MEMORY=ON -DCMAKE_BUILD_TYPE=Debug -DHYPRE_ENABLE_OPENMP=ON -DHYPRE_ENABLE_HOPSCOTCH=ON -DBUILD_SHARED_LIBS=ON -DHYPRE_WITH_EXTRA_CFLAGS="\'"-qsuppress=1500-029"\'" -DHYPRE_WITH_EXTRA_CXXFLAGS="\'"-qsuppress=1500-029 "\'" -DCMAKE_CUDA_ARCHITECTURES=70"
+co="-DCMAKE_C_COMPILER=$(which xlc) -DCMAKE_CXX_COMPILER=$(which xlc++) -DCMAKE_CUDA_COMPILER=$(which nvcc) -DMPI_C_COMPILER=$(which mpicc) -DMPI_CXX_COMPILER=$(which mpicxx) -DCMAKE_CXX_STANDARD=11 -DHYPRE_ENABLE_CUDA=ON -DHYPRE_ENABLE_UMPIRE=OFF -DHYPRE_ENABLE_UNIFIED_MEMORY=ON -DCMAKE_BUILD_TYPE=Debug -DHYPRE_ENABLE_OPENMP=ON -DHYPRE_ENABLE_HOPSCOTCH=ON -DBUILD_SHARED_LIBS=ON -DHYPRE_WITH_EXTRA_CFLAGS="\'"-qsuppress=1500-029"\'" -DHYPRE_WITH_EXTRA_CXXFLAGS="\'"-qsuppress=1500-029 "\'" -DCMAKE_CUDA_ARCHITECTURES=70"
 ./test.sh cmake.sh $root_dir -co: $co -mo: $mo
 ./renametest.sh cmake $output_dir/cmake-cuda-um-shared
 
 # CUDA w.o UM + CMake
-co="-DCMAKE_C_COMPILER=$(which xlc) -DCMAKE_CXX_COMPILER=$(which xlc++) -DCMAKE_CUDA_COMPILER=$(which nvcc) -DMPI_C_COMPILER=$(which mpicc) -DMPI_CXX_COMPILER=$(which mpicxx) -DHYPRE_ENABLE_CUDA=ON -DCMAKE_BUILD_TYPE=Debug -DHYPRE_WITH_EXTRA_CFLAGS="\'"-qsuppress=1500-029"\'" -DHYPRE_WITH_EXTRA_CXXFLAGS="\'"-qsuppress=1500-029"\'" -DCMAKE_CUDA_ARCHITECTURES=70"
+co="-DCMAKE_C_COMPILER=$(which xlc) -DCMAKE_CXX_COMPILER=$(which xlc++) -DCMAKE_CUDA_COMPILER=$(which nvcc) -DMPI_C_COMPILER=$(which mpicc) -DMPI_CXX_COMPILER=$(which mpicxx) -DCMAKE_CXX_STANDARD=11 -DHYPRE_ENABLE_CUDA=ON -DHYPRE_ENABLE_UMPIRE=OFF -DCMAKE_BUILD_TYPE=Debug -DHYPRE_WITH_EXTRA_CFLAGS="\'"-qsuppress=1500-029"\'" -DHYPRE_WITH_EXTRA_CXXFLAGS="\'"-qsuppress=1500-029"\'" -DCMAKE_CUDA_ARCHITECTURES=70"
 ./test.sh cmake.sh $root_dir -co: $co -mo: $mo
 ./renametest.sh cmake $output_dir/cmake-cuda-nonum-struct
 
@@ -160,7 +160,7 @@ mo="-j test"
 module -q load gcc/8.3.1
 module -q load cuda/12.0
 module list cuda/12.0 |& grep "None found"
-co="--with-cuda --enable-unified-memory --enable-thrust-nosync --enable-debug --with-gpu-arch=70 CC=mpicc CXX=mpicxx"
+co="--with-cuda --with-cxxstandard=11 --without-umpire --enable-unified-memory --enable-thrust-nosync --enable-debug --with-gpu-arch=70 CC=mpicc CXX=mpicxx"
 ro="-ij-gpu -ams -struct -sstruct -rt -mpibind -save ${save} -rtol ${rtol} -atol ${atol}"
 ./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro
 ./renametest.sh basic $output_dir/basic-cuda12_0

diff --git a/AUTOTEST/machine-tioga.sh b/AUTOTEST/machine-tioga.sh
@@ -53,18 +53,18 @@ save="tioga"
 module -q load rocm/6.2.1
 
 # HIP without UM [benchmark, struct, ams]
-co="--with-hip --with-MPI-include=${MPICH_DIR}/include --with-MPI-lib-dirs=${MPICH_DIR}/lib --with-MPI-libs=mpi --with-gpu-arch='gfx90a' CC=cc CXX=CC"
+co="--with-hip --without-umpire --with-MPI-include=${MPICH_DIR}/include --with-MPI-lib-dirs=${MPICH_DIR}/lib --with-MPI-libs=mpi --with-gpu-arch='gfx90a' CC=cc CXX=CC"
 ro="-ams -bench -struct -rt -save ${save}"
 ./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro
 ./renametest.sh basic $output_dir/basic-hip-nonum
 
 #HIP with UM and single precision [no run]
-co="--with-hip --enable-unified-memory --enable-single --enable-debug --with-MPI-include=${MPICH_DIR}/include --with-MPI-lib-dirs=${MPICH_DIR}/lib --with-MPI-libs=mpi --with-gpu-arch='gfx90a' CC=cc CXX=CC"
+co="--with-hip --without-umpire --enable-unified-memory --enable-single --enable-debug --with-MPI-include=${MPICH_DIR}/include --with-MPI-lib-dirs=${MPICH_DIR}/lib --with-MPI-libs=mpi --with-gpu-arch='gfx90a' CC=cc CXX=CC"
 ./test.sh basic.sh $src_dir -co: $co -mo: $mo
 ./renametest.sh basic $output_dir/basic-hip-um-single
 
 # run on CPU
-co="--with-hip --with-test-using-host --with-memory-tracker --enable-debug --with-MPI-include=${MPICH_DIR}/include --with-MPI-lib-dirs=${MPICH_DIR}/lib --with-MPI-libs=mpi --with-gpu-arch='gfx90a' CC=cc CXX=CC"
+co="--with-hip --without-umpire --with-test-using-host --with-memory-tracker --enable-debug --with-MPI-include=${MPICH_DIR}/include --with-MPI-lib-dirs=${MPICH_DIR}/lib --with-MPI-libs=mpi --with-gpu-arch='gfx90a' CC=cc CXX=CC"
 ro="-ij-noilu -ams -struct -sstruct -rt -D HYPRE_NO_SAVED"
 ./test.sh basic.sh $src_dir -co: $co -mo: $mo -ro: $ro
 ./renametest.sh basic $output_dir/basic-hip-cpu
@@ -79,17 +79,17 @@ module -q load cmake/3.24.2
 mo="-j all check"
 
 # HIP without UM + CMake (no full run, but with basic "make check")
-co="-DCMAKE_C_COMPILER=cc -DCMAKE_CXX_COMPILER=CC -DMPI_C_COMPILER=cc -DMPI_CXX_COMPILER=CC -DHYPRE_ENABLE_HIP=ON -DCMAKE_HIP_ARCHITECTURES=gfx90a -DCMAKE_BUILD_TYPE=Debug -DHYPRE_BUILD_TESTS=ON"
+co="-DCMAKE_C_COMPILER=cc -DCMAKE_CXX_COMPILER=CC -DMPI_C_COMPILER=cc -DMPI_CXX_COMPILER=CC -DHYPRE_ENABLE_HIP=ON -DHYPRE_ENABLE_UMPIRE=OFF -DCMAKE_HIP_ARCHITECTURES=gfx90a -DCMAKE_BUILD_TYPE=Debug -DHYPRE_BUILD_TESTS=ON"
 ./test.sh cmake.sh $root_dir -co: $co -mo: $mo
 ./renametest.sh cmake $output_dir/cmake-hip-nonum
 
 # HIP without UM + Single precision + CMake (no full run, but with basic "make check")
-co="-DBUILD_SHARED_LIBS=ON -DCMAKE_C_COMPILER=cc -DCMAKE_CXX_COMPILER=CC -DMPI_C_COMPILER=cc -DMPI_CXX_COMPILER=CC -DHYPRE_ENABLE_HIP=ON -DCMAKE_HIP_ARCHITECTURES=gfx90a -DHYPRE_ENABLE_SINGLE=ON -DCMAKE_BUILD_TYPE=Debug -DHYPRE_BUILD_TESTS=ON"
+co="-DBUILD_SHARED_LIBS=ON -DCMAKE_C_COMPILER=cc -DCMAKE_CXX_COMPILER=CC -DMPI_C_COMPILER=cc -DMPI_CXX_COMPILER=CC -DHYPRE_ENABLE_HIP=ON -DHYPRE_ENABLE_UMPIRE=OFF -DCMAKE_HIP_ARCHITECTURES=gfx90a -DHYPRE_ENABLE_SINGLE=ON -DCMAKE_BUILD_TYPE=Debug -DHYPRE_BUILD_TESTS=ON"
 ./test.sh cmake.sh $root_dir -co: $co -mo: $mo
 ./renametest.sh cmake $output_dir/cmake-hip-nonum-single
 
 # HIP with UM + Shared library + CMake (no full run, but with basic "make check")
-co="-DBUILD_SHARED_LIBS=ON -DCMAKE_C_COMPILER=cc -DCMAKE_CXX_COMPILER=CC -DMPI_C_COMPILER=cc -DMPI_CXX_COMPILER=CC -DHYPRE_ENABLE_HIP=ON -DCMAKE_HIP_ARCHITECTURES=gfx90a -DHYPRE_ENABLE_UNIFIED_MEMORY=ON -DCMAKE_BUILD_TYPE=Debug -DHYPRE_BUILD_TESTS=ON"
+co="-DBUILD_SHARED_LIBS=ON -DCMAKE_C_COMPILER=cc -DCMAKE_CXX_COMPILER=CC -DMPI_C_COMPILER=cc -DMPI_CXX_COMPILER=CC -DHYPRE_ENABLE_HIP=ON -DHYPRE_ENABLE_UMPIRE=OFF -DCMAKE_HIP_ARCHITECTURES=gfx90a -DHYPRE_ENABLE_UNIFIED_MEMORY=ON -DCMAKE_BUILD_TYPE=Debug -DHYPRE_BUILD_TESTS=ON"
 ./test.sh cmake.sh $root_dir -co: $co -mo: $mo
 ./renametest.sh cmake $output_dir/cmake-hip-um-shared