Skip to content
Draft
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
7287bde
Add toolchain for intel compiles
byrnHDF Jul 10, 2025
e3630c5
fix syntax
byrnHDF Jul 10, 2025
7acfdd9
Add quotes
byrnHDF Jul 10, 2025
5f9f8e6
Adjust whitespace
byrnHDF Jul 10, 2025
134344c
Add oneAPI to intelmpi workflow
byrnHDF Jul 10, 2025
a07c833
Skip linux change because of version issues
byrnHDF Jul 10, 2025
a1d5464
remove middle of list comment
byrnHDF Jul 10, 2025
b76b633
Merge branch 'HDFGroup:develop' into develop-intel-ci
byrnHDF Jul 12, 2025
ac3eb24
Merge branch 'HDFGroup:develop' into develop-intel-ci
byrnHDF Jul 14, 2025
f4a223a
Enhance comment
byrnHDF Jul 14, 2025
68abe86
Merge branch 'HDFGroup:develop' into develop-intel-ci
byrnHDF Jul 15, 2025
4f73f6d
Merge branch 'HDFGroup:develop' into develop-intel-ci
byrnHDF Jul 16, 2025
b8874af
Merge branch 'develop' of https://github.com/HDFGroup/hdf5 into devel…
lrknox Jul 22, 2025
824ebd0
Merge branch 'HDFGroup:develop' into develop-intel-ci
byrnHDF Jul 28, 2025
994ff40
Merge branch 'HDFGroup:develop' into develop-intel-ci
byrnHDF Jul 28, 2025
6921fdb
Merge branch 'HDFGroup:develop' into develop-intel-ci
byrnHDF Jul 31, 2025
9253054
Merge branch 'HDFGroup:develop' into develop-intel-ci
byrnHDF Aug 1, 2025
d84475c
Merge branch 'HDFGroup:develop' into develop-intel-ci
byrnHDF Aug 5, 2025
83251ce
Merge branch 'HDFGroup:develop' into develop-intel-ci
byrnHDF Aug 6, 2025
4a4febd
Merge branch 'HDFGroup:develop' into develop-intel-ci
byrnHDF Aug 12, 2025
c7a048e
Merge branch 'HDFGroup:develop' into develop-intel-ci
byrnHDF Aug 13, 2025
89ee230
Merge branch 'HDFGroup:develop' into develop-intel-ci
byrnHDF Aug 13, 2025
5d3e5d3
Merge branch 'HDFGroup:develop' into develop-intel-ci
byrnHDF Aug 15, 2025
aa2c503
Merge branch 'HDFGroup:develop' into develop-intel-ci
byrnHDF Aug 29, 2025
e4d568e
Merge branch 'HDFGroup:develop' into develop-intel-ci
byrnHDF Sep 6, 2025
2b70396
Merge branch 'HDFGroup:develop' into develop-intel-ci
byrnHDF Sep 8, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 36 additions & 1 deletion .github/workflows/cmake-par-script.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,29 @@ jobs:
strategy:
matrix:
mpi: [ 'msmpi', 'intelmpi']
include:
- mpi: "msmpi"
toolchain: ""
fortran: OFF
- mpi: "intelmpi"
toolchain: config/toolchain/intel.cmake
fortran: ON

name: "Parallel ${{ matrix.mpi }} Windows-${{ inputs.build_mode }}"
steps:
- uses: actions/[email protected]

- name: Install Dependencies (Windows)
run: choco install ninja

- name: add oneAPI to env
uses: fortran-lang/setup-fortran@v1
id: setup-fortran
with:
compiler: intel
version: '2025.0'
if: matrix.mpi == 'intelmpi'

- name: Install Dependencies
uses: ssciwr/doxygen-install@v1
with:
Expand Down Expand Up @@ -130,14 +146,15 @@ jobs:
set (MODEL "MPI")
set (GROUP "MPI")
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} --log-level=VERBOSE")
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=${{ matrix.toolchain }}")
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Avoid passing an empty toolchain flag for non-intel builds. Consider conditionally appending -DCMAKE_TOOLCHAIN_FILE only when matrix.toolchain is non‐empty.

set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_BUILD_TYPE=${{ inputs.build_mode }}")
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DMPIEXEC_NUMPROC_FLAG:STRING=-n")
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DMPIEXEC_MAX_NUMPROCS:STRING=2")
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_PARALLEL:BOOL=ON")
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SUBFILING_VFD:BOOL=OFF")
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_JAVA:BOOL=OFF")
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_CPP_LIB:BOOL=OFF")
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=OFF")
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_BUILD_FORTRAN:BOOL=${{ matrix.fortran }}")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should give a reason for switching off Fortran for future reference.

set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_ZLIB_SUPPORT:BOOL=OFF")
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF")
set (ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=OFF")
Expand Down Expand Up @@ -165,6 +182,14 @@ jobs:
strategy:
matrix:
mpi: [ 'mpich', 'openmpi', 'intelmpi']
include:
- mpi: "mpich"
toolchain: ""
- mpi: "openmpi"
toolchain: ""
- mpi: "intelmpi"
toolchain: config/toolchain/intel.cmake

name: "Parallel ${{ matrix.mpi }} Linux-${{ inputs.build_mode }}"
steps:
- name: Install CMake Dependencies (${{ matrix.mpi }})
Expand All @@ -175,6 +200,16 @@ jobs:
sudo apt install gcc-12 g++-12 gfortran-12
sudo apt install libaec0 libaec-dev

# This oneAPI step causes an issue when the MPI step executes, likely because
# the versions of OneAPI are different
# - name: add oneAPI to env
# uses: fortran-lang/setup-fortran@v1
# id: setup-fortran
# with:
# compiler: intel
# version: '2025.0'
# if: matrix.mpi == 'intelmpi'

- name: Install Dependencies
uses: ssciwr/doxygen-install@v1
with:
Expand Down
Loading