Skip to content

More Acorn+WCOSS2/NCO updates#1821

Merged
climbfuji merged 54 commits intoJCSDA:feature/update_to_spack_v1from
AlexanderRichert-NOAA:nov25_acorn_round2
Nov 18, 2025
Merged

More Acorn+WCOSS2/NCO updates#1821
climbfuji merged 54 commits intoJCSDA:feature/update_to_spack_v1from
AlexanderRichert-NOAA:nov25_acorn_round2

Conversation

@AlexanderRichert-NOAA
Copy link
Copy Markdown
Collaborator

@AlexanderRichert-NOAA AlexanderRichert-NOAA commented Nov 15, 2025

Description

This PR makes the following general changes:

  • blacklist compiler-wrapper and intel-oneapi-compilers-classic from modules
  • adds a uwtools variant to global-workflow-env; on by default but disable-able for stacks/sites where it's not needed
  • use 'require' to set virtual package providers in common/packages*.yaml so that we don't have to configure/override these separately for various dependencies (and to avoid possible concretization quirks because of "providers" being a soft preference).
  • move show_duplicate_packages output logic outside the show_duplicate_packages() function; also cleaned up some defunct logic left over from the previous iteration of this script

and the following Acorn/WCOSS2/NCO-specific changes:

  • overhaul acorn and wcoss2 site configs, including reconciling them so they're basically the same apart from some NCO-specific package configuration
  • overhaul of deploy.py: better logging; better integration with Spack Python API; move deployments.yaml under site config dir; validate env's by ensuring only user-specified packages can be built with GCC; add a "modules_flat/" directory that tests having all modulefiles in a flat structure (no compiler or mpi subdirectories)
  • resurrect 'nco' template and add it to acorn deployments
  • no more intel@2022 (per NCO & EMC agreement)

Dependencies

none

Issues addressed

Relates to #1772

Applications affected

oneapi provider config changes (potentially) affect all applications
global-workflow-env

Systems affected

show_duplicate_packages.py change (potentially) affects all deployments

Testing

  • CI: Note whether the automatic tests (GitHub actions tests that run automatically for every commit) pass or not
    • GitHub actions CI tests pass
    • GitHub actions CI tests do not pass (provide explanation)
    • GitHub actions CI tests skipped (provide explanation if necessary)
  • New tests added: List and describe any new tests added to GitHub actions
    • ...
  • Additional testing: Add information on any additional tests conducted
    • tested all four env's defined in acorn's deployments.yaml

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.
  • All necessary updates to the documentation on readthedocs are included in this PR
  • All necessary updates to the spack-stack wiki will be made when this PR is merged

…g-ability; add nco for acorn deployments.yaml
Copy link
Copy Markdown
Collaborator

@climbfuji climbfuji left a comment

Choose a reason for hiding this comment

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

Looks great, thanks for the cleanup.

@AlexanderRichert-NOAA AlexanderRichert-NOAA marked this pull request as ready for review November 17, 2025 23:03
Copy link
Copy Markdown
Collaborator

@climbfuji climbfuji left a comment

Choose a reason for hiding this comment

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

CI tests all passed. I checked that the GNU and Intel builds use the correct linalg providers and variants for the packages.

@climbfuji climbfuji merged commit 51c72ac into JCSDA:feature/update_to_spack_v1 Nov 18, 2025
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants