From 085663a5de6feaeec0726cb32529fc71519b5ac7 Mon Sep 17 00:00:00 2001 From: Christopher Sherman Date: Fri, 5 Jul 2024 14:26:09 -0700 Subject: [PATCH 01/11] Resolving merge conflict --- inputFiles/pygeos/modified_sedov.xml | 65 +++++++++++++++++++ inputFiles/pygeos/pygeos.ats | 32 ++++++++++ inputFiles/pygeos/run_sedov_problem.py | 80 ++++++++++++++++++++++++ inputFiles/solidMechanics/sedov_base.xml | 9 +-- src/CMakeLists.txt | 6 +- 5 files changed, 183 insertions(+), 9 deletions(-) create mode 100644 inputFiles/pygeos/modified_sedov.xml create mode 100644 inputFiles/pygeos/pygeos.ats create mode 100644 inputFiles/pygeos/run_sedov_problem.py diff --git a/inputFiles/pygeos/modified_sedov.xml b/inputFiles/pygeos/modified_sedov.xml new file mode 100644 index 00000000000..b3dcedb087f --- /dev/null +++ b/inputFiles/pygeos/modified_sedov.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/inputFiles/pygeos/pygeos.ats b/inputFiles/pygeos/pygeos.ats new file mode 100644 index 00000000000..62f8a33c326 --- /dev/null +++ b/inputFiles/pygeos/pygeos.ats @@ -0,0 +1,32 @@ +# Integrated Test Docs Begin Parameters +import geos_ats +from geos_ats.test_builder import generate_geos_tests, RestartcheckParameters, TestDeck, CurveCheckParameters + +restartcheck_params = {} +restartcheck_params["atol"] = 2.0E-10 +restartcheck_params["rtol"] = 2.0E-13 + +curvecheck_params = {} +curvecheck_params['filename'] = 'veloc_history.hdf5' +curvecheck_params['tolerance'] = 1e-10 +curvecheck_params['time_units'] = 'milliseconds' +curvecheck_params['curves'] = [['velocity', 'source']] +# Integrated Test Docs End Parameters + +# Integrated Test Docs Begin Test Loop +partitions = ((1, 1, 1), (2, 2, 2), (3, 3, 3)) + +decks = [ + TestDeck( + name="modified_sedov", + pygeos_script="run_sedov_problem.py", + description="Sedov problem with initial conditions modified using pygeos", + partitions=partitions, + restart_step=50, + check_step=100, + restartcheck_params=RestartcheckParameters(**restartcheck_params), + curvecheck_params=CurveCheckParameters(**curvecheck_params)) +] + +generate_geos_tests(decks) +# Integrated Test Docs End Test Loop \ No newline at end of file diff --git a/inputFiles/pygeos/run_sedov_problem.py b/inputFiles/pygeos/run_sedov_problem.py new file mode 100644 index 00000000000..52914bf5404 --- /dev/null +++ b/inputFiles/pygeos/run_sedov_problem.py @@ -0,0 +1,80 @@ + +import numpy as np +from mpi4py import MPI +import pygeosx +from pygeosx_tools import wrapper +from geosx_xml_tools.main import preprocess_parallel + + +# PYGEOSX_STRESS_FN +def stress_fn(x): + """ + Function to set stress values + + Args: + x (np.ndarray) the element centers + + Returns: + np.ndarray: stress values + """ + R = x[:, 0]**2 + x[:, 1]**2 + x[:, 2]**2 + return np.sin(2.0 * np.pi * R / np.amax(R)) +# PYGEOSX_STRESS_FN_END + + +def run_problem(): + """ + Run the GEOSX problem + """ + # PYGEOSX_INITIALIZATION + # Get the MPI rank + comm = MPI.COMM_WORLD + rank = comm.Get_rank() + + # Initialize the code and set initial conditions + problem = pygeosx.initialize(rank, args) + pygeosx.apply_initial_conditions() + + # Rather than specifying the wrapper paths explicitly, + # search for them using a set of filters + location_key = wrapper.get_matching_wrapper_path(problem, ['Level0', 'Region2', 'elementCenter']) + stress_key = wrapper.get_matching_wrapper_path(problem, ['Level0', 'Region2', 'shale', 'stress']) + ghost_key = wrapper.get_matching_wrapper_path(problem, ['Level0', 'Region2', 'cb1', 'ghostRank']) + # PYGEOSX_INITIALIZATION_END + + # PYGEOSX_STRESS_IC + # Print initial stress + wrapper.print_global_value_range(problem, stress_key, 'stress') + + # Zero out stress + wrapper.set_wrapper_to_value(problem, stress_key, 0.0) + wrapper.print_global_value_range(problem, stress_key, 'stress') + + # Set stress via a function + wrapper.set_wrapper_with_function(problem, stress_key, location_key, stress_fn, target_index=0) + wrapper.set_wrapper_with_function(problem, stress_key, location_key, stress_fn, target_index=1) + wrapper.set_wrapper_with_function(problem, stress_key, location_key, stress_fn, target_index=2) + wrapper.print_global_value_range(problem, stress_key, 'stress') + # PYGEOSX_STRESS_IC_END + + # PYGEOSX_MAIN_LOOP + # Run the code + while pygeosx.run() != pygeosx.COMPLETED: + wrapper.print_global_value_range(problem, stress_key, 'stress') + + # Gather/allgather tests + tmp = wrapper.gather_wrapper(problem, stress_key) + print(wrapper.rank, 'gather', np.shape(tmp), flush=True) + + tmp = wrapper.allgather_wrapper(problem, stress_key) + print(wrapper.rank, 'allgather', np.shape(tmp), flush=True) + + tmp = wrapper.allgather_wrapper(problem, stress_key, ghost_key=ghost_key) + print(wrapper.rank, 'allgather_ghost_filtered', np.shape(tmp), flush=True) + # PYGEOSX_MAIN_LOOP_END + + +if __name__ == '__main__': + run_problem() + + diff --git a/inputFiles/solidMechanics/sedov_base.xml b/inputFiles/solidMechanics/sedov_base.xml index 49419832a75..5bb28956e42 100644 --- a/inputFiles/solidMechanics/sedov_base.xml +++ b/inputFiles/solidMechanics/sedov_base.xml @@ -90,13 +90,8 @@ - - - + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 54b7a3f9bfd..cccd5f0777f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -232,8 +232,10 @@ install( FILES ${CMAKE_BINARY_DIR}/schema.xsd ################################ # Add python environment setup ################################ -# message(WARNING "Temporarily changing the geosPythonBranch to feature/packaging") -# set(GEOS_PYTHON_PACKAGES_BRANCH "feature/packaging" CACHE STRING "" FORCE) +# message(WARNING "Temporarily changing the geosPythonBranch to cusini/fix-streak-cert-fail") +# set(GEOS_PYTHON_PACKAGES_BRANCH "cusini/fix-streak-cert-fail" CACHE STRING "" FORCE) +message(WARNING "Temporarily changing the geosPythonBranch to feature/sherman/addPygeosxIntegratedTests") +set(GEOS_PYTHON_PACKAGES_BRANCH "cusini/fix-streak-cert-fail" CACHE STRING "" FORCE) if ( Python3_EXECUTABLE ) From 3f901c9268a3a892f85ae26c02f917f82c8f9bb9 Mon Sep 17 00:00:00 2001 From: Christopher Sherman Date: Fri, 5 Jul 2024 14:45:50 -0700 Subject: [PATCH 02/11] Attempting to enable CI pygeosx tests --- scripts/ci_build_and_test_in_container.sh | 14 +++++++++++++- src/CMakeLists.txt | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/scripts/ci_build_and_test_in_container.sh b/scripts/ci_build_and_test_in_container.sh index 33faba11f8c..3fa995d20f9 100755 --- a/scripts/ci_build_and_test_in_container.sh +++ b/scripts/ci_build_and_test_in_container.sh @@ -73,6 +73,7 @@ args=$(or_die getopt -a -o h --long build-exe-only,cmake-build-type:,code-covera # Variables with default values BUILD_EXE_ONLY=false GEOSX_INSTALL_SCHEMA=true +BUILD_PYGEOSX=true HOST_CONFIG="host-configs/environment.cmake" RUN_UNIT_TESTS=true RUN_INTEGRATED_TESTS=false @@ -108,6 +109,7 @@ do --no-run-unit-tests) RUN_UNIT_TESTS=false; shift;; --nproc) NPROC=$2; shift 2;; --repository) GEOS_SRC_DIR=$2; shift 2;; + --build_pygeosx) BUILD_PYGEOSX=true; shift;; --run-integrated-tests) RUN_INTEGRATED_TESTS=true; shift;; --upload-test-baselines) UPLOAD_TEST_BASELINES=true; shift;; --code-coverage) CODE_COVERAGE=true; shift;; @@ -201,6 +203,15 @@ if [[ "${CODE_COVERAGE}" = true ]]; then fi +PYGEOSX_ARGS="" +if [[ "${BUILD_PYGEOSX}" = true ]]; then + echo "Enabling pygeosx." + or_die apt-get install -y python3-dev + + PYTHON_EXEC=$(which python3) + PYGEOSX_ARGS="-DENABLE_PYGEOSX=ON -DPython3_EXECUTABLE=$PYTHON_EXEC" +fi + # The -DBLT_MPI_COMMAND_APPEND="--allow-run-as-root;--oversubscribe" option is added for OpenMPI. # @@ -226,7 +237,8 @@ or_die python3 scripts/config-build.py \ -DGEOSX_INSTALL_SCHEMA=${GEOSX_INSTALL_SCHEMA} \ -DENABLE_COVERAGE=$([[ "${CODE_COVERAGE}" = true ]] && echo 1 || echo 0) \ ${SCCACHE_CMAKE_ARGS} \ - ${ATS_CMAKE_ARGS} + ${ATS_CMAKE_ARGS} \ + $PYGEOSX_ARGS # The configuration step is now over, we can now move to the build directory for the build! or_die cd ${GEOSX_BUILD_DIR} diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cccd5f0777f..549f5ef77b2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -235,7 +235,7 @@ install( FILES ${CMAKE_BINARY_DIR}/schema.xsd # message(WARNING "Temporarily changing the geosPythonBranch to cusini/fix-streak-cert-fail") # set(GEOS_PYTHON_PACKAGES_BRANCH "cusini/fix-streak-cert-fail" CACHE STRING "" FORCE) message(WARNING "Temporarily changing the geosPythonBranch to feature/sherman/addPygeosxIntegratedTests") -set(GEOS_PYTHON_PACKAGES_BRANCH "cusini/fix-streak-cert-fail" CACHE STRING "" FORCE) +set(GEOS_PYTHON_PACKAGES_BRANCH "feature/sherman/addPygeosxIntegratedTests" CACHE STRING "" FORCE) if ( Python3_EXECUTABLE ) From 63297517838b865aa3b03acdbed994f5d58df4a8 Mon Sep 17 00:00:00 2001 From: Christopher Sherman Date: Fri, 5 Jul 2024 14:56:42 -0700 Subject: [PATCH 03/11] Updating pygeosx ci instructions --- scripts/ci_build_and_test_in_container.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/ci_build_and_test_in_container.sh b/scripts/ci_build_and_test_in_container.sh index 3fa995d20f9..b8dca5df764 100755 --- a/scripts/ci_build_and_test_in_container.sh +++ b/scripts/ci_build_and_test_in_container.sh @@ -206,9 +206,11 @@ fi PYGEOSX_ARGS="" if [[ "${BUILD_PYGEOSX}" = true ]]; then echo "Enabling pygeosx." - or_die apt-get install -y python3-dev + or_die apt-get install -y python3-dev python3-numpy python3-mpi4py PYTHON_EXEC=$(which python3) + echo "Found python as ${PYTHON_EXEC}." + PYGEOSX_ARGS="-DENABLE_PYGEOSX=ON -DPython3_EXECUTABLE=$PYTHON_EXEC" fi From 19f092cf2f83d2ecc09f1311a79c4e8d120b486f Mon Sep 17 00:00:00 2001 From: Christopher Sherman Date: Fri, 5 Jul 2024 15:10:22 -0700 Subject: [PATCH 04/11] Updating pygeosx ci instructions --- scripts/ci_build_and_test_in_container.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/ci_build_and_test_in_container.sh b/scripts/ci_build_and_test_in_container.sh index b8dca5df764..766e775a55f 100755 --- a/scripts/ci_build_and_test_in_container.sh +++ b/scripts/ci_build_and_test_in_container.sh @@ -206,11 +206,8 @@ fi PYGEOSX_ARGS="" if [[ "${BUILD_PYGEOSX}" = true ]]; then echo "Enabling pygeosx." - or_die apt-get install -y python3-dev python3-numpy python3-mpi4py - + or_die apt-get install -y virtualenv python3.11-dev python3-numpy python3-mpi4py PYTHON_EXEC=$(which python3) - echo "Found python as ${PYTHON_EXEC}." - PYGEOSX_ARGS="-DENABLE_PYGEOSX=ON -DPython3_EXECUTABLE=$PYTHON_EXEC" fi From 1520c72fe6cb56dfda361fe7f55371962523cc13 Mon Sep 17 00:00:00 2001 From: Christopher Sherman Date: Fri, 5 Jul 2024 15:17:56 -0700 Subject: [PATCH 05/11] Updating pygeosx ci instructions --- scripts/ci_build_and_test_in_container.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ci_build_and_test_in_container.sh b/scripts/ci_build_and_test_in_container.sh index 766e775a55f..79186ba2203 100755 --- a/scripts/ci_build_and_test_in_container.sh +++ b/scripts/ci_build_and_test_in_container.sh @@ -206,6 +206,7 @@ fi PYGEOSX_ARGS="" if [[ "${BUILD_PYGEOSX}" = true ]]; then echo "Enabling pygeosx." + or_die apt-get update or_die apt-get install -y virtualenv python3.11-dev python3-numpy python3-mpi4py PYTHON_EXEC=$(which python3) PYGEOSX_ARGS="-DENABLE_PYGEOSX=ON -DPython3_EXECUTABLE=$PYTHON_EXEC" From 7bb7cf7401a87e542cf6938b8d238355e349b3ad Mon Sep 17 00:00:00 2001 From: Christopher Sherman Date: Fri, 5 Jul 2024 15:27:41 -0700 Subject: [PATCH 06/11] Updating pygeosx ci instructions --- scripts/ci_build_and_test_in_container.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/ci_build_and_test_in_container.sh b/scripts/ci_build_and_test_in_container.sh index 79186ba2203..ce1412ea87f 100755 --- a/scripts/ci_build_and_test_in_container.sh +++ b/scripts/ci_build_and_test_in_container.sh @@ -207,8 +207,9 @@ PYGEOSX_ARGS="" if [[ "${BUILD_PYGEOSX}" = true ]]; then echo "Enabling pygeosx." or_die apt-get update - or_die apt-get install -y virtualenv python3.11-dev python3-numpy python3-mpi4py + or_die apt-get install -y virtualenv python-dev python3-numpy python3-mpi4py PYTHON_EXEC=$(which python3) + echo "Using python as $PYTHON_EXEC" PYGEOSX_ARGS="-DENABLE_PYGEOSX=ON -DPython3_EXECUTABLE=$PYTHON_EXEC" fi From 447f0859d6e8b09649017328f6acd71b6cd00546 Mon Sep 17 00:00:00 2001 From: Christopher Sherman Date: Fri, 5 Jul 2024 15:34:59 -0700 Subject: [PATCH 07/11] Updating pygeosx ci instructions --- scripts/ci_build_and_test_in_container.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ci_build_and_test_in_container.sh b/scripts/ci_build_and_test_in_container.sh index ce1412ea87f..a93fe7c167b 100755 --- a/scripts/ci_build_and_test_in_container.sh +++ b/scripts/ci_build_and_test_in_container.sh @@ -207,8 +207,8 @@ PYGEOSX_ARGS="" if [[ "${BUILD_PYGEOSX}" = true ]]; then echo "Enabling pygeosx." or_die apt-get update - or_die apt-get install -y virtualenv python-dev python3-numpy python3-mpi4py - PYTHON_EXEC=$(which python3) + or_die apt-get install -y virtualenv python3-dev python3-numpy python3-mpi4py + PYTHON_EXEC=$(readlink $(which python3)) echo "Using python as $PYTHON_EXEC" PYGEOSX_ARGS="-DENABLE_PYGEOSX=ON -DPython3_EXECUTABLE=$PYTHON_EXEC" fi From b4bd24b3ea872cfd1e989c11fe446f68a69cc5c6 Mon Sep 17 00:00:00 2001 From: Christopher Sherman Date: Fri, 5 Jul 2024 16:23:30 -0700 Subject: [PATCH 08/11] Updating pygeosx ci instructions --- scripts/ci_build_and_test_in_container.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ci_build_and_test_in_container.sh b/scripts/ci_build_and_test_in_container.sh index a93fe7c167b..8c60fc2eae4 100755 --- a/scripts/ci_build_and_test_in_container.sh +++ b/scripts/ci_build_and_test_in_container.sh @@ -207,8 +207,8 @@ PYGEOSX_ARGS="" if [[ "${BUILD_PYGEOSX}" = true ]]; then echo "Enabling pygeosx." or_die apt-get update - or_die apt-get install -y virtualenv python3-dev python3-numpy python3-mpi4py - PYTHON_EXEC=$(readlink $(which python3)) + or_die apt-get install -y virtualenv python3-dev python3-numpy python3-mpi4py python3-venv + PYTHON_EXEC=$(which python3) echo "Using python as $PYTHON_EXEC" PYGEOSX_ARGS="-DENABLE_PYGEOSX=ON -DPython3_EXECUTABLE=$PYTHON_EXEC" fi From d2cb8484232544dc2cdb1f2fc16012a413e82751 Mon Sep 17 00:00:00 2001 From: Christopher Sherman Date: Fri, 5 Jul 2024 16:32:12 -0700 Subject: [PATCH 09/11] Limiting CI build of PYGEOSX --- .github/workflows/build_and_test.yml | 7 +++++++ .github/workflows/ci_tests.yml | 3 +++ scripts/ci_build_and_test_in_container.sh | 3 +-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index aee70cdf5da..46da0e27238 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -38,6 +38,10 @@ on: ENABLE_HYPRE_DEVICE: required: false type: string + ENABLE_PYGEOSX: + required: false + type: boolean + default: false ENABLE_TRILINOS: required: false type: string @@ -200,6 +204,9 @@ jobs: fi docker_args+=(--name ${CONTAINER_NAME}) + if ${{ inputs.ENABLE_PYGEOSX }} == 'true'; then + script_args+=(--build-pygeosx) + fi if ${{ inputs.CODE_COVERAGE }} == 'true'; then script_args+=(--code-coverage) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 7396cf889b9..d4ec79358cd 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -142,6 +142,7 @@ jobs: DOCKER_REPOSITORY: geosx/ubuntu22.04-gcc12 ENABLE_HYPRE: ON ENABLE_TRILINOS: OFF + ENABLE_PYGEOSX: ON - name: Ubuntu (22.04, clang 15.0.7, open-mpi 4.1.2) CMAKE_BUILD_TYPE: Release @@ -177,6 +178,7 @@ jobs: DOCKER_REPOSITORY: ${{ matrix.DOCKER_REPOSITORY }} ENABLE_HYPRE: ${{ matrix.ENABLE_HYPRE }} ENABLE_TRILINOS: ${{ matrix.ENABLE_TRILINOS }} + ENABLE_PYGEOSX: ${{ matrix.ENABLE_PYGEOSX }} GCP_BUCKET: ${{ matrix.GCP_BUCKET }} HOST_CONFIG: ${{ matrix.HOST_CONFIG }} RUNS_ON: ubuntu-22.04 @@ -198,6 +200,7 @@ jobs: DOCKER_REPOSITORY: geosx/ubuntu22.04-gcc11 ENABLE_HYPRE: ON ENABLE_TRILINOS: OFF + ENABLE_PYGEOSX: ON GCP_BUCKET: geosx/integratedTests RUNS_ON: streak2-32core NPROC: 32 diff --git a/scripts/ci_build_and_test_in_container.sh b/scripts/ci_build_and_test_in_container.sh index 8c60fc2eae4..1ae05ada2b7 100755 --- a/scripts/ci_build_and_test_in_container.sh +++ b/scripts/ci_build_and_test_in_container.sh @@ -73,7 +73,7 @@ args=$(or_die getopt -a -o h --long build-exe-only,cmake-build-type:,code-covera # Variables with default values BUILD_EXE_ONLY=false GEOSX_INSTALL_SCHEMA=true -BUILD_PYGEOSX=true +BUILD_PYGEOSX=false HOST_CONFIG="host-configs/environment.cmake" RUN_UNIT_TESTS=true RUN_INTEGRATED_TESTS=false @@ -209,7 +209,6 @@ if [[ "${BUILD_PYGEOSX}" = true ]]; then or_die apt-get update or_die apt-get install -y virtualenv python3-dev python3-numpy python3-mpi4py python3-venv PYTHON_EXEC=$(which python3) - echo "Using python as $PYTHON_EXEC" PYGEOSX_ARGS="-DENABLE_PYGEOSX=ON -DPython3_EXECUTABLE=$PYTHON_EXEC" fi From f394efb4b177a1edebe65dbd4b7cd9e98e22b545 Mon Sep 17 00:00:00 2001 From: Christopher Sherman Date: Mon, 8 Jul 2024 11:20:56 -0700 Subject: [PATCH 10/11] Attempting to fix pygeosx ci config --- .github/workflows/build_and_test.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 46da0e27238..2c8d3673886 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -40,8 +40,7 @@ on: type: string ENABLE_PYGEOSX: required: false - type: boolean - default: false + type: string ENABLE_TRILINOS: required: false type: string @@ -204,7 +203,7 @@ jobs: fi docker_args+=(--name ${CONTAINER_NAME}) - if ${{ inputs.ENABLE_PYGEOSX }} == 'true'; then + if [ ${{ inputs.ENABLE_PYGEOSX }} == "ON" ]; then script_args+=(--build-pygeosx) fi From 3585576874cf4e1859ae1ccf0e4f3174bd5719d9 Mon Sep 17 00:00:00 2001 From: Christopher Sherman Date: Mon, 8 Jul 2024 11:38:41 -0700 Subject: [PATCH 11/11] Attempting to fix pygeosx ci config --- scripts/ci_build_and_test_in_container.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/ci_build_and_test_in_container.sh b/scripts/ci_build_and_test_in_container.sh index 1ae05ada2b7..0d34e9f0817 100755 --- a/scripts/ci_build_and_test_in_container.sh +++ b/scripts/ci_build_and_test_in_container.sh @@ -68,7 +68,7 @@ exit 1 or_die cd $(dirname $0)/.. # Parsing using getopt -args=$(or_die getopt -a -o h --long build-exe-only,cmake-build-type:,code-coverage,data-basename:,exchange-dir:,host-config:,install-dir-basename:,no-install-schema,no-run-unit-tests,nproc:,repository:,run-integrated-tests,sccache-credentials:,test-code-style,test-documentation,help -- "$@") +args=$(or_die getopt -a -o h --long build-exe-only,cmake-build-type:,code-coverage,data-basename:,exchange-dir:,host-config:,install-dir-basename:,no-install-schema,no-run-unit-tests,nproc:,repository:,build-pygeosx,run-integrated-tests,sccache-credentials:,test-code-style,test-documentation,help -- "$@") # Variables with default values BUILD_EXE_ONLY=false @@ -109,7 +109,7 @@ do --no-run-unit-tests) RUN_UNIT_TESTS=false; shift;; --nproc) NPROC=$2; shift 2;; --repository) GEOS_SRC_DIR=$2; shift 2;; - --build_pygeosx) BUILD_PYGEOSX=true; shift;; + --build-pygeosx) BUILD_PYGEOSX=true; shift;; --run-integrated-tests) RUN_INTEGRATED_TESTS=true; shift;; --upload-test-baselines) UPLOAD_TEST_BASELINES=true; shift;; --code-coverage) CODE_COVERAGE=true; shift;; @@ -342,4 +342,4 @@ if [[ ! -z "${INTEGRATED_TEST_EXIT_STATUS+x}" ]]; then else echo "Exiting the build process with exit status 0." exit 0 -fi \ No newline at end of file +fi