Merge pull request #3631 from scottwittenburg/ci-rework-gcc-builds

Ci rework gcc builds

.github/workflows/everything.yml

@@ -91,13 +91,13 @@ jobs:
 # Build and test jobs
 #######################################
 
-  linux:
+  linux_ubuntu:
     needs: [format, git_checks]
     if: needs.git_checks.outputs.num_code_changes > 0
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     container:
-      image: ornladios/adios2:ci-spack-el8-${{ matrix.compiler }}-${{ matrix.parallel }}
+      image: ghcr.io/ornladios/adios2:ci-spack-ubuntu20.04-${{ matrix.compiler }}
       options: --shm-size=1g
       env:
         GH_YML_JOBNAME: ${{ matrix.os }}-${{ matrix.gpu_backend }}${{ matrix.compiler }}-${{ matrix.parallel }}
@@ -109,22 +109,60 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [el8]
-        compiler: [gcc8, gcc9, gcc10, gcc11, icc, oneapi, nvhpc222]
-        parallel: [serial, mpi]
+        os: [ubuntu20.04]
+        compiler: [gcc8, gcc9, gcc10, gcc11, clang6, clang10]
+        parallel: [ompi]
         include:
-          - os: el8
-            compiler: cuda
-            parallel: serial
-            constrains: build_only
-          - os: el8
-            compiler: cuda
-            parallel: serial
-            gpu_backend: kokkos
-            constrains: build_only
-          - os: el8
+          - os: ubuntu20.04
             compiler: gcc10
             parallel: mpich
