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

release/1.5.0: site updates part 1 (Orion, Hercules, Narwhal) #770

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
bc46611
Update Orion site config
climbfuji Sep 9, 2023
32affe2
TEMPORARILY add envs/unified-env-gcc-10.3.0/install/gcc/10.3.0/python…
climbfuji Sep 11, 2023
0c554ec
Update Narwhal site config
climbfuji Sep 11, 2023
11b98fd
Merge branch 'feature/release150_narwhal_update' of https://github.co…
climbfuji Sep 11, 2023
073626f
Update .gitmodules and submodule pointer for spack for code review an…
climbfuji Sep 11, 2023
0f1f028
Turn off variants ~extdata2g and ~pflogger for mapl to avoid compilat…
climbfuji Sep 11, 2023
94e4497
Update Hercules site config
mark-a-potts Sep 11, 2023
862c677
Remove temporary files in envs
climbfuji Sep 11, 2023
2825882
Remove temporary files in envs
climbfuji Sep 11, 2023
e3f2369
Merge branch 'feature/release150_site_updates_orion_hercules_narwhal'…
climbfuji Sep 11, 2023
b2f86b7
Update orion site packages to avoid duplicate packages
climbfuji Sep 11, 2023
09ad7b3
First updates of doc/source/MaintainersSection.rst doc/source/PreConf…
climbfuji Sep 11, 2023
a07aba1
Add include statement for spack-stack python modules for Orion and He…
climbfuji Sep 11, 2023
416ec1a
Clean up configs/sites/orion/packages.yaml
climbfuji Sep 11, 2023
05c9249
Update submodule pointer for spack
climbfuji Sep 11, 2023
b17679f
More documentation updates for Narwhal, Orion
climbfuji Sep 11, 2023
c0279a7
Update submodule pointer for spack
climbfuji Sep 11, 2023
eafbf9c
Update .github/workflows/macos-ci-aarch64.yaml - write spack caches t…
climbfuji Sep 11, 2023
a08e79c
Merge branch 'release/1.5.0' of https://github.com/jcsda/spack-stack …
climbfuji Sep 11, 2023
d9a2ba2
Correct path for diskspace workaround for macOS arm64 CI
climbfuji Sep 11, 2023
09712b2
Revert .gitmodules and update submodule pointer for spack
climbfuji Sep 12, 2023
3b05dee
Update Hercules site config
climbfuji Sep 12, 2023
ac30b2a
Try shorter path for spack caches in .github/workflows/macos-ci-aarch…
climbfuji Sep 12, 2023
d4fbbdd
Final cleanup of Hercules, Orion, Narwhal site configs
climbfuji Sep 12, 2023
d0fcb26
Pin awscli to 1.27.84 and py-pyyaml to 5.4.1
climbfuji Sep 12, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/macos-ci-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,12 @@ jobs:
echo "Packages in combined spack build caches:"
spack buildcache list

# Workaround for limited disk space on macOS arm instance
spack config add "config:build_stage:/Users/ec2-user/spack-stack/spack-cache/build_stage"
spack config add "config:test_stage:/Users/ec2-user/spack-stack/spack-cache/test_stage"
spack config add "config:source_cache:/Users/ec2-user/spack-stack/spack-cache/source_cache"
spack config add "config:misc_cache:/Users/ec2-user/spack-stack/spack-cache/misc_cache"

