From 57b04b65ad3597509e95deaaa5dfea623523931f Mon Sep 17 00:00:00 2001
From: "Samuel E. Browne" <sebrown@sandia.gov>
Date: Mon, 16 Dec 2024 13:35:19 -0700
Subject: [PATCH 1/9] Correct Spack CUDA TPL specs

Realized that most of the "SEMS_CUDA_TPL_LOCATIONS" were actually
general to a default installation of those TPLs using Spack. So roll
that into CUDA_TPL_ENABLES and retitle it SPACK_CUDA_TPLS. Separate out
the part that does the BLAS/LAPACK from the system, since _that_ is
SEMS-specific, and include it into SEMS_COMMON_CUDA.

Signed-off-by: Samuel E. Browne <sebrown@sandia.gov>
---
 packages/framework/ini-files/config-specs.ini | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/framework/ini-files/config-specs.ini b/packages/framework/ini-files/config-specs.ini
index a59a18d50591..8faf62e8e79a 100644
--- a/packages/framework/ini-files/config-specs.ini
+++ b/packages/framework/ini-files/config-specs.ini
@@ -1181,7 +1181,7 @@ opt-set-cmake-var Trilinos_WARNINGS_MODE STRING : WARN
 [COMPILER|INTEL]
 opt-set-cmake-var MPI_EXEC FILEPATH : mpirun
 
-[CUDA_TPL_ENABLES]
+[SPACK_CUDA_TPLS]
 opt-set-cmake-var TPL_ENABLE_BLAS BOOL FORCE : ON
 opt-set-cmake-var TPL_ENABLE_BinUtils BOOL FORCE : OFF
 opt-set-cmake-var TPL_ENABLE_Boost BOOL FORCE : ON
@@ -1206,16 +1206,12 @@ opt-set-cmake-var EpetraExt_ENABLE_HDF5 BOOL FORCE : OFF
 opt-set-cmake-var Kokkos_ENABLE_CUDA BOOL FORCE : ON
 opt-set-cmake-var Zoltan_ENABLE_Scotch BOOL FORCE : OFF
 
-[SEMS_CUDA_TPL_LOCATIONS]
 opt-set-cmake-var TPL_BoostLib_LIBRARIES STRING FORCE : ${BOOST_LIB|ENV}/libboost_program_options.a;${BOOST_LIB|ENV}/libboost_system.a
 opt-set-cmake-var TPL_Boost_LIBRARIES STRING FORCE : ${BOOST_LIB|ENV}/libboost_program_options.a;${BOOST_LIB|ENV}/libboost_system.a
 opt-set-cmake-var TPL_DLlib_LIBRARIES FILEPATH FORCE : "-ldl"
 opt-set-cmake-var TPL_HDF5_LIBRARIES STRING FORCE : ${HDF5_LIB|ENV}/libhdf5_hl.so;${HDF5_LIB|ENV}/libhdf5.a;${ZLIB_LIB|ENV}/libz.a;-ldl
 opt-set-cmake-var TPL_METIS_LIBRARIES STRING FORCE : ${METIS_LIB|ENV}/libmetis.so
 opt-set-cmake-var TPL_Netcdf_LIBRARIES STRING FORCE : -L${NETCDF_C_ROOT|ENV}/lib64;${NETCDF_C_ROOT|ENV}/lib/libnetcdf.a;${PARALLEL_NETCDF_ROOT|ENV}/lib/libpnetcdf.a;${TPL_HDF5_LIBRARIES|CMAKE}
-# see https://github.com/trilinos/Trilinos/issues/11109#issuecomment-1272146298
-opt-set-cmake-var TPL_BLAS_LIBRARIES STRING FORCE : /lib64/libblas.so.3
-opt-set-cmake-var TPL_LAPACK_LIBRARIES STRING FORCE : /lib64/liblapack.so.3
 
 opt-set-cmake-var Netcdf_INCLUDE_DIRS STRING FORCE : ${NETCDF_C_INC|ENV}
 opt-set-cmake-var ParMETIS_INCLUDE_DIRS STRING FORCE : ${PARMETIS_INC|ENV}
@@ -1226,7 +1222,7 @@ opt-set-cmake-var SuperLU_INCLUDE_DIRS STRING FORCE : ${SUPERLU_INC|ENV}
 opt-set-cmake-var SuperLU_LIBRARY_DIRS STRING FORCE : ${SUPERLU_LIB|ENV}
 
 [CUDA]
-use CUDA_TPL_ENABLES
+use SPACK_CUDA_TPLS
 
 #CXX Settings
 opt-set-cmake-var CMAKE_CXX_FLAGS STRING : -fPIC -Wall -Warray-bounds -Wchar-subscripts -Wcomment -Wenum-compare -Wformat -Wuninitialized -Wmaybe-uninitialized -Wmain -Wnarrowing -Wnonnull -Wreorder -Wreturn-type -Wsequence-point -Wtrigraphs -Wunused-function -Wunused-but-set-variable -Wwrite-strings
@@ -1243,7 +1239,9 @@ opt-set-cmake-var Tpetra_INST_SERIAL BOOL FORCE : ON
 
 [SEMS_COMMON_CUDA]
 use CUDA
-use SEMS_CUDA_TPL_LOCATIONS
+# see https://github.com/trilinos/Trilinos/issues/11109#issuecomment-1272146298
+opt-set-cmake-var TPL_BLAS_LIBRARIES STRING FORCE : /lib64/libblas.so.3
+opt-set-cmake-var TPL_LAPACK_LIBRARIES STRING FORCE : /lib64/liblapack.so.3
 
 [CUDA-RUN-SERIAL-TESTS]
 opt-set-cmake-var Kokkos_CoreUnitTest_Cuda1_SET_RUN_SERIAL BOOL FORCE : ON

From b9c325845f34cd947789bbe404ada934b564df28 Mon Sep 17 00:00:00 2001
From: "Samuel E. Browne" <sebrown@sandia.gov>
Date: Mon, 16 Dec 2024 13:39:38 -0700
Subject: [PATCH 2/9] Retitle SEMS_COMMON_CUDA to SEMS_CUDA

Nothing COMMON about it.

Signed-off-by: Samuel E. Browne <sebrown@sandia.gov>
---
 packages/framework/ini-files/config-specs.ini | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/framework/ini-files/config-specs.ini b/packages/framework/ini-files/config-specs.ini
index 8faf62e8e79a..a00f0b6cf4cf 100644
--- a/packages/framework/ini-files/config-specs.ini
+++ b/packages/framework/ini-files/config-specs.ini
@@ -1237,7 +1237,7 @@ opt-set-cmake-var Phalanx_KOKKOS_DEVICE_TYPE STRING FORCE : CUDA
 opt-set-cmake-var Sacado_ENABLE_HIERARCHICAL_DFAD BOOL FORCE : ON
 opt-set-cmake-var Tpetra_INST_SERIAL BOOL FORCE : ON
 
