Skip to content

Commit 00b0cc7

Browse files
vicenteboleavicentebolea
committed
ci: add build matrix table to scripts/ci/README.md
| OS | Compiler | MPI | Shared | |----|----------|-----|--------| | Ubuntu 22.04 | GCC 10 | MPICH | shared | | Ubuntu 22.04 | GCC 12 | MPICH | shared | | Ubuntu 22.04 | GCC 12 | OpenMPI | shared | | Ubuntu 22.04 | GCC 12 | serial | shared | | Ubuntu 22.04 | GCC 12 | serial | static | | Ubuntu 22.04 | GCC 14 | MPICH | shared | | Ubuntu 22.04 | Clang 11 | OpenMPI | shared | | Ubuntu 22.04 | Clang 14 | MPICH | shared | | Ubuntu 22.04 | Clang 14 | serial | shared | | Ubuntu 22.04 | ROCm | serial | shared | | AlmaLinux 8 | Intel oneAPI 2023.2.1 | MPICH | shared | | manylinux2014 | GCC 11 | MPICH | shared | | manylinux2014 | GCC 11 | serial | shared | | macOS 15 | Xcode 16.4 | serial | shared | | macOS 15 | Xcode 16.4 | serial | static | | macOS 14 | Xcode 15.4 | serial | shared | | Windows 2022 | VS 2022 | MSMPI | shared | | Windows 2025 | VS 2022 | MSMPI | shared | | Windows 2025 | VS 2022 | serial | shared | | Windows 2025 | VS 2022 | serial | static |
1 parent d81bfea commit 00b0cc7

23 files changed

Lines changed: 254 additions & 493 deletions

‎.github/workflows/everything.yml‎

Lines changed: 89 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ jobs:
118118
contents: read
119119
actions: write # for cache save
120120
container:
121-
image: ghcr.io/ornladios/adios2:ci-spack-${{ matrix.os }}-${{ matrix.compiler }}
121+
image: ghcr.io/ornladios/adios2/ci-spack-${{ matrix.os }}-${{ matrix.compiler }}:20260313
122122
options: --shm-size=1g
123123
env:
124124
GH_YML_JOBNAME: ${{ matrix.os }}-${{ matrix.compiler }}${{ matrix.shared == 'static' && '-static' || ''}}-${{ matrix.parallel }}
@@ -135,42 +135,29 @@ jobs:
135135
fail-fast: false
136136
matrix:
137137
os: [ubuntu22.04]
138-
compiler: [gcc9, gcc10, gcc12, clang11, clang14]
138+
compiler: [gcc10, gcc12, gcc14, clang14]
139139
parallel: [mpich]
140140
include:
141141
- os: ubuntu22.04
142-
compiler: gcc9
142+
compiler: gcc12
143143
parallel: ompi
144144
- os: ubuntu22.04
145-
compiler: gcc9
145+
compiler: gcc12
146146
parallel: serial
147147
- os: ubuntu22.04
148-
compiler: clang11
149-
parallel: ompi
150-
- os: ubuntu22.04
151-
compiler: clang11
152-
parallel: serial
153-
- os: ubuntu22.04
154-
compiler: gcc9
148+
compiler: gcc12
155149
parallel: serial
156150
shared: static
157-
- os: ubuntu22.04
158-
compiler: gcc9
159-
shared: static
160-
parallel: mpich
161-
constrains: build_only
162151
- os: ubuntu22.04
163152
compiler: clang11
164-
shared: static
165-
parallel: mpich
166-
constrains: build_only
153+
parallel: ompi
154+
- os: ubuntu22.04
155+
compiler: clang14
156+
parallel: serial
167157
- os: ubuntu22.04
168158
compiler: rocm
169159
parallel: serial
170160
constrains: build_only
171-
- os: ubuntu22.04
172-
compiler: gcc11
173-
parallel: mpich
174161