# Break installation up in pieces and create build caches in between
# This allows us to "spin up" builds that altogether take longer than
# six hours, and/or fail later in the build process.
Expand Down
16 changes: 11 additions & 5 deletions configs/common/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@
lapack: [openblas]
yacc: [bison]
#
# This version of awscli goes with [email protected]
awscli:
version: ['1.29.41']
bacio:
version: ['1.27.84']
bacio:
version: ['2.4.1']
bison:
version: ['3.8.2']
# Attention - when updating also check orion site config
# Attention - when updating also check S4 site config
boost:
version: ['1.78.0']
variants: ~atomic +chrono +date_time +exception +filesystem ~graph ~iostreams ~locale ~log ~math ~mpi ~numpy +pic +program_options +python ~random +regex +serialization ~signals +system +test +thread +timer ~wave cxxstd=17 visibility=hidden
Expand Down Expand Up @@ -137,8 +138,12 @@
version: ['0.2.5']
mapl:
# 2.35.2 goes with [email protected], 2.40.3 goes with [email protected]
# turn off ~pflogger and extdata2g to avoid compilation
# errors with [email protected]+, see
# https://github.com/JCSDA/spack-stack/issues/769
# also: ... extdata2g segfault UFS?
version: ['2.35.2']
variants: ~shared
variants: ~shared ~extdata2g ~pflogger
# If making changes here, also check the Discover site config and the CI workflows
met:
version: ['11.1.0']
Expand Down Expand Up @@ -260,8 +265,9 @@
# Versions earlier than 0.11.0 don't compile on macOS with llvm-clang/13.0.0 and Python/3.9,
# and 0.11.0 leads to downstream errors in py-scipy with the Intel compilers
version: ['0.12.2']
# This version of py-pyyaml goes with [email protected]
py-pyyaml:
version: ['6.0']
version: ['5.4.1']
py-scipy:
version: ['1.9.3']
# Pin the py-setuptools version to avoid duplicate Python packages
Expand Down
2 changes: 2 additions & 0 deletions configs/sites/hercules/modules.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ modules:
lmod:
exclude:
- ecflow
include:
- python
37 changes: 0 additions & 37 deletions configs/sites/hercules/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@ packages:
prefix: /work/noaa/epic/role-epic/spack-stack/hercules/openmpi-4.1.5/gcc-11.3.1
modules:
- openmpi/4.1.5
python:
buildable: False
externals:
- spec: [email protected] #+bz2+crypt+ctypes+dbm+lzma~nis+pyexpat~pythoncmd+readline+sqlite3+ssl~tix~tkinter+uuid+zlib
prefix: /usr

### Modifications of common packages
# Version 2.0.8 doesn't compile on Hercules
Expand All @@ -44,15 +39,6 @@ packages:
externals:
- spec: [email protected]
prefix: /usr
bison:
externals:
- spec: [email protected]
prefix: /usr
# Do not use!
#cmake:
# externals:
# - spec: [email protected]
# prefix: /usr
coreutils:
externals:
- spec: [email protected]
Expand Down Expand Up @@ -121,17 +107,6 @@ packages:
externals:
- spec: [email protected]
prefix: /usr
# Do not use, can lead to duplicate packages being built
#openssl:
# buildable: False
# externals:
# - spec: [email protected]
# prefix: /usr
# Do not use, incomplete package (missing FindBin for example)
#perl:
# externals:
# - spec: [email protected]~cpanm+shared+threads
# prefix: /usr
pkgconf:
externals:
- spec: [email protected]
Expand All @@ -146,11 +121,6 @@ packages:
externals:
- spec: [email protected]
prefix: /usr
# Do not use, problems on compute nodes with Intel
#tar:
# externals:
# - spec: [email protected]
# prefix: /usr
texinfo:
externals:
- spec: [email protected]
Expand All @@ -159,10 +129,3 @@ packages:
externals:
- spec: [email protected]
prefix: /usr
# Do not use external zlib; causes issues with tar due to qt/zlib dependencies
# zlib:
# externals:
# - spec: [email protected]
# prefix: /apps/spack-managed/gcc-11.3.1/zlib-1.2.13-ltp4c3zzde3zi3gf7x4b7c7nj5ww4i4g
# modules:
# - zlib/1.2.13
4 changes: 2 additions & 2 deletions configs/sites/narwhal/mirrors.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
mirrors:
local-source:
fetch:
url: file:///p/app/projects/NEPTUNE/spack-stack/spack-stack-v1/source-cache
url: file:///p/app/projects/NEPTUNE/spack-stack/source-cache
access_pair:
- null
- null
access_token: null
profile: null
endpoint_url: null
push:
url: file:///p/app/projects/NEPTUNE/spack-stack/spack-stack-v1/source-cache
url: file:///p/app/projects/NEPTUNE/spack-stack/source-cache
access_pair:
- null
- null
Expand Down
2 changes: 2 additions & 0 deletions configs/sites/narwhal/modules.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ modules:
tcl:
exclude:
- ecflow
include:
- python
18 changes: 0 additions & 18 deletions configs/sites/narwhal/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,6 @@ packages:
# prefix: /opt/intel/oneapi_2021.3.0.3219
# modules:
# - intel/2021.3.0
python:
buildable: False
externals:
- spec: [email protected]+bz2+ctypes+dbm+lzma+nis+pyexpat+pythoncmd+readline+sqlite3+ssl+tix+tkinter+uuid+zlib
prefix: /opt/cray/pe/python/3.9.7.1
modules:
- cray-python/3.9.7.1
py-pip:
buildable: False
externals:
- spec: [email protected]
prefix: /opt/cray/pe/python/3.9.7.1
modules:
- cray-python/3.9.7.1

