diff --git a/scripts/ci_build_and_test_in_container.sh b/scripts/ci_build_and_test_in_container.sh index 47216457abd..456a3557a58 100755 --- a/scripts/ci_build_and_test_in_container.sh +++ b/scripts/ci_build_and_test_in_container.sh @@ -80,14 +80,15 @@ args=$(or_die getopt -a -o h --long build-exe-only,cmake-build-type:,code-covera BUILD_EXE_ONLY=false GEOSX_INSTALL_SCHEMA=true HOST_CONFIG="host-configs/environment.cmake" -ENABLE_HYPRE=ON +ENABLE_HYPRE=OFF ENABLE_HYPRE_DEVICE=CPU +GEOSX_LA_INTERFACE=Trilinos RUN_UNIT_TESTS=true RUN_INTEGRATED_TESTS=false UPLOAD_TEST_BASELINES=false TEST_CODE_STYLE=false TEST_DOCUMENTATION=false -ENABLE_TRILINOS=OFF +ENABLE_TRILINOS=ON CODE_COVERAGE=false NPROC="$(nproc)" @@ -144,6 +145,10 @@ if [[ -z "${GEOSX_DIR}" ]]; then GEOSX_DIR=/dev/null fi +if [[ "${ENABLE_HYPRE}" = ON ]]; then + GEOSX_LA_INTERFACE=Hypre +fi + if [[ ! -z "${SCCACHE_CREDS}" ]]; then # The credential json file is available at the root of the geos repository. # We hereafter create the config file that points to it. @@ -239,6 +244,7 @@ or_die python3 scripts/config-build.py \ -DENABLE_HYPRE=${ENABLE_HYPRE} \ -DENABLE_HYPRE_DEVICE=${ENABLE_HYPRE_DEVICE} \ -DENABLE_TRILINOS=${ENABLE_TRILINOS} \ + -DGEOSX_LA_INTERFACE:PATH=${GEOSX_LA_INTERFACE} \ -DENABLE_COVERAGE=$([[ "${CODE_COVERAGE}" = true ]] && echo 1 || echo 0) \ ${SCCACHE_CMAKE_ARGS} \ ${ATS_CMAKE_ARGS}