-[SEMS_COMMON_CUDA]
+[SEMS_CUDA]
 use CUDA
 # see https://github.com/trilinos/Trilinos/issues/11109#issuecomment-1272146298
 opt-set-cmake-var TPL_BLAS_LIBRARIES STRING FORCE : /lib64/libblas.so.3
@@ -1441,7 +1441,7 @@ use USE-UVM|NO
 use USE-DEPRECATED|YES
 use PACKAGE-ENABLES|NO-PACKAGE-ENABLES
 use COMMON_SPACK_TPLS
-use SEMS_COMMON_CUDA
+use SEMS_CUDA
 
 # TPL ENABLE/DISABLE settings
 opt-set-cmake-var TPL_ENABLE_BLAS BOOL FORCE : ON
@@ -1554,7 +1554,7 @@ use USE-DEPRECATED|YES
 use PACKAGE-ENABLES|NO-PACKAGE-ENABLES
 use PACKAGE-ENABLES|NO-EPETRA
 use COMMON_SPACK_TPLS
-use SEMS_COMMON_CUDA
+use SEMS_CUDA
 use CUDA-RUN-SERIAL-TESTS
 
 opt-set-cmake-var Trilinos_ENABLE_TESTS BOOL FORCE : OFF
@@ -1589,7 +1589,7 @@ use USE-DEPRECATED|YES
 
 use PACKAGE-ENABLES|NO-PACKAGE-ENABLES
 use COMMON_SPACK_TPLS
-use SEMS_COMMON_CUDA
+use SEMS_CUDA
 
 # TPL ENABLE/DISABLE settings
 opt-set-cmake-var TPL_ENABLE_BLAS BOOL FORCE : ON

From f729ee3bd8b0a8e206e5364ca71dcffc9ca80eaa Mon Sep 17 00:00:00 2001
From: "Samuel E. Browne" <sebrown@sandia.gov>
Date: Mon, 16 Dec 2024 13:42:50 -0700
Subject: [PATCH 3/9] Consolidate CUDA-RUN-SERIAL-TESTS

If it is what it says it is, we want it any time we have CUDA.

Signed-off-by: Samuel E. Browne <sebrown@sandia.gov>
---
 packages/framework/ini-files/config-specs.ini | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/packages/framework/ini-files/config-specs.ini b/packages/framework/ini-files/config-specs.ini
index a00f0b6cf4cf..6a482f660472 100644
--- a/packages/framework/ini-files/config-specs.ini
+++ b/packages/framework/ini-files/config-specs.ini
@@ -1237,6 +1237,8 @@ opt-set-cmake-var Phalanx_KOKKOS_DEVICE_TYPE STRING FORCE : CUDA
 opt-set-cmake-var Sacado_ENABLE_HIERARCHICAL_DFAD BOOL FORCE : ON
 opt-set-cmake-var Tpetra_INST_SERIAL BOOL FORCE : ON
 
+use CUDA-RUN-SERIAL-TESTS
+
 [SEMS_CUDA]
 use CUDA
 # see https://github.com/trilinos/Trilinos/issues/11109#issuecomment-1272146298
@@ -1526,8 +1528,6 @@ opt-set-cmake-var Adelus_vector_random_npr4_rhs1_MPI_4_DISABLE BOOL : ON
 
 use PACKAGE-ENABLES|NO-EPETRA
 
-use CUDA-RUN-SERIAL-TESTS
-
 [rhel8_sems-cuda-11.4.2-sems-gnu-10.1.0-sems-openmpi-4.1.4_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_no-uvm_deprecated-on_all]
 # uses sems-v2 modules
 use rhel8_sems-cuda-11.4.2-sems-gnu-10.1.0-sems-openmpi-4.1.4_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_no-uvm_deprecated-on_no-package-enables
@@ -1555,7 +1555,6 @@ use PACKAGE-ENABLES|NO-PACKAGE-ENABLES
 use PACKAGE-ENABLES|NO-EPETRA
 use COMMON_SPACK_TPLS
 use SEMS_CUDA
-use CUDA-RUN-SERIAL-TESTS
 
 opt-set-cmake-var Trilinos_ENABLE_TESTS BOOL FORCE : OFF
 
@@ -1566,7 +1565,6 @@ use PACKAGE-ENABLES|ALL-NO-EPETRA
 [rhel8_sems-cuda-11.4.2-gnu-10.1.0-openmpi-4.1.6_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_uvm_deprecated-on_all-no-epetra]
 use rhel8_sems-cuda-11.4.2-gnu-10.1.0-openmpi-4.1.6_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_uvm_deprecated-on_all
 
-use CUDA-RUN-SERIAL-TESTS
 opt-set-cmake-var Trilinos_ENABLE_TESTS BOOL FORCE : ON
 
 [rhel8_sems-cuda-11.4.2-gnu-10.1.0-openmpi-4.1.6_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_no-uvm_deprecated-on_no-package-enables]
@@ -1673,8 +1671,6 @@ opt-set-cmake-var Adelus_vector_random_npr4_rhs1_MPI_4_DISABLE BOOL : ON
 
 use PACKAGE-ENABLES|NO-EPETRA
 
-use CUDA-RUN-SERIAL-TESTS
-
 [rhel8_sems-cuda-11.4.2-gnu-10.1.0-openmpi-4.1.6_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_no-uvm_deprecated-on_all]
 # uses sems-v2 modules
 use rhel8_sems-cuda-11.4.2-gnu-10.1.0-openmpi-4.1.6_release_static_Volta70_no-asan_complex_no-fpic_mpi_pt_no-rdc_no-uvm_deprecated-on_no-package-enables
@@ -2101,7 +2097,6 @@ use USE-UVM|NO
 use USE-DEPRECATED|YES
 use PACKAGE-ENABLES|NO-EPETRA
 use CUDA
-use CUDA-RUN-SERIAL-TESTS
 
 opt-set-cmake-var Trilinos_ENABLE_TESTS BOOL : ON
 opt-set-cmake-var TPL_ENABLE_X11 BOOL : OFF
@@ -2128,7 +2123,6 @@ use USE-UVM|YES
 use USE-DEPRECATED|YES
 use PACKAGE-ENABLES|NO-EPETRA
 use CUDA
-use CUDA-RUN-SERIAL-TESTS
 
 opt-set-cmake-var Trilinos_ENABLE_TESTS BOOL FORCE : OFF
 opt-set-cmake-var Kokkos_ENABLE_TESTS BOOL FORCE : ON

From 286d1cab4675feb760a218bf47c7b3e250d74c98 Mon Sep 17 00:00:00 2001
From: "Samuel E. Browne" <sebrown@sandia.gov>
Date: Mon, 16 Dec 2024 14:06:25 -0700
Subject: [PATCH 4/9] Remove CUDA setting duplication

Signed-off-by: Samuel E. Browne <sebrown@sandia.gov>
---
 packages/framework/ini-files/config-specs.ini | 108 ------------------
 1 file changed, 108 deletions(-)

diff --git a/packages/framework/ini-files/config-specs.ini b/packages/framework/ini-files/config-specs.ini
index 6a482f660472..6e0536851330 100644
--- a/packages/framework/ini-files/config-specs.ini
+++ b/packages/framework/ini-files/config-specs.ini
@@ -1445,60 +1445,6 @@ use PACKAGE-ENABLES|NO-PACKAGE-ENABLES
 use COMMON_SPACK_TPLS
 use SEMS_CUDA
 
