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

develop: Update NRL batch install script, add configuration for Cole and Tusk #1489

Merged
merged 42 commits into from
Feb 5, 2025

Conversation

climbfuji
Copy link
Collaborator

Summary

This PR merges selected features of the release/neptune-1.5 branch at NRL into develop: an update of the NRL batch_install.sh script and tier2 site configurations for Cole and Tusk. The confusing Blueback site config is removed and will be added back in once Blueback is available.

Testing

Used updated batch install script on all NRL systems.

Applications affected

None

Systems affected

NRL systems

Dependencies

None

Issue(s) addressed

None

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.

…nfigs/sites/tier1/narwhal/compilers.gcc-direct.tmp to /site/compilers.yaml
…atus size changed, may indicate binary incompatibility.'
…kages at the end of each environment build in installer mode
… mirror logic, fix permissions on directories
…ents (not sure we need it) to util/nrl/batch_install.sh
…batch_install.sh (#6)

1. Rename util/nrl_batch_install.sh to util/nrl/batch_install.sh, consistent with authoritative spack-stack code
2. Update util/nrl/batch_install.sh:
    a. Add capability to create and use bootstrap mirrors
    b. Define function fix_permissions and use it to set the correct permissions for caches (mirrors) in developer mode, and for environments in installer mode
configs/sites/tier1/blueback-tds-tusk --> configs/sites/tier2/tusk
Add Makefile and update util/nrl/batch_install.sh to fine tune actions for different roles (ops, dev) combined with different modes (build, install).
…Blueback config (JCSDA#21)

This PR adds tier2 site configs for Cole and Tusk and updates util/nrl/batch_install.sh accordingly. It also removes the confusing configuration for Blueback, which was based on the Tusk configuration. We will add a proper Blueback configuration once we have access to the system.
@climbfuji climbfuji self-assigned this Feb 3, 2025
py-netcdf4:
require: '@1.7.1 +mpi'
Copy link
Collaborator Author

@climbfuji climbfuji Feb 4, 2025

Choose a reason for hiding this comment

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

This change will disappear when/if #1491 and #1490 are merged first, but we don't need to wait.

@climbfuji climbfuji marked this pull request as ready for review February 4, 2025 14:24
@climbfuji climbfuji requested a review from areinecke February 4, 2025 14:24
@climbfuji climbfuji added the NAVY United States Naval Research Lab label Feb 4, 2025
climbfuji added a commit that referenced this pull request Feb 4, 2025
…mpi` from #1489 (#1491)

In PR #1489 we are changing the requirements for py-netcdf4 from [email protected]: +mpi to [email protected]: ~mpi in configs/common/packages.yaml.

This change is required to fix an error with py-netcdf4 on certain systems when built with +mpi. We used to build py-netcdf4 without mpi, but for a period this wasn't possible until we added a patch to disable the py-netcdf4 auto-detect parallel feature. That patch allows us to build py-netcdf4 ~mpi even if netcdf-c was built with +mpi.

---------

Co-authored-by: Alex Richert <[email protected]>
climbfuji added a commit that referenced this pull request Feb 4, 2025
…elop

* Update .gitmodules and doc/source/conf.py for spack-stack release/1.9.0

* Avoid linking to libirc.so in spack (parallel-netcdf), turn off crypt variant for Python, and update Orion site config to fix tar issue (#1435)

1. Applications built with spack-stack packages esmf, parallelio, parallel-netcdf have libirc.so dynamically linked. Applications linked against libirc.so fail to start up. See Avoid linking to Intel's libirc.so library (aka bad configure script of package parallel-netcdf) #1436. The spack PR that is part of the suggested changes here fixes this by replacing libirc.so with libintlc.so in the parallel-netcdf build. See Bug fix in parallel-netcdf to avoid linking to libirc.so AND cherry-pick spack develop PR 48251 (conflict Intel Classic with [email protected]) spack#495.
2. Turn off crypt variant for Python; this variant leads to build errors with Intel in py-cryptography unless external curl and openssl are removed, which itself is problematic.
3. Add external wget on Orion, latest versions don't build with Intel on the machine.

---------

Co-authored-by: Stephen Herbener <[email protected]>

* Update ectrans from 1.2.0 to 1.5.0 in configs/common/packages.yaml (#1474)

* Update .gitmodules and submodule pointer for spack for code review and testing

* In spack-ext/lib/jcsda-emc/spack-stack/stack, update meta_modules.py and templates/{mpi,mpi.lua}: set compiler paths in MPI meta modules directly using SUBSTITUTES_SAVE, not using environment variables (#1479)

* Revert .gitmodules and update submodule pointer for spack

* release/1.9.0: Update instructions for setting up spack-stack with Nvidia compilers (#1462)

This PR brings the Nvidia instructions a bit more up-to-date.

On develop, the instructions only worked with

Ubuntu 22.04
spack-stack 34bfda1
[email protected]

With this PR, these constraints are updated to the slightly more recent

Ubuntu 24.04
spack-stack 26901af
[email protected]

* For orion, intel config, pin py-numpy to version 1.26. This prevents (#1482)

getting unwanted duplicate packages during concretize.

* release/1.9.0: Add [email protected] to unified-dev and skylab-dev templates, bug fix in depencies for awscli-v2, bump wgrib2 to 3.5.0 and re-enable for all compilers (#1486)

1. Add [email protected] to templates skylab-dev and unified-dev (new version was added in recently merged PR Update crtm(-fix), wgrib2 spack#510)
2. Bump wgrib2 from 3.1.1 to 3.5.0 and re-enable for all compilers in spack-ext packages (new version was added in recently merged PR Update crtm(-fix), wgrib2 spack#510). Note. [email protected] doesn't compile on macOS with apple-clang (version 14.0.3 on the CI runner), see wgrib 3.5.0 does not compile with apple-clang 14.0.3 on macOS NOAA-EMC/wgrib2#312. But 3.4.0 does compile, thereforeuse this version on macOS only
3. Update spack submodule pointer for PR Update crtm(-fix), wgrib2 spack#510 and the changes in release/1.9.0: Fix bug in awcli-v2, add upper bound for py-cryptography spack#511 (fix upper bound for py-cryptography in awscli-v2) and release/1.9.0: Bug fix in wgrib2: apply '-Wno-error=implicit-function-declaration' for LLVM clang spack#513 (bug fix for wgrib2 with apple-clang)
---------

Co-authored-by: Alex Richert <[email protected]>

* Update .gitmodules and submodule pointer for spack for code review and testing

* For release/1.9.0: cherry-pick `[email protected]: ~mpi` instead of `+mpi` from #1489 (#1491)

In PR #1489 we are changing the requirements for py-netcdf4 from [email protected]: +mpi to [email protected]: ~mpi in configs/common/packages.yaml.

This change is required to fix an error with py-netcdf4 on certain systems when built with +mpi. We used to build py-netcdf4 without mpi, but for a period this wasn't possible until we added a patch to disable the py-netcdf4 auto-detect parallel feature. That patch allows us to build py-netcdf4 ~mpi even if netcdf-c was built with +mpi.

---------

Co-authored-by: Alex Richert <[email protected]>

* Revert .gitmodules and update submodule pointer for spack

---------

Co-authored-by: Stephen Herbener <[email protected]>
Co-authored-by: Francois Hebert <[email protected]>
Co-authored-by: Stephen Herbener <[email protected]>
Co-authored-by: Alex Richert <[email protected]>
@climbfuji climbfuji merged commit 90d9ae8 into JCSDA:develop Feb 5, 2025
9 checks passed
@climbfuji climbfuji deleted the feature/blueback_tds_cole branch February 5, 2025 15:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
NAVY United States Naval Research Lab
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants