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

Update develop from release/1.7.0 and rename spack fork branch #1072

Merged

Conversation

climbfuji
Copy link
Collaborator

@climbfuji climbfuji commented Apr 11, 2024

Summary

Update develop from release/1.7.0. I reverted the usual changes to the container configs (yamls), .gitconfig and doc/src/conf.py as for every other release.

On top of that, this PR contains the necessary changes following the renaming of the spack fork branch (and default branch in https://github.com/JCSDA/spack), which affect the container configs (yamls) and .gitmodules.

See announcement #1073 for more information on the branch renaming.

Testing

The release branch was tested heavily on all systems and in CI. This PR is tested in CI (see below)

Applications affected

All (but see testing)

Systems affected

All (but see testing)

Dependencies

Issue(s) addressed

Link the issues addressed or resolved by this PR (use Fixes #??? for fully resolved issues)

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.

climbfuji and others added 29 commits March 20, 2024 15:37
…mpich.yaml, configs/containers/docker-ubuntu-gcc-openmpi.yaml, configs/containers/docker-ubuntu-intel-impi.yaml, doc/source/conf.py: replace jcsda_emc_spack_stack branch name with release/1.7.0
…in modules for backward compatibility; update authorlist in doc conf (JCSDA#1037)

* Update authorlist in doc/source/conf.py
* Provide lowercase env variables jedi_cmake_ROOT and atlas_ROOT for backward compatibility in spack-stack-1.7.0 only
…SDA#1040)

* Disable xnnpack variant for py-torch on discover-scu16
* Update project_charter.md with new environment names
* Fix bad indentation in configs/sites/derecho/compilers.yaml
* Bug fix in configs/sites/discover-scu17/compilers.yaml: remove duplicate env variable
* Documentation updates for release-1.7.0
* Update discover-scu16 intel config and documentation, and add note in doc/source/NewSiteConfigs.rst about problems of [email protected] with zlib-ng
* Update documentation for S4 and for problems of zlib-ng with [email protected] on some systems
* Update documentation for new Redhat 8 site configs
* Switch to tag spack-stack-1.7.0 for spack submodule
* Update doc/source/PreConfiguredSites.rst with information on mapl version/variant differences
…_root

release/1.7.0: revert uppercase PACKAGE_ROOT env vars
… release changes in configs/containers/*.yaml and doc/source/conf.py
@@ -1,9 +1,7 @@
[submodule "spack"]
path = spack
#url = https://github.com/spack/spack
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Time to let go ...

…_lmod.yaml and configs/common/modules_tcl.yaml
@climbfuji climbfuji marked this pull request as ready for review April 11, 2024 02:32
@climbfuji climbfuji added INFRA JEDI Infrastructure NOAA-EMC OAR-EPIC NOAA Oceanic and Atmospheric Research and Earth Prediction Innovation Center labels Apr 11, 2024
@climbfuji climbfuji self-assigned this Apr 11, 2024
modules:
- gnu/9.2.0
- openmpi/4.1.5
- openmpi/4.1.6_gnu9.2.0
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Maybe we should try making this the default for all builds (especially Intel) to avoid the issues we've seen with [email protected]? Not sure. Worth discussing.

@climbfuji climbfuji merged commit 4c84860 into JCSDA:develop Apr 11, 2024
6 checks passed
@climbfuji climbfuji deleted the feature/update_develop_from_release_170 branch April 11, 2024 17:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
INFRA JEDI Infrastructure NOAA-EMC OAR-EPIC NOAA Oceanic and Atmospheric Research and Earth Prediction Innovation Center
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants