Skip to content
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.

Sign up for GitHub

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

By default, use MKL as virtual provider for blas/lapack/fftw with Intel compilers (classic and llvm-based/oneapi); update site configs to revert to openblas/fftw as needed; skip wgrib2 with Intel oneapi; bump odc to 1.5.2 #1226

Merged
merged 33 commits into from
Aug 15, 2024
Merged

By default, use MKL as virtual provider for blas/lapack/fftw with Intel compilers (classic and llvm-based/oneapi); update site configs to revert to openblas/fftw as needed; skip wgrib2 with Intel oneapi; bump odc to 1.5.2 #1226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
63bb917
Create packages_{apple-clang,gcc,intel,oneapi}.yaml and move compiler…
climbfuji Aug 6, 2024
b9be674
Update blackpearl site config: remove oneapi settings (now in common …
climbfuji Aug 7, 2024
b69c4e0
Update .gitmodules and submodule pointer for spack for code review an…
climbfuji Aug 7, 2024
8089b57
Temporarily remove wgrib2 requirement from various virtual packages f…
climbfuji Aug 7, 2024
2b9ccd2
First pass to update configs/sites/tier1/narwhal
climbfuji Aug 7, 2024
b586a26
Update formatting in configs/common/packages_*.yaml
climbfuji Aug 7, 2024
be60b11
Update nautilus site config: use packages_COMPILER.yaml
climbfuji Aug 7, 2024
38ed6fb
Remove unused external intel-oneapi-tbb from Narwhal site config
climbfuji Aug 7, 2024
6e9b458
Update CI workflows to use Intel MKL with Intel and OneAPI compilers
climbfuji Aug 7, 2024
148c4d9
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Aug 8, 2024
5b3c534
Update submodule pointer for spack
climbfuji Aug 8, 2024
18ae9fc
Add libfabric to LD_LIBRARY_PATH in narwhal compiler config
climbfuji Aug 8, 2024
bc82b78
Bump odc to 1.5.2 in configs/common/packages.yaml and configs/contain…
climbfuji Aug 8, 2024
35120ca
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Aug 9, 2024
108ba70
For Intel Classic, pin gettext to 0.21.1 since 0.22.5 doesn't build
climbfuji Aug 9, 2024
7ab7ef0
Revert .gitmodules and update submodule pointer for spack
climbfuji Aug 9, 2024
7967004
Update atlantis site config
climbfuji Aug 9, 2024
7c2def4
Update S4 site config
climbfuji Aug 9, 2024
ba3f738
Update Orion site config
climbfuji Aug 9, 2024
ba44456
Work in progress: update doc/source/NewSiteConfigs.rst and doc/source…
climbfuji Aug 9, 2024
6f08ead
Update Hercules site config
climbfuji Aug 9, 2024
632b281
[skip ci] TEST forcing orion intel config to use openblas and fftw in…
climbfuji Aug 9, 2024
9b11c9e
Update submodule pointer for spack
climbfuji Aug 9, 2024
1f82428
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Aug 9, 2024
e1a055d
[skip ci]
climbfuji Aug 9, 2024
1c74f30
Update S4 and Hercules site configs to use openblas and fftw with Intel
climbfuji Aug 9, 2024
ee49e3d
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Aug 12, 2024
10ea19d
Update site configs for Hera and Jet (use openblas for now with Intel)
climbfuji Aug 13, 2024
e95796d
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Aug 13, 2024
139dd43
Update site configs for aws-pcluster, derecho, discover-scu16, discov…
climbfuji Aug 14, 2024
9b0d8cf
Update site configs for acorn, gaea-c5, gaea-c6
climbfuji Aug 14, 2024
7506192
Update site configs for noaa-{aws,azure,gcloud}
climbfuji Aug 14, 2024
30c7027
Final update of doc/source/PreConfiguredSites.rst
climbfuji Aug 14, 2024
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
11 changes: 11 additions & 0 deletions .github/workflows/ubuntu-ci-x86_64-intel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,17 @@ jobs:
echo " - spec: [email protected]%[email protected]" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
echo " prefix: /opt/intel/oneapi" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml

# Add external Intel MKL and oneAPI runtime
echo "" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
echo " intel-oneapi-mkl:" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
echo " externals:" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
echo " - spec: [email protected]%[email protected]" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
echo " prefix: /opt/intel/oneapi" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
#echo " intel-oneapi-runtime:" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
climbfuji marked this conversation as resolved.
Show resolved Hide resolved
#echo " externals:" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
#echo " - spec: [email protected]%[email protected]" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
#echo " prefix: /opt/intel/oneapi" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml

# Add external ecflow for Intel
echo "" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
echo " ecflow::" >> ${SPACK_SYSTEM_CONFIG_PATH}/packages.yaml
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/ubuntu-ci-x86_64-oneapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,6 @@ jobs:
echo " target: x86_64" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
echo " modules: []" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
echo " environment: {}" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
echo " #prepend_path:" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
echo " # LD_LIBRARY_PATH: '/opt/intel/oneapi/compiler/2023.2.3/linux/compiler/lib/intel64_lin'" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml
echo " extra_rpaths: []" >> ${SPACK_SYSTEM_CONFIG_PATH}/compilers.yaml

# Need to find external Intel MPI and annotate with the
Expand Down
Loading
Loading