### All other external packages listed alphabetically
autoconf:
Expand All @@ -55,10 +41,6 @@ packages:
externals:
- spec: [email protected]
prefix: /usr
bison:
externals:
- spec: [email protected]
prefix: /usr
curl:
externals:
- spec: [email protected]+gssapi+ldap+nghttp2
Expand Down
2 changes: 2 additions & 0 deletions configs/sites/orion/modules.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ modules:
lmod:
exclude:
- ecflow
include:
- python
35 changes: 2 additions & 33 deletions configs/sites/orion/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,25 +28,8 @@ packages:
prefix: /apps/gcc-10.2.0/openmpi-4.0.4/openmpi-4.0.4
modules:
- openmpi/4.0.4
python:
buildable: False
externals:
- spec: [email protected]
prefix: /work/noaa/da/jedipara/spack-stack/miniconda-3.9.7
modules:
- miniconda/3.9.7
py-pip:
buildable: False
externals:
- spec: [email protected]
prefix: /work/noaa/da/jedipara/spack-stack/miniconda-3.9.7
modules:
- miniconda/3.9.7

### Modifications of common packages
# Versions 1.73+ don't compile on orion (bootstrap.sh fails)
boost:
version:: ['1.72.0']

### All other external packages listed alphabetically
autoconf:
Expand All @@ -65,11 +48,6 @@ packages:
externals:
- spec: [email protected]
prefix: /usr
# Do not use, can lead to duplicate versions of nco being installed
#bison:
# externals:
# - spec: [email protected]
# prefix: /usr
bzip2:
externals:
- spec: [email protected]
Expand All @@ -78,7 +56,6 @@ packages:
externals:
- spec: [email protected]
prefix: /usr
# Don't use OS curl, doesn't support secure transfers
diffutils:
externals:
- spec: [email protected]
Expand All @@ -91,7 +68,7 @@ packages:
buildable: False
externals:
- spec: [email protected]+ui+static_boost
prefix: /work/noaa/da/role-da/spack-stack/ecflow-5.8.4
prefix: /work/noaa/epic/role-epic/spack-stack/orion/ecflow-5.8.4
modules:
- ecflow/5.8.4
file:
Expand Down Expand Up @@ -168,7 +145,7 @@ packages:
buildable: False
externals:
- spec: [email protected]
prefix: /work/noaa/da/role-da/spack-stack/mysql-8.0.31
prefix: /work/noaa/epic/role-epic/spack-stack/orion/mysql-8.0.31
modules:
- mysql/8.0.31
ncurses:
Expand All @@ -179,10 +156,6 @@ packages:
externals:
- spec: [email protected]
prefix: /usr
openssl:
externals:
- spec: [email protected]
prefix: /usr
perl:
externals:
- spec: [email protected]+cpanm+shared+threads
Expand All @@ -207,10 +180,6 @@ packages:
externals:
- spec: [email protected]
prefix: /usr
sqlite:
externals:
- spec: [email protected]~fts~functions+rtree
prefix: /usr
tar:
externals:
- spec: [email protected]
Expand Down
8 changes: 2 additions & 6 deletions doc/source/MaintainersSection.rst
Original file line number Diff line number Diff line change
Expand Up @@ -227,22 +227,18 @@ MSU Orion

On Orion, it is necessary to change the default ``umask`` from ``0027`` to ``0022`` so that users not in the group of the role account can still see and use the software stack. This can be done by running ``umask 022`` after logging into the role account.

miniconda
Follow the instructions in :numref:`Section %s <MaintainersSection_Miniconda>` to create a basic ``miniconda`` installation and associated modulefile for working with spack. Don't forget to log off and back on to forget about the conda environment.

ecflow
``ecFlow`` must be built manually using the GNU compilers and linked against a static ``boost`` library. After installing `miniconda`, and loading the following modules, follow the instructions in :numref:`Section %s <MaintainersSection_ecFlow>`. Note that the default/system ``qt@5`` can be used on Orion.

.. code-block:: console

module purge
module use /work/noaa/da/jedipara/spack-stack/modulefiles
module load miniconda/3.9.7
module load python/3.9.2
module load cmake/3.22.1
module load gcc/10.2.0

mysql
``mysql`` must be installed separately from ``spack`` using a binary tarball provided by the MySQL community. Follow the instructions in :numref:`Section %s <MaintainersSection_MySQL>` to install ``mysql`` in ``/work/noaa/da/role-da/spack-stack/mysql-8.0.31``.
``mysql`` must be installed separately from ``spack`` using a binary tarball provided by the MySQL community. Follow the instructions in :numref:`Section %s <MaintainersSection_MySQL>`.

.. _MaintainersSection_Hercules:

Expand Down
Loading
Loading