Skip to content

Commit

Permalink
Verify CMake workflows match autotools (HDFGroup#5035)
Browse files Browse the repository at this point in the history
  • Loading branch information
byrnHDF authored Oct 29, 2024
1 parent 1e977c1 commit ec4654e
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 20 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main-cmake-par-spc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ jobs:
-DHDF5_ENABLE_ALL_WARNINGS=ON \
-DHDF5_ENABLE_WARNINGS_AS_ERRORS=ON \
-DHDF5_ENABLE_PARALLEL:BOOL=ON \
-DMPIEXEC_NUMPROC_FLAG:STRING=-n \
-DMPIEXEC_MAX_NUMPROCS:STRING=2 \
-DHDF5_ENABLE_SUBFILING_VFD:BOOL=ON \
-DHDF5_BUILD_CPP_LIB:BOOL=OFF \
-DHDF5_BUILD_FORTRAN=OFF \
Expand All @@ -65,9 +67,7 @@ jobs:
run: cmake --build . --parallel 3 --config ${{ inputs.build_mode }}
working-directory: ${{ runner.workspace }}/build

#
# RUN TESTS
#
- name: CMake Run Tests
run: ctest . -E MPI_TEST --parallel 2 -C ${{ inputs.build_mode }} -V
working-directory: ${{ runner.workspace }}/build
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/main-cmake-par.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ jobs:
-DBUILD_SHARED_LIBS=ON \
-DHDF5_ENABLE_ALL_WARNINGS=ON \
-DHDF5_ENABLE_PARALLEL:BOOL=ON \
-DMPIEXEC_NUMPROC_FLAG:STRING=-n \
-DMPIEXEC_MAX_NUMPROCS:STRING=2 \
-DHDF5_ENABLE_SUBFILING_VFD:BOOL=ON \
-DHDF5_BUILD_CPP_LIB:BOOL=OFF \
-DHDF5_BUILD_FORTRAN=ON \
Expand Down
23 changes: 15 additions & 8 deletions .github/workflows/main-cmake-spc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,17 @@ jobs:
run: cmake --build . --parallel 3 --config Debug
working-directory: ${{ runner.workspace }}/build

# RUN TESTS - disable until some tests are fixed
# - name: CMake Run Tests
# run: ctest . --parallel 2 -C Debug -V
# working-directory: ${{ runner.workspace }}/build
# RUN TESTS
- name: CMake Run Tests
run: |
ctest . --parallel 2 -C Debug -V -E "testhdf5-base|cache_api|dt_arith|H5TEST-dtypes|err_compat"
working-directory: ${{ runner.workspace }}/build

- name: CMake Run Expected to Fail Tests
run: |
ctest . --parallel 2 -C Debug -V -R "testhdf5-base|cache_api|dt_arith|H5TEST-dtypes|err_compat"
working-directory: ${{ runner.workspace }}/build
continue-on-error: true

build_v1_8:
name: "gcc DBG v1.8 default API"
Expand Down Expand Up @@ -123,11 +130,11 @@ jobs:
working-directory: ${{ runner.workspace }}/build

#
# RUN TESTS - disable until some tests are fixed
# RUN TESTS
#
# - name: CMake Run Tests
# run: ctest . --parallel 2 -C Debug -V
# working-directory: ${{ runner.workspace }}/build
- name: CMake Run Tests
run: ctest . --parallel 2 -C Debug -V
working-directory: ${{ runner.workspace }}/build

build_v1_10:
name: "gcc DBG v1.10 default API"
Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/main-cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ on:
description: "TS or empty"
required: true
type: string

build_mode:
description: "release vs. debug build"
required: true
Expand Down Expand Up @@ -160,9 +159,7 @@ jobs:
- name: Get Sources
uses: actions/[email protected]

#
# CMAKE CONFIGURE
#
- name: CMake Configure
run: |
mkdir "${{ runner.workspace }}/build"
Expand Down Expand Up @@ -217,16 +214,12 @@ jobs:
shell: bash
if: ${{ inputs.thread_safety == 'TS' }}

#
# BUILD
#
- name: CMake Build
run: cmake --build . --parallel 3 --config ${{ inputs.build_mode }}
working-directory: ${{ runner.workspace }}/build

#
# RUN TESTS
#
- name: CMake Run Tests
run: ctest . --parallel 2 -C ${{ inputs.build_mode }} -V
working-directory: ${{ runner.workspace }}/build
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/msys2-cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,11 @@ jobs:

- name: CMake Run Tests
run: |
ctest . --parallel 2 -C ${{ inputs.build_mode }} -V -E "tfloatsattrs|testhdf5-base|cache_api|dt_arith|H5TEST-dtypes|err_compat"
ctest . --parallel 2 -C ${{ inputs.build_mode }} -V -E "testhdf5-base|cache_api|dt_arith|H5TEST-dtypes|err_compat"
working-directory: ${{ runner.workspace }}/build

- name: CMake Run Expected to Fail Tests
run: |
ctest . --parallel 2 -C ${{ inputs.build_mode }} -V -R "tfloatsattrs|testhdf5-base|cache_api|dt_arith|H5TEST-dtypes|err_compat"
ctest . --parallel 2 -C ${{ inputs.build_mode }} -V -R "testhdf5-base|cache_api|dt_arith|H5TEST-dtypes|err_compat"
working-directory: ${{ runner.workspace }}/build
continue-on-error: true
2 changes: 2 additions & 0 deletions .github/workflows/nvhpc-cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ jobs:
-DCMAKE_BUILD_TYPE=${{ inputs.build_mode }} \
-DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF \
-DHDF5_ENABLE_PARALLEL:BOOL=ON \
-DMPIEXEC_NUMPROC_FLAG:STRING=-np \
-DMPIEXEC_MAX_NUMPROCS:STRING=2 \
-DHDF5_BUILD_CPP_LIB:BOOL=OFF \
-DLIBAEC_USE_LOCALCONTENT=OFF \
-DZLIB_USE_LOCALCONTENT=OFF \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/testxpr-cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,3 @@ jobs:
HDF5TestExpress: 0
run: ctest . --parallel 2 -C ${{ matrix.build_mode }} -V -R H5TESTXPR
working-directory: ${{ runner.workspace }}/build

0 comments on commit ec4654e

Please sign in to comment.