-# TPL ENABLE/DISABLE settings
-opt-set-cmake-var TPL_ENABLE_BLAS BOOL FORCE : ON
-opt-set-cmake-var TPL_ENABLE_BinUtils BOOL FORCE : OFF
-opt-set-cmake-var TPL_ENABLE_Boost BOOL FORCE : ON
-opt-set-cmake-var TPL_ENABLE_CGNS BOOL FORCE : ON
-opt-set-cmake-var TPL_ENABLE_CUDA BOOL FORCE : ON
-opt-set-cmake-var TPL_ENABLE_CUSPARSE BOOL FORCE : ON
-opt-set-cmake-var TPL_ENABLE_DLlib BOOL FORCE : OFF
-opt-set-cmake-var TPL_ENABLE_HDF5 BOOL FORCE : ON
-opt-set-cmake-var TPL_ENABLE_HWLOC BOOL FORCE : OFF
-opt-set-cmake-var TPL_ENABLE_LAPACK BOOL FORCE : ON
-opt-set-cmake-var TPL_ENABLE_METIS BOOL FORCE : ON
-opt-set-cmake-var TPL_ENABLE_Matio BOOL FORCE : OFF
-opt-set-cmake-var TPL_ENABLE_MPI BOOL FORCE : ON
-opt-set-cmake-var TPL_ENABLE_Netcdf BOOL FORCE : ON
-opt-set-cmake-var TPL_ENABLE_ParMETIS BOOL FORCE : OFF
-opt-set-cmake-var TPL_ENABLE_Pthread BOOL FORCE : ON
-opt-set-cmake-var TPL_ENABLE_Scotch BOOL FORCE : OFF
-opt-set-cmake-var TPL_ENABLE_SuperLU BOOL FORCE : OFF
-opt-set-cmake-var TPL_ENABLE_SuperLUDist BOOL FORCE : OFF
-opt-set-cmake-var TPL_ENABLE_Zlib BOOL FORCE : ON
-
-#TPL_*_LIBRARIES
-opt-set-cmake-var TPL_BoostLib_LIBRARIES STRING FORCE : ${BOOST_LIB|ENV}/libboost_program_options.a;${BOOST_LIB|ENV}/libboost_system.a
-opt-set-cmake-var TPL_Boost_LIBRARIES STRING FORCE : ${BOOST_LIB|ENV}/libboost_program_options.a;${BOOST_LIB|ENV}/libboost_system.a
-opt-set-cmake-var TPL_DLlib_LIBRARIES FILEPATH FORCE : "-ldl"
-opt-set-cmake-var TPL_HDF5_LIBRARIES STRING FORCE : ${HDF5_LIB|ENV}/libhdf5_hl.so;${HDF5_LIB|ENV}/libhdf5.a;${ZLIB_LIB|ENV}/libz.a;-ldl
-opt-set-cmake-var TPL_METIS_LIBRARIES STRING FORCE : ${METIS_LIB|ENV}/libmetis.so
-opt-set-cmake-var TPL_Netcdf_LIBRARIES STRING FORCE : -L${NETCDF_C_ROOT|ENV}/lib64;${NETCDF_C_ROOT|ENV}/lib/libnetcdf.a;${PARALLEL_NETCDF_ROOT|ENV}/lib/libpnetcdf.a;${TPL_HDF5_LIBRARIES|CMAKE}
-
-#TPL_[INCLUDE|LIBRARY]_DIRS
-opt-set-cmake-var Netcdf_INCLUDE_DIRS STRING FORCE : ${NETCDF_C_INC|ENV}
-opt-set-cmake-var ParMETIS_INCLUDE_DIRS STRING FORCE : ${PARMETIS_INC|ENV}
-opt-set-cmake-var ParMETIS_LIBRARY_DIRS STRING FORCE : ${PARMETIS_LIB|ENV}
-opt-set-cmake-var Scotch_INCLUDE_DIRS STRING FORCE : ${SCOTCH_INC|ENV}
-opt-set-cmake-var Scotch_LIBRARY_DIRS STRING FORCE : ${SCOTCH_LIB|ENV}
-opt-set-cmake-var SuperLU_INCLUDE_DIRS STRING FORCE : ${SUPERLU_INC|ENV}
-opt-set-cmake-var SuperLU_LIBRARY_DIRS STRING FORCE : ${SUPERLU_LIB|ENV}
-
-#CXX Settings
-opt-set-cmake-var CMAKE_CXX_FLAGS STRING : -fPIC -Wall -Warray-bounds -Wchar-subscripts -Wcomment -Wenum-compare -Wformat -Wuninitialized -Wmaybe-uninitialized -Wmain -Wnarrowing -Wnonnull -Wreorder -Wreturn-type -Wsequence-point -Wtrigraphs -Wunused-function -Wunused-but-set-variable -Wwrite-strings
-
-#Package Options
-opt-set-cmake-var EpetraExt_ENABLE_HDF5 BOOL FORCE : OFF
-opt-set-cmake-var Kokkos_ENABLE_CUDA BOOL FORCE : ON
-opt-set-cmake-var Kokkos_ENABLE_CUDA_LAMBDA BOOL FORCE : ON
-opt-set-cmake-var Kokkos_ENABLE_CXX11_DISPATCH_LAMBDA BOOL FORCE : ON
-#opt-set-cmake-var Kokkos_ENABLE_Debug_Bounds_Check BOOL FORCE : ON
-opt-set-cmake-var MPI_EXEC_PRE_NUMPROCS_FLAGS STRING : --bind-to;none
-opt-set-cmake-var Panzer_FADTYPE STRING FORCE : "Sacado::Fad::DFad<RealType>"
-opt-set-cmake-var Phalanx_KOKKOS_DEVICE_TYPE STRING FORCE : CUDA
-opt-set-cmake-var Sacado_ENABLE_HIERARCHICAL_DFAD BOOL FORCE : ON
-opt-set-cmake-var Tpetra_INST_SERIAL BOOL FORCE : ON
-opt-set-cmake-var Zoltan_ENABLE_Scotch BOOL FORCE : OFF
 opt-set-cmake-var Trilinos_ENABLE_TrilinosFrameworkTests BOOL FORCE : OFF
 opt-set-cmake-var Trilinos_ENABLE_TrilinosBuildStats BOOL FORCE : OFF
 
@@ -1589,60 +1535,6 @@ use PACKAGE-ENABLES|NO-PACKAGE-ENABLES
 use COMMON_SPACK_TPLS
 use SEMS_CUDA
 
