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.

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

Fix container builds, merge/rename spack-stack extension repos, add Intel oneAPI 2024.0.2 compiler/MPI on AWS ParallelCluster #966

Merged

Conversation

climbfuji
Copy link
Collaborator

@climbfuji climbfuji commented Jan 24, 2024

Summary

Several changes to fix the broken container builds and reorganize our repos:

  • Update spack submodule pointer to include pflogger updates (to fix broken clang/mpich container builds of pflogger)
  • Merge spack-stack extension repos in spack-ext/repos: combine jcsda-emc and jcsda-emc-bundles into spack-stack (we also have EPIC and may have more partners in the future, so this makes a lot of sense)
  • Add logic to copy the spack-stack extension repos into the container: this requires recording the spack-stack hash as part of running setup.sh (so that docker can recognize updates and doesn't use the cache if spack-stack has changed) and physically copying the repos directory into the container environment directory (because the docker build runs from that directory and everything above is not in its context)

Unrelated, and commented out by default:

  • Addition of Intel oneAPI compiler/MPI for aws-pcluster site for testing

Testing

Applications affected

n/a

Systems affected

spack-stack containers

Dependencies

Issue(s) addressed

Resolves #965
Resolves #960

Checklist

  • This PR addresses one issue/problem/enhancement, or has a very good reason for not doing so.
  • These changes have been tested on the affected systems and applications.
  • All dependency PRs/issues have been resolved and this PR can be merged.

@@ -1,15 +1,3 @@
# Use '-i' when sourcing this file to attempt to reset $PATH to system defaults (i.e., based on /etc/profile),
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

We haven't used this and I don't think we need it?

Copy link
Collaborator

Choose a reason for hiding this comment

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

I guess I can go either way. I'm okay with removing it for now, but if we run into issues again like we had with the ESMF recipe where it was using the calling environment (incl. PATH) rather than the Spack build environment in places, then we should revisit and try to make it work on all systems (I don't remember how far I got with testing, I think it worked on more than just Acorn and Orion but those were the ones that needed added customization).

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Ok, thanks. I'll take it out for now. I never had to do anything particular about the environment except for Cray systems where you need to have a separate set of modules loaded, depending on the compiler you build for (see Narwhal instructions). Since we've agreed today to move forward with separate environments for different compilers, that will be even less of an issue (again, essentially doing what we already do for Narwhal).

@climbfuji climbfuji marked this pull request as ready for review January 25, 2024 23:02
@climbfuji climbfuji self-assigned this Jan 25, 2024
@climbfuji climbfuji added the INFRA JEDI Infrastructure label Jan 25, 2024
Copy link
Collaborator

@AlexanderRichert-NOAA AlexanderRichert-NOAA left a comment

Choose a reason for hiding this comment

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

Looks good (apart from .gitmodules)

@climbfuji climbfuji merged commit d6f4ad4 into JCSDA:develop Jan 26, 2024
9 checks passed
@climbfuji climbfuji deleted the bugfix/container_dockerfile_spackext branch January 26, 2024 19:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
INFRA JEDI Infrastructure
Projects
No open projects
3 participants