Merge branch 'main' into jacob-moore/autoBuild

lanl · Feb 26, 2024 · 947722e · 947722e
2 parents 532f798 + 02dd88a
commit 947722e
Show file tree

Hide file tree

Showing 103 changed files with 4,509 additions and 2,506 deletions.
diff --git a/lib/Elements b/lib/Elements
diff --git a/scripts/build-fierro.sh b/scripts/build-fierro.sh
@@ -2,7 +2,7 @@
 show_help() {
     echo "Usage: source $(basename "$BASH_SOURCE") [OPTION]"
     echo "Valid options:"
-    echo "  --solver=<all|explicit|explicit-evpfft|explicit-ls-evpfft|explicit-evp|implicit>. Default is 'explicit'"
+    echo "  --solver=<all|explicit|explicit-evpfft|explicit-ls-evpfft|implicit>. Default is 'explicit'"
     echo "  --kokkos_build_type=<serial|openmp|pthreads|cuda|hip>. Default is 'serial'"
     echo "  --build_action=<full-app|set-env|install-trilinos|install-hdf5|install-heffte|fierro>. Default is 'full-app'"
     echo "  --machine=<darwin|chicoma|linux|mac>. Default is 'linux'"
@@ -27,7 +27,6 @@ show_help() {
     echo "          explicit                    builds the explicit solver"
     echo "          explicit-evpfft             builds the explicit solver with the EVPFFT material model"
     echo "          explicit-ls-evpfft          builds the explicit solver with the LS-EVPFFT material model"
-    echo "          explicit-evp                builds the explicit solver with the EVP material model"    
     echo "          implicit                    builds the explicit solver"
     echo " "
     echo "      --kokkos_build_type             The desired kokkos parallel backend to use. The default is 'serial'"
@@ -64,7 +63,7 @@ build_cores="1"
 
 # Define arrays of valid options
 valid_build_action=("full-app" "set-env" "install-trilinos" "install-hdf5" "install-heffte" "fierro")
-valid_solver=("all" "explicit" "explicit-evpfft" "explicit-ls-evpfft" "explicit-evp" "implicit")
+valid_solver=("all" "explicit" "explicit-evpfft" "explicit-ls-evpfft" "implicit")
 valid_kokkos_build_types=("serial" "openmp" "pthreads" "cuda" "hip")
 valid_heffte_build_types=("fftw" "cufft" "rocfft")
 valid_machines=("darwin" "chicoma" "linux" "mac")
@@ -185,15 +184,15 @@ if [ "$build_action" = "full-app" ]; then
         source hdf5-install.sh
         source heffte-install.sh ${heffte_build_type} ${machine}
     fi
-    source cmake_build.sh ${solver}
+    source cmake_build.sh ${solver} ${heffte_build_type} ${kokkos_build_type}
 elif [ "$build_action" = "install-trilinos" ]; then
     source trilinos-install.sh ${kokkos_build_type}
 elif [ "$build_action" = "install-hdf5" ]; then
     source hdf5-install.sh
 elif [ "$build_action" = "install-heffte" ]; then
     source heffte-install.sh ${heffte_build_type} ${machine}
 elif [ "$build_action" = "fierro" ]; then
-    source cmake_build.sh ${solver} ${heffte_build_type}
+    source cmake_build.sh ${solver} ${heffte_build_type} ${kokkos_build_type}
 else
     echo "No build action, only setup the environment."
 fi

diff --git a/scripts/cmake_build.sh b/scripts/cmake_build.sh
@@ -2,6 +2,7 @@
 
 solver="${1}"
 heffte_build_type="${2}"
+kokkos_build_type="${3}"
 
 #inititialize submodules if they aren't downloaded
 [ -d "${libdir}/Elements/elements" ] && echo "Elements submodule exists"
@@ -87,16 +88,22 @@ elif [ "$solver" = "explicit-evpfft" ] || [ "$solver" = "explicit-ls-evpfft" ];
             -D USE_FFTW=ON
         )
     fi
-elif [ "$solver" = "explicit-evp" ]; then
+else
     cmake_options+=(
         -D BUILD_PARALLEL_EXPLICIT_SOLVER=ON
         -D BUILD_IMPLICIT_SOLVER=OFF
-        -D BUILD_EVP_FIERRO=ON
     )
-else
+fi
+
+if [ "$kokkos_build_type" = "cuda" ]; then
+    export OMPI_CXX=${TRILINOS_SOURCE_DIR}/packages/kokkos/bin/nvcc_wrapper
     cmake_options+=(
-        -D BUILD_PARALLEL_EXPLICIT_SOLVER=ON
-        -D BUILD_IMPLICIT_SOLVER=OFF
+        -D CMAKE_CXX_COMPILER=${TRILINOS_SOURCE_DIR}/packages/kokkos/bin/nvcc_wrapper
+    )
+elif [ "$kokkos_build_type" = "hip" ]; then
+    export OMPI_CXX=hipcc
+    cmake_options+=(
+        -D CMAKE_CXX_COMPILER=hipcc
     )
 fi
 

diff --git a/src/EVP/src/CMakeLists.txt b/src/EVP/src/CMakeLists.txt
diff --git a/src/EVP/src/UserEOSModel.cpp b/src/EVP/src/UserEOSModel.cpp
diff --git a/src/EVP/src/UserEOSModel.h b/src/EVP/src/UserEOSModel.h
diff --git a/src/EVP/src/UserStrengthModel.h b/src/EVP/src/UserStrengthModel.h