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

Switch to openmpi on macOS, update spack (merge spack authoritative updates as of 2022/04/04) #112

Merged
merged 28 commits into from
Apr 12, 2022
Merged

Switch to openmpi on macOS, update spack (merge spack authoritative updates as of 2022/04/04) #112

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
9a60e64
Switch to openmpi on macOS
climbfuji Apr 4, 2022
98b902f
Merge branch 'develop' of https://github.com/noaa-emc/spack-stack int…
climbfuji Apr 4, 2022
4ced3de
Update .gitmodules and submodule pointer for spack for testing
climbfuji Apr 4, 2022
9c9b026
Use openmpi for macos-llvm-clang and macos-apple-clang github workflows
climbfuji Apr 4, 2022
0928896
Merge branch 'develop' of https://github.com/noaa-emc/spack-stack int…
climbfuji Apr 7, 2022
7ca1c75
Remove version identified from clang compiler in .github/workflows/ma…
climbfuji Apr 7, 2022
352ea6d
Bug fix in .github/actions/setup-spack-stack/action.yaml
climbfuji Apr 7, 2022
72a628e
Update spack submodule
climbfuji Apr 7, 2022
b9003ff
Update spack submodule
climbfuji Apr 7, 2022
6abc298
Merge branch 'develop' of https://github.com/noaa-emc/spack-stack int…
climbfuji Apr 7, 2022
0b5c687
Use internal hwloc/libevent when building openmpi
climbfuji Apr 8, 2022
fe28a8d
For debugging
climbfuji Apr 8, 2022
4afe505
Bump mpi cache version number
climbfuji Apr 8, 2022
0cfd9ae
Merge branch 'develop' of https://github.com/noaa-emc/spack-stack int…
climbfuji Apr 8, 2022
5aa05d3
Temporarily change mpi version numbers for testing
climbfuji Apr 8, 2022
21ce595
Next attempt to find MPI
climbfuji Apr 8, 2022
0816473
Try to find git-lfs explicitly
climbfuji Apr 8, 2022
4778358
Use git external find --all for CI tests
climbfuji Apr 11, 2022
ab3eb5e
Change all of jedi-cmake from JCSDA-internal to JCSDA
climbfuji Apr 11, 2022
92aee3f
Update submodule pointer for spack
climbfuji Apr 11, 2022
9ffdfb5
Remove all download artifacts that contain a '?'
climbfuji Apr 11, 2022
c3c0cca
Update submodule pointer for spack
climbfuji Apr 11, 2022
62114e9
Temporary commit for Intel in .github/actions/setup-spack-stack/actio…
climbfuji Apr 11, 2022
daaef9b
Use py-scipy 1.7.3 on macOS with gcc
climbfuji Apr 11, 2022
8359491
Update submodule pointer for spack
climbfuji Apr 11, 2022
3edb222
Update submodule pointer for spack
climbfuji Apr 12, 2022
4e908dc
Remove unnecessary pinning of py-scipy version 1.7.3 in .github/actio…
climbfuji Apr 12, 2022
1aaaf98
Revert .gitmodules and update submodules pointer for spack
climbfuji Apr 12, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/macos-apple-clang.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ jobs:
with:
app: ${{ matrix.app }}
compiler: apple-clang@13
mpi: mpich
mpi: openmpi
path: ${{ github.workspace }}
2 changes: 1 addition & 1 deletion .github/workflows/macos-llvm-clang.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ jobs:
with:
app: ${{ matrix.app }}
compiler: clang
mpi: mpich
mpi: openmpi
path: ${{ github.workspace }}
6 changes: 4 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@
path = spack
#url = https://github.com/spack/spack
#branch = develop
url = https://github.com/NOAA-EMC/spack.git
branch = jcsda_emc_spack_stack
#url = https://github.com/NOAA-EMC/spack.git
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

For CI testing only, will be reverted prior to merging

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

For CI testing only, will be reverted prior to merging

#branch = jcsda_emc_spack_stack
url = https://github.com/climbfuji/spack.git
branch = feature/update_jcsda_emc_spack_stack_from_authoritative_20220404
4 changes: 2 additions & 2 deletions configs/common/packages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@
esmf:
version: [8.2.0]
variants: ~xerces ~pnetcdf
# Attention - when updating also check macos-monterey-llvm-clang-mpich-reference site config
# Attention - when updating also check macos-monterey-llvm-clang-openmpi-reference site config
fms:
version: [2022.01]
variants: +64bit +enable_quad_precision +gfs_phys +openmp +pic
# Attention - when updating also check macos-monterey-llvm-clang-mpich-reference site config
# Attention - when updating also check macos-monterey-llvm-clang-openmpi-reference site config
fms-jcsda:
version: [release-stable]
variants: +64bit +enable_quad_precision +gfs_phys +openmp +pic
Expand Down
2 changes: 1 addition & 1 deletion ...erey-llvm-clang-mpich-reference/README.md → ...ey-llvm-clang-openmpi-reference/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ This step is only required on the new arch64 systems that are equipped with a Ap
brew install [email protected]
brew install [email protected]
brew install llvm13.0.0
brew install [email protected]
brew install [email protected]
brew install [email protected]
brew install [email protected]
brew install [email protected]
Expand Down
0 ...llvm-clang-mpich-reference/compilers.yaml → ...vm-clang-openmpi-reference/compilers.yaml
View file
Open in desktop
File renamed without changes.
0 ...ey-llvm-clang-mpich-reference/config.yaml → ...-llvm-clang-openmpi-reference/config.yaml
View file
Open in desktop
File renamed without changes.
0 ...y-llvm-clang-mpich-reference/modules.yaml → ...llvm-clang-openmpi-reference/modules.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...-llvm-clang-mpich-reference/packages.yaml → ...lvm-clang-openmpi-reference/packages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ packages:
all:
compiler:: [[email protected]]
providers:
mpi:: [[email protected]]
mpi:: [[email protected]]

### MPI, Python, MKL
mpi:
Expand Down
2 changes: 1 addition & 1 deletion spack
Open in desktop
Submodule spack updated 2210 files