-# TPL ENABLE/DISABLE settings
-opt-set-cmake-var TPL_ENABLE_BLAS BOOL FORCE : ON
-opt-set-cmake-var TPL_ENABLE_BinUtils BOOL FORCE : OFF
-opt-set-cmake-var TPL_ENABLE_Boost BOOL FORCE : ON
-opt-set-cmake-var TPL_ENABLE_CGNS BOOL FORCE : ON
-opt-set-cmake-var TPL_ENABLE_CUDA BOOL FORCE : ON
-opt-set-cmake-var TPL_ENABLE_CUSPARSE BOOL FORCE : ON
-opt-set-cmake-var TPL_ENABLE_DLlib BOOL FORCE : OFF
-opt-set-cmake-var TPL_ENABLE_HDF5 BOOL FORCE : ON
-opt-set-cmake-var TPL_ENABLE_HWLOC BOOL FORCE : OFF
-opt-set-cmake-var TPL_ENABLE_LAPACK BOOL FORCE : ON
-opt-set-cmake-var TPL_ENABLE_METIS BOOL FORCE : ON
-opt-set-cmake-var TPL_ENABLE_Matio BOOL FORCE : OFF
-opt-set-cmake-var TPL_ENABLE_MPI BOOL FORCE : ON
-opt-set-cmake-var TPL_ENABLE_Netcdf BOOL FORCE : ON
-opt-set-cmake-var TPL_ENABLE_ParMETIS BOOL FORCE : OFF
-opt-set-cmake-var TPL_ENABLE_Pthread BOOL FORCE : ON
-opt-set-cmake-var TPL_ENABLE_Scotch BOOL FORCE : OFF
-opt-set-cmake-var TPL_ENABLE_SuperLU BOOL FORCE : OFF
-opt-set-cmake-var TPL_ENABLE_SuperLUDist BOOL FORCE : OFF
-opt-set-cmake-var TPL_ENABLE_Zlib BOOL FORCE : ON
-
-#TPL_*_LIBRARIES
-opt-set-cmake-var TPL_BoostLib_LIBRARIES STRING FORCE : ${BOOST_LIB|ENV}/libboost_program_options.a;${BOOST_LIB|ENV}/libboost_system.a
-opt-set-cmake-var TPL_Boost_LIBRARIES STRING FORCE : ${BOOST_LIB|ENV}/libboost_program_options.a;${BOOST_LIB|ENV}/libboost_system.a
-opt-set-cmake-var TPL_DLlib_LIBRARIES FILEPATH FORCE : "-ldl"
-opt-set-cmake-var TPL_HDF5_LIBRARIES STRING FORCE : ${HDF5_LIB|ENV}/libhdf5_hl.so;${HDF5_LIB|ENV}/libhdf5.a;${ZLIB_LIB|ENV}/libz.a;-ldl
-opt-set-cmake-var TPL_METIS_LIBRARIES STRING FORCE : ${METIS_LIB|ENV}/libmetis.so
-opt-set-cmake-var TPL_Netcdf_LIBRARIES STRING FORCE : -L${NETCDF_C_ROOT|ENV}/lib64;${NETCDF_C_ROOT|ENV}/lib/libnetcdf.a;${PARALLEL_NETCDF_ROOT|ENV}/lib/libpnetcdf.a;${TPL_HDF5_LIBRARIES|CMAKE}
-
-#TPL_[INCLUDE|LIBRARY]_DIRS
-opt-set-cmake-var Netcdf_INCLUDE_DIRS STRING FORCE : ${NETCDF_C_INC|ENV}
-opt-set-cmake-var ParMETIS_INCLUDE_DIRS STRING FORCE : ${PARMETIS_INC|ENV}
-opt-set-cmake-var ParMETIS_LIBRARY_DIRS STRING FORCE : ${PARMETIS_LIB|ENV}
-opt-set-cmake-var Scotch_INCLUDE_DIRS STRING FORCE : ${SCOTCH_INC|ENV}
-opt-set-cmake-var Scotch_LIBRARY_DIRS STRING FORCE : ${SCOTCH_LIB|ENV}
-opt-set-cmake-var SuperLU_INCLUDE_DIRS STRING FORCE : ${SUPERLU_INC|ENV}
-opt-set-cmake-var SuperLU_LIBRARY_DIRS STRING FORCE : ${SUPERLU_LIB|ENV}
-
-#CXX Settings
-opt-set-cmake-var CMAKE_CXX_FLAGS STRING : -fPIC -Wall -Warray-bounds -Wchar-subscripts -Wcomment -Wenum-compare -Wformat -Wuninitialized -Wmaybe-uninitialized -Wmain -Wnarrowing -Wnonnull -Wreorder -Wreturn-type -Wsequence-point -Wtrigraphs -Wunused-function -Wunused-but-set-variable -Wwrite-strings
-
-#Package Options
-opt-set-cmake-var EpetraExt_ENABLE_HDF5 BOOL FORCE : OFF
-opt-set-cmake-var Kokkos_ENABLE_CUDA BOOL FORCE : ON
-opt-set-cmake-var Kokkos_ENABLE_CUDA_LAMBDA BOOL FORCE : ON
-opt-set-cmake-var Kokkos_ENABLE_CXX11_DISPATCH_LAMBDA BOOL FORCE : ON
-#opt-set-cmake-var Kokkos_ENABLE_Debug_Bounds_Check BOOL FORCE : ON
-opt-set-cmake-var MPI_EXEC_PRE_NUMPROCS_FLAGS STRING : --bind-to;none
-opt-set-cmake-var Panzer_FADTYPE STRING FORCE : "Sacado::Fad::DFad<RealType>"
-opt-set-cmake-var Phalanx_KOKKOS_DEVICE_TYPE STRING FORCE : CUDA
-opt-set-cmake-var Sacado_ENABLE_HIERARCHICAL_DFAD BOOL FORCE : ON
-opt-set-cmake-var Tpetra_INST_SERIAL BOOL FORCE : ON
-opt-set-cmake-var Zoltan_ENABLE_Scotch BOOL FORCE : OFF
 opt-set-cmake-var Trilinos_ENABLE_TrilinosFrameworkTests BOOL FORCE : OFF
 opt-set-cmake-var Trilinos_ENABLE_TrilinosBuildStats BOOL FORCE : OFF
 

From e7a53ddc89d0e4e83c7acdb32f0a7871c1989fb9 Mon Sep 17 00:00:00 2001
From: "Samuel E. Browne" <sebrown@sandia.gov>
Date: Mon, 16 Dec 2024 15:13:13 -0700
Subject: [PATCH 5/9] Add -lm to link flags when SuperLU is used

Can be removed if we use `find_package(superlu)` since the -lm will get
picked up from SuperLU's build system.

Signed-off-by: Samuel E. Browne <sebrown@sandia.gov>
---
 packages/framework/ini-files/config-specs.ini | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/framework/ini-files/config-specs.ini b/packages/framework/ini-files/config-specs.ini
index 6e0536851330..b65b29b919c6 100644
--- a/packages/framework/ini-files/config-specs.ini
+++ b/packages/framework/ini-files/config-specs.ini
@@ -440,6 +440,9 @@ opt-set-cmake-var SuperLU_INCLUDE_DIRS PATH FORCE : ${SUPERLU_INC|ENV}
 opt-set-cmake-var SuperLU_INCLUDE_DIRS STRING FORCE : ${SUPERLU_INC|ENV}
 opt-set-cmake-var SuperLU_LIBRARY_DIRS PATH FORCE : ${SUPERLU_LIB|ENV}
 opt-set-cmake-var SuperLU_LIBRARY_DIRS STRING FORCE : ${SUPERLU_LIB|ENV}
