From eb6b6bc978a7ee855d134a6868cd3f74b8fce6f1 Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Wed, 10 Jul 2024 22:47:35 -0700 Subject: [PATCH] GEOSX_TPL_DIR is env variable so keeping that for now debugging ci script tar command revert GEOS_TPL_DIR to GEOSX_TPL_DIR in ci_build_and_test_in_container.sh revert GEOS_TPL_DIR to GEOSX_TPL_DIR in ci_build_and_test_in_container.sh debugging update LvArray --- .github/workflows/build_and_test.yml | 4 ++-- .../Stanford/sherlock-gcc10-ompi4.1.2-openblas0.3.10.cmake | 2 +- host-configs/TOTAL/pangea3-gcc8.4.1-openmpi-4.1.2.cmake | 2 +- host-configs/TOTAL/pecan-CPU.cmake | 2 +- host-configs/environment.cmake | 2 +- scripts/ci_build_and_test_in_container.sh | 7 ++++++- src/coreComponents/LvArray | 2 +- 7 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index aee70cdf5da..8b3405614f7 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -140,12 +140,12 @@ jobs: COMMIT=${{ github.event.pull_request.head.sha }} SHORT_COMMIT=${COMMIT:0:7} - script_args+=(--install-dir-basename GEOSX-${SHORT_COMMIT}) + script_args+=(--install-dir-basename GEOS-${SHORT_COMMIT}) # All the data exchanged with the docker container is eventually meant to be sent to the cloud. if [[ ! -z "${{ inputs.GCP_BUCKET }}" ]]; then if [ "${{ inputs.BUILD_TYPE }}" = "build" ]; then - DATA_BASENAME=GEOSX-and-TPL-${SHORT_COMMIT}.tar.gz + DATA_BASENAME=GEOS-and-TPL-${SHORT_COMMIT}.tar.gz elif [ "${{ inputs.BUILD_TYPE }}" = "integrated_tests" ]; then DATA_BASENAME=integratedTests-pr${{ github.event.number }}-${{ github.run_number }}-${SHORT_COMMIT}.tar.gz script_args+=(--run-integrated-tests) diff --git a/host-configs/Stanford/sherlock-gcc10-ompi4.1.2-openblas0.3.10.cmake b/host-configs/Stanford/sherlock-gcc10-ompi4.1.2-openblas0.3.10.cmake index 8074e2cd631..86013187457 100644 --- a/host-configs/Stanford/sherlock-gcc10-ompi4.1.2-openblas0.3.10.cmake +++ b/host-configs/Stanford/sherlock-gcc10-ompi4.1.2-openblas0.3.10.cmake @@ -40,5 +40,5 @@ set(LAPACK_LIBRARIES "${OPENBLAS_ROOT}/lib/libopenblas.so" CACHE STRING "") set(ENABLE_VALGRIND OFF CACHE BOOL "") set(ENABLE_CALIPER ON CACHE BOOL "") -set(GEOS_TPL_DIR "$ENV{GEOS_TPL_DIR}" CACHE PATH "" FORCE) +set(GEOS_TPL_DIR "$ENV{GEOSX_TPL_DIR}" CACHE PATH "" FORCE) include(${CMAKE_CURRENT_LIST_DIR}/../tpls.cmake) diff --git a/host-configs/TOTAL/pangea3-gcc8.4.1-openmpi-4.1.2.cmake b/host-configs/TOTAL/pangea3-gcc8.4.1-openmpi-4.1.2.cmake index 7128609bc09..b62c1c45f74 100644 --- a/host-configs/TOTAL/pangea3-gcc8.4.1-openmpi-4.1.2.cmake +++ b/host-configs/TOTAL/pangea3-gcc8.4.1-openmpi-4.1.2.cmake @@ -4,7 +4,7 @@ set(CONFIG_NAME "pangea3-gcc8.4.1-ompi-4.1.2" CACHE PATH "") # Set up the tpls -set(GEOS_TPL_DIR "$ENV{GEOS_TPL_DIR}" CACHE PATH "" FORCE) +set(GEOS_TPL_DIR "$ENV{GEOSX_TPL_DIR}" CACHE PATH "" FORCE) if (NOT DEFINED GEOS_TPL_DIR) message(FATAL_ERROR "You must set GEOS_TPL_DIR with -D GEOS_TPL_DIR=") endif () diff --git a/host-configs/TOTAL/pecan-CPU.cmake b/host-configs/TOTAL/pecan-CPU.cmake index 1883313e565..a68d14fbc62 100644 --- a/host-configs/TOTAL/pecan-CPU.cmake +++ b/host-configs/TOTAL/pecan-CPU.cmake @@ -33,5 +33,5 @@ set(MKL_LIBRARIES ${MKL_ROOT}/lib/intel64/libmkl_intel_lp64.so ${INTEL_ROOT}/compiler/lib/intel64_lin/libiomp5.so CACHE STRING "") -set(GEOS_TPL_DIR "$ENV{GEOS_TPL_DIR}" CACHE PATH "" FORCE) +set(GEOS_TPL_DIR "$ENV{GEOSX_TPL_DIR}" CACHE PATH "" FORCE) include(${CMAKE_CURRENT_LIST_DIR}/../tpls.cmake) diff --git a/host-configs/environment.cmake b/host-configs/environment.cmake index 4fb87e83661..b843c4ce9b7 100644 --- a/host-configs/environment.cmake +++ b/host-configs/environment.cmake @@ -78,5 +78,5 @@ if(DEFINED ENV{LAPACK_LIBRARIES}) set(LAPACK_LIBRARIES "$ENV{LAPACK_LIBRARIES}" CACHE PATH "" FORCE) endif() -set(GEOS_TPL_DIR "$ENV{GEOS_TPL_DIR}" CACHE PATH "" FORCE) +set(GEOS_TPL_DIR "$ENV{GEOSX_TPL_DIR}" CACHE PATH "" FORCE) include(${CMAKE_CURRENT_LIST_DIR}/tpls.cmake) diff --git a/scripts/ci_build_and_test_in_container.sh b/scripts/ci_build_and_test_in_container.sh index 735b0a2eca2..b90822529be 100755 --- a/scripts/ci_build_and_test_in_container.sh +++ b/scripts/ci_build_and_test_in_container.sh @@ -103,7 +103,7 @@ do shift 2;; --exchange-dir) DATA_EXCHANGE_DIR=$2; shift 2;; --host-config) HOST_CONFIG=$2; shift 2;; - --install-dir-basename) GEOS_DIR=${GEOS_TPL_DIR}/../$2; shift 2;; + --install-dir-basename) GEOS_DIR=${GEOSX_TPL_DIR}/../$2; shift 2;; --no-install-schema) GEOS_INSTALL_SCHEMA=false; shift;; --no-run-unit-tests) RUN_UNIT_TESTS=false; shift;; --nproc) NPROC=$2; shift 2;; @@ -253,6 +253,11 @@ else if [[ ! -z "${DATA_BASENAME_WE}" ]]; then # Here we pack the installation. # The `--transform` parameter provides consistency between the tarball name and the unpacked folder. + echo "DATA_EXCHANGE_DIR=${DATA_EXCHANGE_DIR}" + echo "DATA_BASENAME_WE=${DATA_BASENAME_WE}" + echo "GEOS_TPL_DIR=${GEOS_TPL_DIR}" + echo "GEOSX_TPL_DIR=${GEOSX_TPL_DIR}" + echo tar czf ${DATA_EXCHANGE_DIR}/${DATA_BASENAME_WE}.tar.gz --directory=${GEOS_TPL_DIR}/.. --transform "s|^./|${DATA_BASENAME_WE}/|" . or_die tar czf ${DATA_EXCHANGE_DIR}/${DATA_BASENAME_WE}.tar.gz --directory=${GEOS_TPL_DIR}/.. --transform "s|^./|${DATA_BASENAME_WE}/|" . fi fi diff --git a/src/coreComponents/LvArray b/src/coreComponents/LvArray index e4c9becc0a1..6d0298f602d 160000 --- a/src/coreComponents/LvArray +++ b/src/coreComponents/LvArray @@ -1 +1 @@ -Subproject commit e4c9becc0a12ce3e5698205846a334d2ac9f0a93 +Subproject commit 6d0298f602dd32d525dfb8ad5340d1db5a3078ac