diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 63b2924cfc8..b621160acb3 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -150,89 +150,24 @@ jobs: fail-fast : false matrix: include: - - name: Ubuntu (20.04, gcc 9.4.0, open-mpi 4.0.3) - CMAKE_BUILD_TYPE: Release - DOCKER_REPOSITORY: geosx/ubuntu20.04-gcc9 - BUILD_SHARED_LIBS: ON - ENABLE_HYPRE: OFF - ENABLE_TRILINOS: ON - GEOS_ENABLE_BOUNDS_CHECK: ON - HOST_CONFIG: /spack-generated.cmake - - - name: Ubuntu debug (20.04, gcc 10.5.0, open-mpi 4.0.3) - github codespaces - BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests" - CMAKE_BUILD_TYPE: Debug - DOCKER_REPOSITORY: geosx/ubuntu20.04-gcc10 - BUILD_SHARED_LIBS: ON - ENABLE_HYPRE: OFF - ENABLE_TRILINOS: ON - GEOS_ENABLE_BOUNDS_CHECK: ON - RUNS_ON: streak2 - NPROC: 8 - DOCKER_RUN_ARGS: "--cpus=8 --memory=256g --runtime=nvidia -v /etc/pki/ca-trust/source/anchors/:/usr/local/share/ca-certificates/llnl:ro" - DOCKER_CERTS_DIR: "/usr/local/share/ca-certificates" - DOCKER_CERTS_UPDATE_COMMAND: "update-ca-certificates" - - HOST_CONFIG: /spack-generated.cmake - - - name: Ubuntu (20.04, gcc 10.5.0, open-mpi 4.0.3) - github codespaces - CMAKE_BUILD_TYPE: Release - DOCKER_REPOSITORY: geosx/ubuntu20.04-gcc10 - BUILD_SHARED_LIBS: ON - ENABLE_HYPRE: OFF - ENABLE_TRILINOS: ON - GEOS_ENABLE_BOUNDS_CHECK: ON - HOST_CONFIG: /spack-generated.cmake - - - name: Ubuntu (22.04, gcc 11.4.0, open-mpi 4.1.2) - CMAKE_BUILD_TYPE: Release - DOCKER_REPOSITORY: geosx/ubuntu22.04-gcc11 - ENABLE_HYPRE: ON - ENABLE_TRILINOS: OFF - BUILD_SHARED_LIBS: ON - GEOS_ENABLE_BOUNDS_CHECK: OFF - GCP_BUCKET: geosx/ubuntu22.04-gcc11 - HOST_CONFIG: /spack-generated.cmake - - - name: Ubuntu (22.04, gcc 12.3.0, open-mpi 4.1.2) - CMAKE_BUILD_TYPE: Release - DOCKER_REPOSITORY: geosx/ubuntu22.04-gcc12 - GCP_BUCKET: geosx/ubuntu22.04-gcc12 - ENABLE_HYPRE: ON - ENABLE_TRILINOS: OFF - BUILD_SHARED_LIBS: ON - GEOS_ENABLE_BOUNDS_CHECK: ON - HOST_CONFIG: /spack-generated.cmake - - - name: Ubuntu (22.04, gcc 12.3.0, open-mpi 4.1.2) - NO BOUNDS CHECK - CMAKE_BUILD_TYPE: Release - DOCKER_REPOSITORY: geosx/ubuntu22.04-gcc12 - GCP_BUCKET: geosx/ubuntu22.04-gcc12 - ENABLE_HYPRE: ON - ENABLE_TRILINOS: OFF - BUILD_SHARED_LIBS: ON - GEOS_ENABLE_BOUNDS_CHECK: OFF - HOST_CONFIG: /spack-generated.cmake - - #- name: Ubuntu (22.04, clang 15.0.7, open-mpi 4.1.2) - # CMAKE_BUILD_TYPE: Release - # DOCKER_REPOSITORY: geosx/ubuntu22.04-clang15 - # ENABLE_HYPRE: ON - # ENABLE_TRILINOS: OFF - # GEOS_ENABLE_BOUNDS_CHECK: ON - # BUILD_SHARED_LIBS: ON - # HOST_CONFIG: /spack-generated.cmake - - #- name: Sherlock CPU (centos 7.9.2009, gcc 10.1.0, open-mpi 4.1.2, openblas 0.3.10) - # CMAKE_BUILD_TYPE: Release - # DOCKER_REPOSITORY: geosx/sherlock-gcc10.1.0-openmpi4.1.2-openblas0.3.10-zlib1.2.11 - # ENABLE_HYPRE: ON - # ENABLE_TRILINOS: OFF - # GEOS_ENABLE_BOUNDS_CHECK: OFF - # GCP_BUCKET: geosx/Sherlock-CPU - # HOST_CONFIG: /spack-generated.cmake -# # HOST_CONFIG: host-configs/Stanford/sherlock-gcc10.cmake - # BUILD_SHARED_LIBS: ON + - name: Ubuntu (20.04, gcc 9.4.0, open-mpi 4.0.3) + CMAKE_BUILD_TYPE: Release + DOCKER_REPOSITORY: geosx/ubuntu20.04-gcc9 + BUILD_SHARED_LIBS: ON + ENABLE_HYPRE: OFF + ENABLE_TRILINOS: ON + GEOS_ENABLE_BOUNDS_CHECK: ON + HOST_CONFIG: /spack-generated.cmake + + - name: Ubuntu (22.04, clang 15.0.7, open-mpi 4.1.2) + CMAKE_BUILD_TYPE: Release + DOCKER_REPOSITORY: geosx/ubuntu22.04-clang15 + ENABLE_HYPRE: ON + ENABLE_TRILINOS: OFF + GEOS_ENABLE_BOUNDS_CHECK: ON + BUILD_SHARED_LIBS: ON + HOST_CONFIG: /spack-generated.cmake + RUNS_ON: Runner_4core_16GB uses: ./.github/workflows/build_and_test.yml with: @@ -334,21 +269,21 @@ jobs: fail-fast : false matrix: include: - - name: Ubuntu CUDA debug (20.04, clang 10.0.0 + gcc 9.4.0, open-mpi 4.0.3, cuda-11.8.89) - BUILD_AND_TEST_CLI_ARGS: "--build-exe-only --no-install-schema" - CMAKE_BUILD_TYPE: Debug - BUILD_GENERATOR: "--ninja" - DOCKER_REPOSITORY: geosx/ubuntu20.04-clang10.0.0-cuda11.8.89 - ENABLE_HYPRE_DEVICE: CUDA - ENABLE_HYPRE: ON - ENABLE_TRILINOS: OFF - GEOS_ENABLE_BOUNDS_CHECK: OFF - RUNS_ON: streak2 - NPROC: 8 - DOCKER_RUN_ARGS: "--cpus=8 --memory=128g --runtime=nvidia -v /etc/pki/ca-trust/source/anchors/:/usr/local/share/ca-certificates/llnl:ro" - DOCKER_CERTS_DIR: "/usr/local/share/ca-certificates" - DOCKER_CERTS_UPDATE_COMMAND: "update-ca-certificates" - HOST_CONFIG: /spack-generated.cmake + # - name: Ubuntu CUDA debug (20.04, clang 10.0.0 + gcc 9.4.0, open-mpi 4.0.3, cuda-11.8.89) + # BUILD_AND_TEST_CLI_ARGS: "--build-exe-only --no-install-schema" + # CMAKE_BUILD_TYPE: Debug + # BUILD_GENERATOR: "--ninja" + # DOCKER_REPOSITORY: geosx/ubuntu20.04-clang10.0.0-cuda11.8.89 + # ENABLE_HYPRE_DEVICE: CUDA + # ENABLE_HYPRE: ON + # ENABLE_TRILINOS: OFF + # GEOS_ENABLE_BOUNDS_CHECK: OFF + # RUNS_ON: streak2 + # NPROC: 8 + # DOCKER_RUN_ARGS: "--cpus=8 --memory=128g --runtime=nvidia -v /etc/pki/ca-trust/source/anchors/:/usr/local/share/ca-certificates/llnl:ro" + # DOCKER_CERTS_DIR: "/usr/local/share/ca-certificates" + # DOCKER_CERTS_UPDATE_COMMAND: "update-ca-certificates" + # HOST_CONFIG: /spack-generated.cmake - name: Ubuntu CUDA (20.04, clang 10.0.0 + gcc 9.4.0, open-mpi 4.0.3, cuda-11.8.89) BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests --no-install-schema" @@ -366,54 +301,54 @@ jobs: DOCKER_CERTS_UPDATE_COMMAND: "update-ca-certificates" HOST_CONFIG: /spack-generated.cmake - - name: Rockylinux CUDA (8, clang 17.0.6, cuda 12.9.1) - BUILD_AND_TEST_CLI_ARGS: "--no-install-schema" - CMAKE_BUILD_TYPE: Release - BUILD_GENERATOR: "--ninja" - ENABLE_HYPRE_DEVICE: CUDA - ENABLE_HYPRE: ON - ENABLE_TRILINOS: OFF - GEOS_ENABLE_BOUNDS_CHECK: OFF - DOCKER_REPOSITORY: geosx/rockylinux8-clang17-cuda12.9.1 - RUNS_ON: streak - NPROC: 8 - DOCKER_RUN_ARGS: "--cpus=8 --memory=256g --runtime=nvidia --gpus all -v /etc/pki/ca-trust/source/anchors/:/usr/local/share/ca-certificates/llnl:ro" - DOCKER_CERTS_DIR: "/usr/local/share/ca-certificates" - DOCKER_CERTS_UPDATE_COMMAND: "update-ca-trust" - HOST_CONFIG: /spack-generated.cmake + # - name: Rockylinux CUDA (8, clang 17.0.6, cuda 12.9.1) + # BUILD_AND_TEST_CLI_ARGS: "--no-install-schema" + # CMAKE_BUILD_TYPE: Release + # BUILD_GENERATOR: "--ninja" + # ENABLE_HYPRE_DEVICE: CUDA + # ENABLE_HYPRE: ON + # ENABLE_TRILINOS: OFF + # GEOS_ENABLE_BOUNDS_CHECK: OFF + # DOCKER_REPOSITORY: geosx/rockylinux8-clang17-cuda12.9.1 + # RUNS_ON: streak + # NPROC: 8 + # DOCKER_RUN_ARGS: "--cpus=8 --memory=256g --runtime=nvidia --gpus all -v /etc/pki/ca-trust/source/anchors/:/usr/local/share/ca-certificates/llnl:ro" + # DOCKER_CERTS_DIR: "/usr/local/share/ca-certificates" + # DOCKER_CERTS_UPDATE_COMMAND: "update-ca-trust" + # HOST_CONFIG: /spack-generated.cmake - - name: Rockylinux CUDA (8, gcc 13.3, cuda 12.9.1) - BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests --no-install-schema" - CMAKE_BUILD_TYPE: Release - BUILD_GENERATOR: "--ninja" - ENABLE_HYPRE_DEVICE: CUDA - ENABLE_HYPRE: ON - ENABLE_TRILINOS: OFF - GEOS_ENABLE_BOUNDS_CHECK: OFF - DOCKER_REPOSITORY: geosx/rockylinux8-gcc13-cuda12.9.1 - RUNS_ON: streak2 - NPROC: 8 - DOCKER_RUN_ARGS: "--cpus=8 --memory=128g --runtime=nvidia -v /etc/pki/ca-trust/source/anchors/:/etc/pki/ca-trust/source/anchors/llnl:ro" - DOCKER_CERTS_DIR: "/etc/pki/ca-trust/source/anchors" - DOCKER_CERTS_UPDATE_COMMAND: "update-ca-trust" - HOST_CONFIG: /spack-generated.cmake - - - name: Pangea 3 CUDA (AlmaLinux 8.8, gcc 9.4.0, open-mpi 4.1.2, cuda 11.5.0, openblas 0.3.10) - BUILD_AND_TEST_CLI_ARGS: "--build-exe-only --no-install-schema" - CMAKE_BUILD_TYPE: Release - BUILD_GENERATOR: "--makefile" - DOCKER_REPOSITORY: geosx/pangea3-almalinux8-gcc9.4-openmpi4.1.2-cuda11.5.0-openblas0.3.18 - ENABLE_HYPRE_DEVICE: CUDA - ENABLE_HYPRE: ON - ENABLE_TRILINOS: OFF - GEOS_ENABLE_BOUNDS_CHECK: OFF - HOST_ARCH: ppc64le - RUNS_ON: streak2 - NPROC: 8 - DOCKER_RUN_ARGS: "--cpus=8 --memory=128g -v /etc/pki/ca-trust/source/anchors/:/etc/pki/ca-trust/source/anchors/llnl:ro" - DOCKER_CERTS_DIR: "/etc/pki/ca-trust/source/anchors" - DOCKER_CERTS_UPDATE_COMMAND: "update-ca-trust" - HOST_CONFIG: /spack-generated-wave-solver-only.cmake + # - name: Rockylinux CUDA (8, gcc 13.3, cuda 12.9.1) + # BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests --no-install-schema" + # CMAKE_BUILD_TYPE: Release + # BUILD_GENERATOR: "--ninja" + # ENABLE_HYPRE_DEVICE: CUDA + # ENABLE_HYPRE: ON + # ENABLE_TRILINOS: OFF + # GEOS_ENABLE_BOUNDS_CHECK: OFF + # DOCKER_REPOSITORY: geosx/rockylinux8-gcc13-cuda12.9.1 + # RUNS_ON: streak2 + # NPROC: 8 + # DOCKER_RUN_ARGS: "--cpus=8 --memory=128g --runtime=nvidia -v /etc/pki/ca-trust/source/anchors/:/etc/pki/ca-trust/source/anchors/llnl:ro" + # DOCKER_CERTS_DIR: "/etc/pki/ca-trust/source/anchors" + # DOCKER_CERTS_UPDATE_COMMAND: "update-ca-trust" + # HOST_CONFIG: /spack-generated.cmake + + # - name: Pangea 3 CUDA (AlmaLinux 8.8, gcc 9.4.0, open-mpi 4.1.2, cuda 11.5.0, openblas 0.3.10) + # BUILD_AND_TEST_CLI_ARGS: "--build-exe-only --no-install-schema" + # CMAKE_BUILD_TYPE: Release + # BUILD_GENERATOR: "--makefile" + # DOCKER_REPOSITORY: geosx/pangea3-almalinux8-gcc9.4-openmpi4.1.2-cuda11.5.0-openblas0.3.18 + # ENABLE_HYPRE_DEVICE: CUDA + # ENABLE_HYPRE: ON + # ENABLE_TRILINOS: OFF + # GEOS_ENABLE_BOUNDS_CHECK: OFF + # HOST_ARCH: ppc64le + # RUNS_ON: streak2 + # NPROC: 8 + # DOCKER_RUN_ARGS: "--cpus=8 --memory=128g -v /etc/pki/ca-trust/source/anchors/:/etc/pki/ca-trust/source/anchors/llnl:ro" + # DOCKER_CERTS_DIR: "/etc/pki/ca-trust/source/anchors" + # DOCKER_CERTS_UPDATE_COMMAND: "update-ca-trust" + # HOST_CONFIG: /spack-generated-wave-solver-only.cmake #- name: Sherlock GPU (centos 7.9.2009, gcc 10.1.0, open-mpi 4.1.2, openblas 0.3.10, cuda 12.4.0,) # BUILD_AND_TEST_CLI_ARGS: "--no-run-unit-tests --no-install-schema" @@ -464,22 +399,12 @@ jobs: - are_submodules_in_sync - check_code_style_and_documentation - cpu_builds - - cuda_builds - - run_integrated_tests + # - cuda_builds + # - run_integrated_tests if: ${{ always() }} steps: - run: | echo "if_not_unassigned_pull_request: ${{needs.if_not_unassigned_pull_request.result}}" echo "are_submodules_in_sync: ${{needs.are_submodules_in_sync.result}}" echo "check_code_style_and_documentation: ${{needs.check_code_style_and_documentation.result}}" - echo "cpu_builds: ${{needs.cpu_builds.result}}" - echo "cuda_builds: ${{needs.cuda_builds.result}}" - echo "run_integrated_tests: ${{needs.run_integrated_tests.result}} " - ${{ - needs.if_not_unassigned_pull_request.result == 'success' && - needs.are_submodules_in_sync.result == 'success' && - needs.check_code_style_and_documentation.result == 'success' && - needs.cpu_builds.result == 'success' && - needs.cuda_builds.result == 'success' && - needs.run_integrated_tests.result == 'success' - }} + echo "cpu_builds: ${{needs.cpu_builds.result}}" \ No newline at end of file diff --git a/src/coreComponents/common/Units.hpp b/src/coreComponents/common/Units.hpp index 4d69236b43f..32adb6e6dc8 100644 --- a/src/coreComponents/common/Units.hpp +++ b/src/coreComponents/common/Units.hpp @@ -275,17 +275,17 @@ static constexpr double YearSeconds = YearDays * DaySeconds; struct TimeFormatInfo { /// Total time (including the decimal part) this instance represents in seconds - double const m_totalSeconds = 0.0; + double const m_totalSeconds; /// Number of integral years to show - int const m_years = 0; + int const m_years; /// Number of integral days to show - int const m_days = 0; + int const m_days; /// Number of integral hours to show - int const m_hours = 0; + int const m_hours; /// Number of integral minutes to show - int const m_minutes = 0; + int const m_minutes; /// Number of integral seconds to show - int const m_seconds = 0; + int const m_seconds; /** * @brief Construct a TimeFormatInfo from raw data (which must be coherent) diff --git a/src/coreComponents/common/unitTests/testUnits.cpp b/src/coreComponents/common/unitTests/testUnits.cpp index 9dc1685632d..c89413099cc 100644 --- a/src/coreComponents/common/unitTests/testUnits.cpp +++ b/src/coreComponents/common/unitTests/testUnits.cpp @@ -155,3 +155,10 @@ TEST( Units, SystemDurationFormatTest ) } } } + +int main( int ac, char * av[] ) +{ + ::testing::InitGoogleTest( &ac, av ); + int const result = RUN_ALL_TESTS(); + return result; +} diff --git a/src/coreComponents/events/EventManager.hpp b/src/coreComponents/events/EventManager.hpp index 0e5024fb07c..09a2b73a45c 100644 --- a/src/coreComponents/events/EventManager.hpp +++ b/src/coreComponents/events/EventManager.hpp @@ -159,7 +159,7 @@ class EventManager : public dataRepository::Group integer m_maxCycle; /// Simulation timestamp at the beginning of the cycle - real64 m_time; + real64 m_time = 0.0; /// Current timestep request real64 m_dt;