+# FIXME: Wouldn't need this if we used find_package(superlu)
+opt-set-cmake-var Trilinos_EXTRA_LINK_FLAGS STRING FORCE : -lm
+
 
 # Metis
 opt-set-cmake-var TPL_METIS_LIBRARIES STRING FORCE : ${METIS_LIB|ENV}/libmetis.so
@@ -460,8 +463,6 @@ use COMMON_SPACK_TPLS
 opt-set-cmake-var TPL_Netcdf_LIBRARIES STRING FORCE : ""
 opt-set-cmake-var TPL_HDF5_LIBRARIES   STRING FORCE : ""
 
-opt-set-cmake-var SuperLU_LIBRARY_NAMES STRING FORCE : superlu;m
-
 [COMMON_USE-MPI|NO]
 use COMMON
 opt-set-cmake-var TPL_ENABLE_ParMETIS BOOL FORCE : OFF
@@ -1220,6 +1221,8 @@ opt-set-cmake-var Scotch_INCLUDE_DIRS STRING FORCE : ${SCOTCH_INC|ENV}
 opt-set-cmake-var Scotch_LIBRARY_DIRS STRING FORCE : ${SCOTCH_LIB|ENV}
 opt-set-cmake-var SuperLU_INCLUDE_DIRS STRING FORCE : ${SUPERLU_INC|ENV}
 opt-set-cmake-var SuperLU_LIBRARY_DIRS STRING FORCE : ${SUPERLU_LIB|ENV}
+# FIXME: Wouldn't need this if we used find_package(superlu)
+opt-set-cmake-var Trilinos_EXTRA_LINK_FLAGS STRING FORCE : -lm
 
 [CUDA]
 use SPACK_CUDA_TPLS
@@ -1340,7 +1343,6 @@ opt-set-cmake-var Teko_DISABLE_LSCSTABALIZED_TPETRA_ALPAH_INV_D BOOL       : ON
 
 use TEST_DISABLES|CLANG
 
-opt-set-cmake-var SuperLU_LIBRARY_NAMES STRING : superlu;m
 opt-set-cmake-var ML_ENABLE_SuperLU BOOL FORCE : OFF
 
 opt-set-cmake-var Pliris_vector_random_MPI_3_DISABLE BOOL : ON
@@ -1588,7 +1590,6 @@ use PACKAGE-ENABLES|NO-PACKAGE-ENABLES
 use COMMON_SPACK_TPLS
 use SPACK_NETLIB_BLAS_LAPACK
 
-opt-set-cmake-var SuperLU_LIBRARY_NAMES STRING : superlu;m
 opt-set-cmake-var ML_ENABLE_SuperLU BOOL FORCE : OFF
 opt-set-cmake-var TPL_ENABLE_ParMETIS BOOL FORCE : OFF
 opt-set-cmake-var TPL_ENABLE_Scotch   BOOL FORCE : OFF
@@ -1660,7 +1661,6 @@ use PACKAGE-ENABLES|NO-PACKAGE-ENABLES
 use COMMON_SPACK_TPLS
 use SPACK_NETLIB_BLAS_LAPACK
 
-opt-set-cmake-var SuperLU_LIBRARY_NAMES STRING FORCE : superlu;m
 opt-set-cmake-var ML_ENABLE_SuperLU     BOOL   FORCE : OFF
 
 opt-set-cmake-var MPI_EXEC_PRE_NUMPROCS_FLAGS                            STRING       : --bind-to;none --mca btl vader,self

From cbe67432ac876a841ad81de90abd2842cf7fb11f Mon Sep 17 00:00:00 2001
From: "Samuel E. Browne" <sebrown@sandia.gov>
Date: Mon, 16 Dec 2024 15:16:18 -0700
Subject: [PATCH 6/9] Turn off SuperLU for ML anywhere we enable SuperLU

Signed-off-by: Samuel E. Browne <sebrown@sandia.gov>
---
 packages/framework/ini-files/config-specs.ini | 22 ++-----------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/packages/framework/ini-files/config-specs.ini b/packages/framework/ini-files/config-specs.ini
index b65b29b919c6..7f70ebe97982 100644
--- a/packages/framework/ini-files/config-specs.ini
+++ b/packages/framework/ini-files/config-specs.ini
@@ -337,6 +337,7 @@ opt-set-cmake-var TPL_ENABLE_Zlib BOOL : ON
 opt-set-cmake-var TPL_ENABLE_HDF5 BOOL : ON
 opt-set-cmake-var TPL_ENABLE_Netcdf BOOL : ON
 opt-set-cmake-var TPL_ENABLE_SuperLU BOOL : ON
+opt-set-cmake-var ML_ENABLE_SuperLU BOOL FORCE : OFF
 opt-set-cmake-var Trilinos_TRACE_ADD_TEST BOOL : ON
 
 opt-set-cmake-var TPL_ENABLE_Scotch BOOL : ON
@@ -1343,8 +1344,6 @@ opt-set-cmake-var Teko_DISABLE_LSCSTABALIZED_TPETRA_ALPAH_INV_D BOOL       : ON
 
 use TEST_DISABLES|CLANG
 
-opt-set-cmake-var ML_ENABLE_SuperLU BOOL FORCE : OFF
-
 opt-set-cmake-var Pliris_vector_random_MPI_3_DISABLE BOOL : ON
 opt-set-cmake-var Pliris_vector_random_MPI_4_DISABLE BOOL : ON
 
@@ -1383,10 +1382,6 @@ opt-set-cmake-var MPI_EXEC_PRE_NUMPROCS_FLAGS                   STRING     : --b
 opt-set-cmake-var TPL_Netcdf_LIBRARIES STRING FORCE : -L${NETCDF_C_LIB|ENV}/lib;${NETCDF_C_LIB|ENV}/libnetcdf.so;${PARALLEL_NETCDF_LIB|ENV}/libpnetcdf.a
 opt-set-cmake-var TPL_HDF5_LIBRARIES STRING FORCE : ${HDF5_LIB|ENV}/libhdf5_hl.so;${HDF5_LIB|ENV}/libhdf5.a;${ZLIB_LIB|ENV}/libz.a;-ldl
 
-# I get the following error if I do not disable ML_ENABLE_SuperLU:
-# ML CONFIGURATION ERROR:  SuperLU_5.0 detected - only SuperLU version < 5.0 currently supported for this package.
-opt-set-cmake-var ML_ENABLE_SuperLU BOOL FORCE : OFF
-
 opt-set-cmake-var Zoltan_ch_simple_parmetis_parallel_DISABLE BOOL FORCE : ON
 opt-set-cmake-var Zoltan_ch_7944_parmetis_parallel_DISABLE BOOL FORCE   : ON
 opt-set-cmake-var Zoltan_ch_simple_scotch_parallel_DISABLE BOOL FORCE   : ON
