-
-
Notifications
You must be signed in to change notification settings - Fork 306
Switch the C compiler for github windows action for mpiintel to the Intel C Complier #5656
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
byrnHDF
wants to merge
26
commits into
HDFGroup:develop
Choose a base branch
from
byrnHDF:develop-intel-ci
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
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 e3630c5
fix syntax
byrnHDF 7acfdd9
Add quotes
byrnHDF 5f9f8e6
Adjust whitespace
byrnHDF 134344c
Add oneAPI to intelmpi workflow
byrnHDF a07c833
Skip linux change because of version issues
byrnHDF a1d5464
remove middle of list comment
byrnHDF b76b633
Merge branch 'HDFGroup:develop' into develop-intel-ci
byrnHDF ac3eb24
Merge branch 'HDFGroup:develop' into develop-intel-ci
byrnHDF f4a223a
Enhance comment
byrnHDF 68abe86
Merge branch 'HDFGroup:develop' into develop-intel-ci
byrnHDF 4f73f6d
Merge branch 'HDFGroup:develop' into develop-intel-ci
byrnHDF b8874af
Merge branch 'develop' of https://github.com/HDFGroup/hdf5 into devel…
lrknox 824ebd0
Merge branch 'HDFGroup:develop' into develop-intel-ci
byrnHDF 994ff40
Merge branch 'HDFGroup:develop' into develop-intel-ci
byrnHDF 6921fdb
Merge branch 'HDFGroup:develop' into develop-intel-ci
byrnHDF 9253054
Merge branch 'HDFGroup:develop' into develop-intel-ci
byrnHDF d84475c
Merge branch 'HDFGroup:develop' into develop-intel-ci
byrnHDF 83251ce
Merge branch 'HDFGroup:develop' into develop-intel-ci
byrnHDF 4a4febd
Merge branch 'HDFGroup:develop' into develop-intel-ci
byrnHDF c7a048e
Merge branch 'HDFGroup:develop' into develop-intel-ci
byrnHDF 89ee230
Merge branch 'HDFGroup:develop' into develop-intel-ci
byrnHDF 5d3e5d3
Merge branch 'HDFGroup:develop' into develop-intel-ci
byrnHDF aa2c503
Merge branch 'HDFGroup:develop' into develop-intel-ci
byrnHDF e4d568e
Merge branch 'HDFGroup:develop' into develop-intel-ci
byrnHDF 2b70396
Merge branch 'HDFGroup:develop' into develop-intel-ci
byrnHDF File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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: | ||
|
@@ -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 }}") | ||
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 }}") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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") | ||
|
@@ -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 }}) | ||
|
@@ -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: | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.