-
Notifications
You must be signed in to change notification settings - Fork 45
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
Switch to openmpi on macOS, update spack (merge spack authoritative updates as of 2022/04/04) #112
Conversation
…o feature/switch_to_openmpi_on_macos
…o feature/switch_to_openmpi_on_macos
…cos-apple-clang.yaml
.gitmodules
Outdated
@@ -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 |
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.
For CI testing only, will be reverted prior to merging
.gitmodules
Outdated
@@ -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 |
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.
For CI testing only, will be reverted prior to merging
…o feature/switch_to_openmpi_on_macos
…o feature/switch_to_openmpi_on_macos
a68b91b
to
21ce595
Compare
7d42381
to
375a15f
Compare
832b9d6
to
c42e55f
Compare
4a4e2f9
to
342d34c
Compare
3a5f152
to
bad06e5
Compare
2522394
to
01825bc
Compare
8b8c2d8
to
62114e9
Compare
@kgerheiser Ready for review. |
elif [[ "${{ inputs.mpi }}" == "mpich"* ]]; then | ||
mpich_ver=${MPICH_VERSION} | ||
echo "" >> ${SPACK_ENV}/spack.yaml | ||
echo " packages:" >> ${SPACK_ENV}/spack.yaml | ||
echo " mpich:" >> ${SPACK_ENV}/spack.yaml | ||
echo " buildable: False" >> ${SPACK_ENV}/spack.yaml | ||
echo " externals:" >> ${SPACK_ENV}/spack.yaml | ||
echo " - spec: mpich@${mpich_ver}" >> ${SPACK_ENV}/spack.yaml | ||
echo " prefix: $HOME/mpi" >> ${SPACK_ENV}/spack.yaml | ||
elif [[ "${{ inputs.mpi }}" == "openmpi"* ]]; then | ||
openmpi_ver=${OPENMPI_VERSION} | ||
echo "" >> ${SPACK_ENV}/spack.yaml | ||
echo " packages:" >> ${SPACK_ENV}/spack.yaml | ||
echo " openmpi:" >> ${SPACK_ENV}/spack.yaml | ||
echo " buildable: False" >> ${SPACK_ENV}/spack.yaml | ||
echo " externals:" >> ${SPACK_ENV}/spack.yaml | ||
echo " - spec: openmpi@${openmpi_ver}" >> ${SPACK_ENV}/spack.yaml | ||
echo " prefix: $HOME/mpi" >> ${SPACK_ENV}/spack.yaml |
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.
Given the option of externally finding it, I would search for OpenMPI and MPICH instead of this.
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.
Good point. Now that I am using spack external find --all
, it should be able to find it.
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.
I'll try this in the next set of PRs.
# upload-artifact does not allow filenames that contain '?' | ||
rm -vf `find cache/source_cache -name '*\?*'` |
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.
Much better
LD_LIBRARY_PATH
instead of using--dirty
flag for installingFixes #109
Fixes #28
Tested on macOS Monterey with llvm clang and mpich, and also with llvm clang and openmpi.
All CI tests passed (see https://github.com/NOAA-EMC/spack-stack/actions).