@@ -1590,7 +1585,6 @@ use PACKAGE-ENABLES|NO-PACKAGE-ENABLES
 use COMMON_SPACK_TPLS
 use SPACK_NETLIB_BLAS_LAPACK
 
-opt-set-cmake-var ML_ENABLE_SuperLU BOOL FORCE : OFF
 opt-set-cmake-var TPL_ENABLE_ParMETIS BOOL FORCE : OFF
 opt-set-cmake-var TPL_ENABLE_Scotch   BOOL FORCE : OFF
 opt-set-cmake-var TPL_Netcdf_LIBRARIES STRING FORCE : ${NETCDF_C_LIB|ENV}/libnetcdf.so
@@ -1631,10 +1625,7 @@ opt-set-cmake-var CMAKE_CXX_EXTENSIONS                          BOOL         : O
 opt-set-cmake-var Teko_DISABLE_LSCSTABALIZED_TPETRA_ALPAH_INV_D BOOL         : ON
 opt-set-cmake-var CMAKE_CXX_FLAGS                               STRING       : -fno-strict-aliasing -Wall -Wno-clobbered -Wno-vla -Wno-pragmas -Wno-unknown-pragmas -Wno-unused-local-typedefs -Wno-literal-suffix -Wno-deprecated-declarations -Wno-misleading-indentation -Wno-int-in-bool-context -Wno-maybe-uninitialized -Wno-class-memaccess -Wno-inline -Wno-nonnull-compare -Wno-address
 
-# TPL_BLAS_LIBRARIES is redefined here with libm for SuperLU to properly link
-opt-set-cmake-var TPL_BLAS_LIBRARIES STRING FORCE : -L${BLAS_ROOT|ENV}/lib;-lblas;-lgfortran;-lgomp;-lm
 opt-set-cmake-var TPL_HDF5_LIBRARIES STRING : ${HDF5_LIB|ENV}/libhdf5_hl.so;${HDF5_LIB|ENV}/libhdf5.so;${ZLIB_LIB|ENV}/libz.so;-ldl
-opt-set-cmake-var ML_ENABLE_SuperLU  BOOL FORCE : OFF
 
 [rhel8_sems-gnu-8.5.0-openmpi-4.1.6-openmp_release-debug_static_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_all]
 use rhel8_sems-gnu-8.5.0-openmpi-4.1.6-openmp_release-debug_static_no-kokkos-arch_no-asan_no-complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables
@@ -1661,8 +1652,6 @@ use PACKAGE-ENABLES|NO-PACKAGE-ENABLES
 use COMMON_SPACK_TPLS
 use SPACK_NETLIB_BLAS_LAPACK
 
-opt-set-cmake-var ML_ENABLE_SuperLU     BOOL   FORCE : OFF
-
 opt-set-cmake-var MPI_EXEC_PRE_NUMPROCS_FLAGS                            STRING       : --bind-to;none --mca btl vader,self
 opt-set-cmake-var Teko_DISABLE_LSCSTABALIZED_TPETRA_ALPAH_INV_D          BOOL         : ON
 opt-set-cmake-var KokkosKernels_blas_serial_MPI_1_DISABLE                BOOL         : ON
@@ -1772,7 +1761,6 @@ opt-set-cmake-var Amesos_ENABLE_SuperLU       BOOL FORCE : OFF
 opt-set-cmake-var Amesos_ENABLE_SuperLUDist   BOOL FORCE : OFF
 opt-set-cmake-var Amesos2_ENABLE_SuperLU      BOOL FORCE : OFF
 opt-set-cmake-var Amesos2_ENABLE_SuperLUDist  BOOL FORCE : OFF
-opt-set-cmake-var ML_ENABLE_SuperLU           BOOL FORCE : OFF
 
 opt-set-cmake-var Teko_DISABLE_LSCSTABALIZED_TPETRA_ALPAH_INV_D                  BOOL : ON
 opt-set-cmake-var KokkosKernels_blas_serial_MPI_1_DISABLE                        BOOL : ON
@@ -1823,9 +1811,6 @@ opt-set-cmake-var TPL_ENABLE_Pnetcdf        BOOL FORCE   : OFF
 opt-set-cmake-var Trilinos_ENABLE_TrilinosFrameworkTests BOOL FORCE : OFF
 opt-set-cmake-var Trilinos_ENABLE_TrilinosBuildStats     BOOL FORCE : OFF
 
-# Turned off to bypass: ML CONFIGURATION ERROR:  SuperLU_5.0 detected - only SuperLU version < 5.0 currently supported for this package.
-opt-set-cmake-var ML_ENABLE_SuperLU BOOL FORCE : OFF
-
 use RHEL8_POST
 
 [rhel8_aue-gcc-openmpi_debug_shared_no-kokkos-arch_no-asan_complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_no-package-enables]
@@ -1863,9 +1848,6 @@ opt-set-cmake-var TPL_ENABLE_SuperLUDist BOOL FORCE: OFF
 opt-set-cmake-var Trilinos_ENABLE_TrilinosFrameworkTests BOOL FORCE : OFF
 opt-set-cmake-var Trilinos_ENABLE_TrilinosBuildStats     BOOL FORCE : OFF
 
-# Turned off to bypass: ML CONFIGURATION ERROR:  SuperLU_5.0 detected - only SuperLU version < 5.0 currently supported for this package.
-opt-set-cmake-var ML_ENABLE_SuperLU BOOL FORCE : OFF
-
 use RHEL8_POST
 
 [rhel8_gcc-openmpi_debug_shared_no-kokkos-arch_no-asan_complex_no-fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_all]
@@ -1923,6 +1905,7 @@ opt-set-cmake-var TPL_ENABLE_HDF5 BOOL : ON
 opt-set-cmake-var TPL_HDF5_LIBRARIES STRING : "${HDF5_LIB|ENV}/libhdf5_hl.so;${HDF5_LIB|ENV}/libhdf5.so;${ZLIB_LIB|ENV}/libz.so"
 opt-set-cmake-var TPL_ENABLE_Netcdf BOOL : ON
 opt-set-cmake-var TPL_ENABLE_SuperLU BOOL : ON
+opt-set-cmake-var ML_ENABLE_SuperLU BOOL FORCE : OFF
 opt-set-cmake-var TPL_ENABLE_Scotch BOOL : OFF
 
 opt-set-cmake-var CMAKE_C_COMPILER       FILEPATH : ${MPICC|ENV}
@@ -1947,7 +1930,6 @@ opt-set-cmake-var Trilinos_ENABLE_Komplex BOOL : OFF
 opt-set-cmake-var Trilinos_ENABLE_TriKota BOOL : OFF
 opt-set-cmake-var Trilinos_ENABLE_Moertel BOOL : OFF
 opt-set-cmake-var Trilinos_ENABLE_Domi BOOL : OFF
-opt-set-cmake-var ML_ENABLE_SuperLU BOOL FORCE : OFF
 
 [ubuntu_gnu_release-debug_shared_no-kokkos-arch_no-asan_no-complex_fpic_mpi_no-pt_no-rdc_no-uvm_deprecated-on_all]
 use BUILD-TYPE|RELEASE-DEBUG