+          - os: ubuntu20.04
+            compiler: gcc8
+            parallel: serial
+          - os: ubuntu20.04
+            compiler: clang6
+            parallel: serial
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          path: gha
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          path: source
+      - name: Setup
+        run: gha/scripts/ci/gh-actions/linux-setup.sh
+      - name: Update
+        run: gha/scripts/ci/gh-actions/run.sh update
+      - name: Configure
+        run: gha/scripts/ci/gh-actions/run.sh configure
+      - name: Build
+        run: gha/scripts/ci/gh-actions/run.sh build
+      - name: Test
+        run: gha/scripts/ci/gh-actions/run.sh test
+
+  linux_el8:
+    needs: [format, git_checks]
+    if: needs.git_checks.outputs.num_code_changes > 0
+
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/ornladios/adios2:ci-el8-${{ matrix.compiler }}
+      options: --shm-size=1g
+      env:
+        GH_YML_JOBNAME: ${{ matrix.os }}-${{ matrix.gpu_backend }}${{ matrix.compiler }}-${{ matrix.parallel }}
+        GH_YML_BASE_OS: Linux
+        GH_YML_MATRIX_OS: ${{ matrix.os }}
+        GH_YML_MATRIX_COMPILER: ${{ matrix.compiler }}
+        GH_YML_MATRIX_PARALLEL: ${{ matrix.parallel }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [el8]
+        compiler: [icc, oneapi]
+        parallel: [ompi]
 
     steps:
       - uses: actions/checkout@v3
@@ -143,7 +181,6 @@ jobs:
       - name: Build
         run: gha/scripts/ci/gh-actions/run.sh build
       - name: Test
-        if: ${{ matrix.constrains != 'build_only' }}
         run: gha/scripts/ci/gh-actions/run.sh test
 
   macos:
@@ -207,7 +244,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [win2019, win2022]
-        parallel: [serial, mpi]
+        parallel: [serial, ompi]
         include:
           - os: win2019
             image: windows-2019
@@ -370,7 +407,7 @@ jobs:
 #######################################
 
   build_and_test:
-    needs: [linux, macos, docker, contract]
+    needs: [linux_el8, linux_ubuntu, macos, docker, contract]
     runs-on: ubuntu-latest
     steps:
       - run: echo "All required jobs complete"

.shellcheck_exclude_paths

@@ -8,32 +8,15 @@ scripts/ci/gh-actions/get-changed-files.sh
 scripts/ci/gh-actions/linux-setup.sh
 scripts/ci/gh-actions/macos-setup.sh
 scripts/ci/gh-actions/run.sh
-scripts/ci/images-v2/build-base.sh
-scripts/ci/images-v2/build-clang-base.sh
-scripts/ci/images-v2/build-clang.sh
-scripts/ci/images-v2/build-cuda.sh
-scripts/ci/images-v2/build-functions.sh
-scripts/ci/images-v2/build-gcc-base.sh
-scripts/ci/images-v2/build-gcc.sh
-scripts/ci/images-v2/build-intel-base.sh
-scripts/ci/images-v2/build-intel.sh
-scripts/ci/images-v2/build-mpich.sh
-scripts/ci/images-v2/build-nvhpc.sh
-scripts/ci/images-v2/build.sh
+scripts/ci/images-v2/build-el8.sh
+scripts/ci/images-v2/build-ubuntu.sh
 scripts/ci/images/build-native-images.sh
 scripts/ci/images/emu-el7/entrypoint.sh
 scripts/ci/images/emu-el7/qemu-binfmt-conf.sh
 scripts/ci/images/emu-el7/register.sh
 scripts/ci/scripts/github-prs-to-gitlab.sh
 scripts/ci/scripts/run-clang-format.sh
 scripts/ci/scripts/run-flake8.sh
-scripts/ci/setup-run/ci-el8-gcc10.sh
-scripts/ci/setup-run/ci-el8-gcc11.sh
-scripts/ci/setup-run/ci-el8-gcc9.sh
-scripts/ci/setup-run/ci-el8-icc.sh
-scripts/ci/setup-run/ci-el8-nvhpc222-mpi.sh
-scripts/ci/setup-run/ci-el8-nvhpc222.sh
-scripts/ci/setup-run/ci-el8-oneapi.sh
 scripts/dashboard/nightly/aaargh.sh
 scripts/dashboard/nightly/cori.sh
 scripts/dashboard/nightly/summitdev.sh

scripts/ci/cmake-v2/ci-el8-icc-mpi.cmake → scripts/ci/cmake-v2/ci-el8-icc-ompi.cmake

@@ -1,5 +1,3 @@
-# Client maintainer: chuck.atkins@kitware.com
-
 include(ProcessorCount)
 ProcessorCount(NCPUS)
 math(EXPR N2CPUS "${NCPUS}*2")
@@ -12,23 +10,24 @@ set(dashboard_cache "
 ADIOS2_USE_BZip2:BOOL=ON
 ADIOS2_USE_Blosc:BOOL=ON
 ADIOS2_USE_DataMan:BOOL=ON
-ADIOS2_USE_Fortran:BOOL=ON
+ADIOS2_USE_DataSpaces:BOOL=OFF
+ADIOS2_USE_Fortran:BOOL=OFF
 ADIOS2_USE_HDF5:BOOL=ON
 ADIOS2_USE_MPI:BOOL=ON
 ADIOS2_USE_Python:BOOL=ON
 ADIOS2_USE_SZ:BOOL=ON
 ADIOS2_USE_ZeroMQ:STRING=ON
 ADIOS2_USE_ZFP:BOOL=ON
 
-CMAKE_C_FLAGS:STRING=-Wall
-CMAKE_CXX_FLAGS:STRING=-Wall
-CMAKE_Fortran_FLAGS:STRING=-warn all -stand none
+CMAKE_C_FLAGS:STRING=-Wall -diag-disable=10441
+CMAKE_C_FLAGS_DEBUG:STRING=-g -O0
+CMAKE_CXX_FLAGS:STRING=-Wall -diag-disable=10441
+CMAKE_CXX_FLAGS_DEBUG:STRING=-g -O0
 
 MPIEXEC_EXTRA_FLAGS:STRING=--allow-run-as-root --oversubscribe
 MPIEXEC_MAX_NUMPROCS:STRING=${N2CPUS}
 ")
 
-set(CTEST_TEST_ARGS PARALLEL_LEVEL 1)
 set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
 list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")
 include(${CMAKE_CURRENT_LIST_DIR}/ci-common.cmake)

scripts/ci/cmake-v2/ci-el8-icc-serial.cmake

@@ -1,27 +1,26 @@
-# Client maintainer: chuck.atkins@kitware.com
-
 set(ENV{CC}  icc)
 set(ENV{CXX} icpc)
 set(ENV{FC}  ifort)
 
 set(dashboard_cache "
 ADIOS2_USE_BZip2:BOOL=ON
-ADIOS2_USE_Blosc:BOOL=ON
+ADIOS2_USE_Blosc:BOOL=OFF
 ADIOS2_USE_DataMan:BOOL=ON
-ADIOS2_USE_Fortran:BOOL=ON
+ADIOS2_USE_DataSpaces:BOOL=OFF
+ADIOS2_USE_Fortran:BOOL=OFF
 ADIOS2_USE_HDF5:BOOL=ON
 ADIOS2_USE_MPI:BOOL=OFF
 ADIOS2_USE_Python:BOOL=ON
 ADIOS2_USE_SZ:BOOL=ON
 ADIOS2_USE_ZeroMQ:STRING=ON
 ADIOS2_USE_ZFP:BOOL=ON
 
-CMAKE_C_FLAGS:STRING=-Wall
-CMAKE_CXX_FLAGS:STRING=-Wall
-CMAKE_Fortran_FLAGS:STRING=-warn all -stand none
+CMAKE_C_FLAGS:STRING=-Wall -diag-disable=10441
+CMAKE_C_FLAGS_DEBUG:STRING=-g -O0
+CMAKE_CXX_FLAGS:STRING=-Wall -diag-disable=10441
+CMAKE_CXX_FLAGS_DEBUG:STRING=-g -O0
 ")
 
-set(CTEST_TEST_ARGS PARALLEL_LEVEL 1)
 set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
 list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")
 include(${CMAKE_CURRENT_LIST_DIR}/ci-common.cmake)

scripts/ci/cmake-v2/ci-el8-oneapi-mpi.cmake → scripts/ci/cmake-v2/ci-el8-oneapi-ompi.cmake

@@ -1,5 +1,3 @@
-# Client maintainer: chuck.atkins@kitware.com
-
 include(ProcessorCount)
 ProcessorCount(NCPUS)
 math(EXPR N2CPUS "${NCPUS}*2")
@@ -10,9 +8,10 @@ set(ENV{FC}  ifort) # oneapi fortran compiler currently has issues
 
 set(dashboard_cache "
 ADIOS2_USE_BZip2:BOOL=ON
-ADIOS2_USE_Blosc:BOOL=ON
+ADIOS2_USE_Blosc:BOOL=OFF
 ADIOS2_USE_DataMan:BOOL=ON
-ADIOS2_USE_Fortran:BOOL=ON
+ADIOS2_USE_DataSpaces:BOOL=OFF
+ADIOS2_USE_Fortran:BOOL=OFF
 ADIOS2_USE_HDF5:BOOL=ON
 ADIOS2_USE_MPI:BOOL=ON
 ADIOS2_USE_Python:BOOL=ON
@@ -21,14 +20,15 @@ ADIOS2_USE_ZeroMQ:STRING=ON
 ADIOS2_USE_ZFP:BOOL=ON
 
 CMAKE_C_FLAGS:STRING=-Wall
+CMAKE_C_FLAGS_DEBUG:STRING=-g -O0
 CMAKE_CXX_FLAGS:STRING=-Wall
-CMAKE_Fortran_FLAGS:STRING=-warn all
+CMAKE_CXX_FLAGS_DEBUG:STRING=-g -O0
+CMAKE_Fortran_FLAGS:STRING=-W1
 
 MPIEXEC_EXTRA_FLAGS:STRING=--allow-run-as-root --oversubscribe
 MPIEXEC_MAX_NUMPROCS:STRING=${N2CPUS}
 ")
 
-set(CTEST_TEST_ARGS PARALLEL_LEVEL 1)
 set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
 list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")
 include(${CMAKE_CURRENT_LIST_DIR}/ci-common.cmake)