175162
steps:
176163
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v4
@@ -220,7 +207,7 @@ jobs:
220207
contents: read
221208
actions: write # for cache save
222209
container:
223-
image: ghcr.io/ornladios/adios2:ci-el8-${{ matrix.compiler }}
210+
image: ghcr.io/ornladios/adios2/ci-el8-${{ matrix.compiler }}:20260313
224211
options: --shm-size=1g
225212
env:
226213
GH_YML_JOBNAME: ${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.parallel }}
@@ -237,7 +224,7 @@ jobs:
237224
fail-fast: false
238225
matrix:
239226
os: [el8]
240-
compiler: [icc, oneapi]
227+
compiler: [oneapi]
241228
parallel: [mpich]
242229

243230
steps:
@@ -278,6 +265,80 @@ jobs:
278265
- name: Test
279266
run: gha/scripts/ci/gh-actions/run.sh test
280267

268+
manylinux2014:
269+
needs: [format, git_checks]
270+
if: needs.git_checks.outputs.num_code_changes > 0
271+
272+
runs-on: ubuntu-latest
273+
permissions:
274+
contents: read
275+
actions: write # for cache save
276+
container:
277+
image: ghcr.io/ornladios/adios2/ci-manylinux2014-${{ matrix.compiler }}:20260313
278+
options: --shm-size=1g
279+
env:
280+
GH_YML_JOBNAME: ${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.parallel }}
281+
GH_YML_BASE_OS: Linux
282+
GH_YML_MATRIX_OS: ${{ matrix.os }}
283+
GH_YML_MATRIX_COMPILER: ${{ matrix.compiler }}
284+
GH_YML_MATRIX_PARALLEL: ${{ matrix.parallel }}
285+
CCACHE_BASEDIR: "${GITHUB_WORKSPACE}"
286+
CCACHE_DIR: "${GITHUB_WORKSPACE}/.ccache"
287+
CCACHE_COMPRESS: true
288+
CCACHE_COMPRESSLEVEL: 6
289+
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
290+
291+
strategy:
292+
fail-fast: false
293+
matrix:
294+
os: [manylinux2014]
295+
compiler: [gcc11]
296+
parallel: [mpich, serial]
297+
298+
steps:
299+
300+
- name: Manual Checkout (gha)
301+
run: git clone --depth 1 "https://github.com${{ github.repository }}.git" gha
302+
303+
- name: Manual Checkout (source)
304+
run: |
305+
mkdir -p source
306+
cd source
307+
git init
308+
git remote add origin "https://github.com${{ github.repository }}.git"
309+
git fetch --depth 1 origin "${{ github.event.pull_request.head.sha }}"
310+
git checkout FETCH_HEAD
311+
312+
- name: Restore cache
313+
uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v4
314+
id: restore-cache
315+
with:
316+
path: .ccache
317+
key: ccache-${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.parallel }}-${{ github.sha }}
318+
restore-keys: |
319+
ccache-${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.parallel }}
320+
- name: Configure cache
321+
run: ccache -z
322+
- name: Setup
323+
run: gha/scripts/ci/gh-actions/linux-setup.sh
324+
- name: Update
325+
run: gha/scripts/ci/gh-actions/run.sh update
326+
- name: Configure
327+
run: gha/scripts/ci/gh-actions/run.sh configure
328+
- name: Build
329+
run: gha/scripts/ci/gh-actions/run.sh build
330+
- name: Print ccache statistics
331+
run: ccache -s | tee $GITHUB_STEP_SUMMARY
332+
- name: Save cache
333+
uses: actions/cache/save@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v4
334+
if: ${{ github.ref_name == 'master' && steps.restore-cache.outputs.cache-hit != 'true' }}
335+
id: save-cache
336+
with:
337+
path: .ccache
338+
key: ccache-${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.parallel }}-${{ github.sha }}
339+
- name: Test
340+
run: gha/scripts/ci/gh-actions/run.sh test
341+
281342
macos:
282343
needs: [format, git_checks]
283344
if: needs.git_checks.outputs.num_code_changes > 0
@@ -312,6 +373,9 @@ jobs:
312373
compiler: xcode15_4
313374
- parallel: serial
314375
arch: arm64
376+
exclude:
377+
- image: macos-14
378+
shared: static
315379