From 7f938383bb6e53572bf32b42273334e20b3df7f2 Mon Sep 17 00:00:00 2001
From: "Samuel E. Browne" <sebrown@sandia.gov>
Date: Mon, 16 Dec 2024 20:01:11 -0700
Subject: [PATCH 7/9] Revert "Use default finds for BLAS and LAPACK"

This reverts commit 773e0f9fcd4fd4421afc6ebdbdf2673c9e1b6d2d.

Signed-off-by: Samuel E. Browne <sebrown@sandia.gov>
---
 packages/framework/ini-files/config-specs.ini | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/packages/framework/ini-files/config-specs.ini b/packages/framework/ini-files/config-specs.ini
index 7f70ebe97982..17a0b27e6b24 100644
--- a/packages/framework/ini-files/config-specs.ini
+++ b/packages/framework/ini-files/config-specs.ini
@@ -393,6 +393,8 @@ opt-set-cmake-var Scotch_LIBRARY_DIRS PATH : ${SEMS_SCOTCH_LIBRARY_PATH|ENV}
 # Explicit libraries
 opt-set-cmake-var TPL_DLlib_LIBRARIES PATH : ${DL_LIBRARIES|ENV}
 opt-set-cmake-var TPL_Netcdf_LIBRARIES STRING : ${SEMS_NETCDF_LIBRARY_PATH|ENV}/libnetcdf.so;${SEMS_NETCDF_LIBRARY_PATH|ENV}/libpnetcdf.a
+opt-set-cmake-var TPL_BLAS_LIBRARIES STRING : ${BLAS_LIBRARIES|ENV}
+opt-set-cmake-var TPL_LAPACK_LIBRARIES STRING : ${LAPACK_LIBRARIES|ENV}
 
 [SPACK_NETLIB_BLAS_LAPACK]
 opt-set-cmake-var TPL_BLAS_LIBRARIES STRING FORCE : -L${BLAS_ROOT|ENV}/lib;-lblas;-lgfortran;-lgomp
@@ -400,6 +402,12 @@ opt-set-cmake-var TPL_BLAS_LIBRARY_DIRS STRING FORCE : ${BLAS_ROOT|ENV}/lib
 opt-set-cmake-var TPL_LAPACK_LIBRARIES STRING FORCE : -L${BLAS_ROOT|ENV}/lib;-llapack;-lgfortran;-lgomp
 opt-set-cmake-var TPL_LAPACK_LIBRARY_DIRS STRING FORCE : ${BLAS_ROOT|ENV}/lib
 
+[SPACK_OPENBLAS_BLAS_LAPACK]
+opt-set-cmake-var TPL_BLAS_LIBRARY_DIRS     STRING FORCE : ${OPENBLAS_ROOT|ENV}/lib
+opt-set-cmake-var TPL_BLAS_LIBRARIES        STRING FORCE : ${OPENBLAS_ROOT|ENV}/lib/libopenblas.a;-L${OPENBLAS_ROOT|ENV}/lib;-lgfortran;-lgomp;-lm
+opt-set-cmake-var TPL_LAPACK_LIBRARY_DIRS   STRING FORCE : ${OPENBLAS_ROOT|ENV}/lib
+opt-set-cmake-var TPL_LAPACK_LIBRARIES      STRING FORCE : ${OPENBLAS_ROOT|ENV}/lib/libopenblas.a;-L${OPENBLAS_ROOT|ENV}/lib;-lgfortran;-lgomp;-lm
+
 [COMMON_SPACK_TPLS]
 use COMMON
 
@@ -1751,6 +1759,7 @@ use USE-DEPRECATED|YES
 use PACKAGE-ENABLES|NO-PACKAGE-ENABLES
 
 use COMMON_SPACK_TPLS
+use SPACK_OPENBLAS_BLAS_LAPACK
 
 opt-set-cmake-var MPI_EXEC_PRE_NUMPROCS_FLAGS                                STRING       : --bind-to;none --mca btl vader,self
 opt-set-cmake-var CMAKE_CXX_FLAGS                                            STRING FORCE : -Wall -Wno-clobbered -Wno-vla -Wno-pragmas -Wno-unknown-pragmas -Wno-unused-local-typedefs -Wno-literal-suffix -Wno-deprecated-declarations -Wno-misleading-indentation -Wno-int-in-bool-context -Wno-maybe-uninitialized -Wno-nonnull-compare -Wno-address -Wno-inline
@@ -1800,9 +1809,11 @@ use USE-DEPRECATED|YES
 use PACKAGE-ENABLES|NO-PACKAGE-ENABLES
 
 use COMMON_SPACK_TPLS
+use SPACK_OPENBLAS_BLAS_LAPACK
 
 opt-set-cmake-var CMAKE_CXX_FLAGS                STRING       : -Wall -Wno-clobbered -Wno-vla -Wno-pragmas -Wno-unknown-pragmas -Wno-unused-local-typedefs -Wno-literal-suffix -Wno-deprecated-declarations -Wno-misleading-indentation -Wno-int-in-bool-context -Wno-maybe-uninitialized -Wno-class-memaccess -Wno-nonnull-compare -Wno-address -Wno-inline -Wno-unused-but-set-variable -Wno-unused-label
 
+
 opt-set-cmake-var TPL_Netcdf_LIBRARIES      STRING FORCE : ""
 
 opt-set-cmake-var TPL_ENABLE_ParMETIS       BOOL FORCE   : OFF
@@ -1971,6 +1982,7 @@ use USE-UVM|NO
 use USE-DEPRECATED|YES
 use PACKAGE-ENABLES|NO-EPETRA
 use CUDA
+use SPACK_OPENBLAS_BLAS_LAPACK
 
 opt-set-cmake-var Trilinos_ENABLE_TESTS BOOL : ON
 opt-set-cmake-var TPL_ENABLE_X11 BOOL : OFF
@@ -1997,6 +2009,7 @@ use USE-UVM|YES
 use USE-DEPRECATED|YES
 use PACKAGE-ENABLES|NO-EPETRA
 use CUDA
+use SPACK_OPENBLAS_BLAS_LAPACK
 
 opt-set-cmake-var Trilinos_ENABLE_TESTS BOOL FORCE : OFF
 opt-set-cmake-var Kokkos_ENABLE_TESTS BOOL FORCE : ON

From 4e76058dd43277e0a48cbf0939c510db6cd39a4b Mon Sep 17 00:00:00 2001
From: "Samuel E. Browne" <sebrown@sandia.gov>
Date: Mon, 16 Dec 2024 20:06:35 -0700
Subject: [PATCH 8/9] Re-specify static OpenBLAS libraries

Static libopenblas.a still needs (for now) shared libgfortran and libm.
So do it the "hacky" way, but isolate it to where we need static
libopenblas.

Signed-off-by: Samuel E. Browne <sebrown@sandia.gov>
---
 packages/framework/ini-files/config-specs.ini | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/packages/framework/ini-files/config-specs.ini b/packages/framework/ini-files/config-specs.ini