316380
name: macos (${{ matrix.image }}, ${{ matrix.compiler}}, ${{ matrix.arch }}, ${{ matrix.shared }}, ${{ matrix.parallel }})
317381

@@ -632,7 +696,7 @@ jobs:
632696
#######################################
633697

634698
build_and_test:
635-
needs: [el8, ubuntu, macos, windows, docker, contract]
699+
needs: [el8, ubuntu, manylinux2014, macos, windows, docker, contract]
636700
runs-on: ubuntu-latest
637701
steps:
638702
- run: echo "All required jobs complete"

‎scripts/ci/cmake/ci-el8-icc-ompi.cmake‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

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

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎scripts/ci/cmake/ci-el8-oneapi-ompi.cmake‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎scripts/ci/cmake/ci-macos-14-xcode15_4-static-serial.cmake‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

scripts/ci/cmake/ci-el8-icc-mpich.cmake renamed to scripts/ci/cmake/ci-manylinux2014-gcc12-mpich.cmake

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ include(ProcessorCount)
66
ProcessorCount(NCPUS)
77
math(EXPR N2CPUS "${NCPUS}*2")
88

9-
set(ENV{CC} icc)
10-
set(ENV{CXX} icpc)
11-
set(ENV{FC} ifort)
9+
set(ENV{CC} gcc)
10+
set(ENV{CXX} g++)
11+
set(ENV{FC} gfortran)
1212

1313
set(dashboard_cache "
1414
BUILD_TESTING:BOOL=ON
@@ -17,25 +17,25 @@ ADIOS2_BUILD_EXAMPLES:BOOL=ON
1717
ADIOS2_USE_BZip2:BOOL=ON
1818
ADIOS2_USE_Blosc2:BOOL=OFF
1919
ADIOS2_USE_DataMan:BOOL=ON
20-
ADIOS2_USE_DataSpaces:BOOL=OFF
21-
ADIOS2_USE_Fortran:BOOL=OFF
20+
ADIOS2_USE_Fortran:BOOL=ON
2221
ADIOS2_USE_HDF5:BOOL=ON
2322
ADIOS2_USE_MPI:BOOL=ON
2423
ADIOS2_USE_Python:BOOL=OFF
25-
ADIOS2_USE_SZ:BOOL=ON
24+
ADIOS2_USE_SZ:BOOL=OFF
2625
ADIOS2_USE_ZeroMQ:STRING=ON
27-
ADIOS2_USE_ZFP:BOOL=ON
26+
ADIOS2_USE_ZFP:BOOL=OFF
2827
2928
CMAKE_C_COMPILER_LAUNCHER=ccache
3029
CMAKE_CXX_COMPILER_LAUNCHER=ccache
31-
CMAKE_C_FLAGS:STRING=-Wall -diag-disable=10441
32-
CMAKE_C_FLAGS_DEBUG:STRING=-g -O0
33-
CMAKE_CXX_FLAGS:STRING=-Wall -diag-disable=10441
34-
CMAKE_CXX_FLAGS_DEBUG:STRING=-g -O0
30+
CMAKE_C_FLAGS:STRING=-Wall
31+
CMAKE_CXX_FLAGS:STRING=-Wall
32+
CMAKE_Fortran_FLAGS:STRING=-Wall
3533
3634
MPIEXEC_MAX_NUMPROCS:STRING=${N2CPUS}
3735
")
3836

39-
set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
37+
set(CTEST_TEST_ARGS EXCLUDE "KillReader|KillWriter|PreciousTimestep|.Serial$")
38+
39+
set(CTEST_CMAKE_GENERATOR "Ninja")
4040
list(APPEND CTEST_UPDATE_NOTES_FILES "${CMAKE_CURRENT_LIST_FILE}")
4141
include(${CMAKE_CURRENT_LIST_DIR}/ci-common.cmake)

0 commit comments

Comments
 (0)
⚡