index 17a0b27e6b24..413a97326dfd 100644
--- a/packages/framework/ini-files/config-specs.ini
+++ b/packages/framework/ini-files/config-specs.ini
@@ -402,11 +402,10 @@ opt-set-cmake-var TPL_BLAS_LIBRARY_DIRS STRING FORCE : ${BLAS_ROOT|ENV}/lib
 opt-set-cmake-var TPL_LAPACK_LIBRARIES STRING FORCE : -L${BLAS_ROOT|ENV}/lib;-llapack;-lgfortran;-lgomp
 opt-set-cmake-var TPL_LAPACK_LIBRARY_DIRS STRING FORCE : ${BLAS_ROOT|ENV}/lib
 
-[SPACK_OPENBLAS_BLAS_LAPACK]
-opt-set-cmake-var TPL_BLAS_LIBRARY_DIRS     STRING FORCE : ${OPENBLAS_ROOT|ENV}/lib
-opt-set-cmake-var TPL_BLAS_LIBRARIES        STRING FORCE : ${OPENBLAS_ROOT|ENV}/lib/libopenblas.a;-L${OPENBLAS_ROOT|ENV}/lib;-lgfortran;-lgomp;-lm
-opt-set-cmake-var TPL_LAPACK_LIBRARY_DIRS   STRING FORCE : ${OPENBLAS_ROOT|ENV}/lib
-opt-set-cmake-var TPL_LAPACK_LIBRARIES      STRING FORCE : ${OPENBLAS_ROOT|ENV}/lib/libopenblas.a;-L${OPENBLAS_ROOT|ENV}/lib;-lgfortran;-lgomp;-lm
+[SPACK_SERIAL_OPENBLAS]
+# Static OpenBLAS, but shared m and gfortran
+opt-set-cmake-var TPL_BLAS_LIBRARIES        STRING FORCE : ${OPENBLAS_ROOT|ENV}/lib/libopenblas.a;-lgfortran;-lm
+opt-set-cmake-var TPL_LAPACK_LIBRARIES      STRING FORCE : ${OPENBLAS_ROOT|ENV}/lib/libopenblas.a;-lgfortran;-lm
 
 [COMMON_SPACK_TPLS]
 use COMMON
@@ -1759,7 +1758,6 @@ use USE-DEPRECATED|YES
 use PACKAGE-ENABLES|NO-PACKAGE-ENABLES
 
 use COMMON_SPACK_TPLS
-use SPACK_OPENBLAS_BLAS_LAPACK
 
 opt-set-cmake-var MPI_EXEC_PRE_NUMPROCS_FLAGS                                STRING       : --bind-to;none --mca btl vader,self
 opt-set-cmake-var CMAKE_CXX_FLAGS                                            STRING FORCE : -Wall -Wno-clobbered -Wno-vla -Wno-pragmas -Wno-unknown-pragmas -Wno-unused-local-typedefs -Wno-literal-suffix -Wno-deprecated-declarations -Wno-misleading-indentation -Wno-int-in-bool-context -Wno-maybe-uninitialized -Wno-nonnull-compare -Wno-address -Wno-inline
@@ -1809,11 +1807,9 @@ use USE-DEPRECATED|YES
 use PACKAGE-ENABLES|NO-PACKAGE-ENABLES
 
 use COMMON_SPACK_TPLS
-use SPACK_OPENBLAS_BLAS_LAPACK
 
 opt-set-cmake-var CMAKE_CXX_FLAGS                STRING       : -Wall -Wno-clobbered -Wno-vla -Wno-pragmas -Wno-unknown-pragmas -Wno-unused-local-typedefs -Wno-literal-suffix -Wno-deprecated-declarations -Wno-misleading-indentation -Wno-int-in-bool-context -Wno-maybe-uninitialized -Wno-class-memaccess -Wno-nonnull-compare -Wno-address -Wno-inline -Wno-unused-but-set-variable -Wno-unused-label
 
-
 opt-set-cmake-var TPL_Netcdf_LIBRARIES      STRING FORCE : ""
 
 opt-set-cmake-var TPL_ENABLE_ParMETIS       BOOL FORCE   : OFF
@@ -1982,7 +1978,7 @@ use USE-UVM|NO
 use USE-DEPRECATED|YES
 use PACKAGE-ENABLES|NO-EPETRA
 use CUDA
-use SPACK_OPENBLAS_BLAS_LAPACK
+use SPACK_SERIAL_OPENBLAS
 
 opt-set-cmake-var Trilinos_ENABLE_TESTS BOOL : ON
 opt-set-cmake-var TPL_ENABLE_X11 BOOL : OFF
@@ -2009,7 +2005,7 @@ use USE-UVM|YES
 use USE-DEPRECATED|YES
 use PACKAGE-ENABLES|NO-EPETRA
 use CUDA
-use SPACK_OPENBLAS_BLAS_LAPACK
+use SPACK_SERIAL_OPENBLAS
 
 opt-set-cmake-var Trilinos_ENABLE_TESTS BOOL FORCE : OFF
 opt-set-cmake-var Kokkos_ENABLE_TESTS BOOL FORCE : ON

From b31f7123507133873f4fe6449b936216bf7d5be6 Mon Sep 17 00:00:00 2001
From: "Samuel E. Browne" <sebrown@sandia.gov>
Date: Mon, 16 Dec 2024 20:09:04 -0700
Subject: [PATCH 9/9] Use default finds for BLAS and LAPACK

Or rather, do not specify TPL_<blasorlapack>_LIBRARIES for the default
case.

Signed-off-by: Samuel E. Browne <sebrown@sandia.gov>
---
 packages/framework/ini-files/config-specs.ini | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/framework/ini-files/config-specs.ini b/packages/framework/ini-files/config-specs.ini
index 413a97326dfd..b3a2b1a40726 100644
--- a/packages/framework/ini-files/config-specs.ini
+++ b/packages/framework/ini-files/config-specs.ini
@@ -393,8 +393,6 @@ opt-set-cmake-var Scotch_LIBRARY_DIRS PATH : ${SEMS_SCOTCH_LIBRARY_PATH|ENV}
 # Explicit libraries
 opt-set-cmake-var TPL_DLlib_LIBRARIES PATH : ${DL_LIBRARIES|ENV}
 opt-set-cmake-var TPL_Netcdf_LIBRARIES STRING : ${SEMS_NETCDF_LIBRARY_PATH|ENV}/libnetcdf.so;${SEMS_NETCDF_LIBRARY_PATH|ENV}/libpnetcdf.a
-opt-set-cmake-var TPL_BLAS_LIBRARIES STRING : ${BLAS_LIBRARIES|ENV}
-opt-set-cmake-var TPL_LAPACK_LIBRARIES STRING : ${LAPACK_LIBRARIES|ENV}
 
 [SPACK_NETLIB_BLAS_LAPACK]
 opt-set-cmake-var TPL_BLAS_LIBRARIES STRING FORCE : -L${BLAS_ROOT|ENV}/lib;-lblas;-lgfortran;-lgomp