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

November 2023 main Spack merge + updates #884

Merged
merged 59 commits into from
Dec 7, 2023
Merged
Show file tree
Hide file tree
Changes from 58 commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
073f814
Set up submodule for testing
AlexanderRichert-NOAA Nov 16, 2023
963460b
try removing openssl default version
AlexanderRichert-NOAA Nov 16, 2023
9a6c6bf
Remove some defaults to clear up duplicates
AlexanderRichert-NOAA Nov 17, 2023
4cc3cf3
update default prod-util
AlexanderRichert-NOAA Nov 17, 2023
662cb3e
use new deprecated_io variant name for fms
AlexanderRichert-NOAA Nov 17, 2023
0b8f076
submodule update
AlexanderRichert-NOAA Nov 20, 2023
e29b15f
submodule pointer (libdap4 update)
AlexanderRichert-NOAA Nov 21, 2023
6408d4a
submodule pointer (libxpm update)
AlexanderRichert-NOAA Nov 21, 2023
377881d
submodule pointer
AlexanderRichert-NOAA Nov 21, 2023
7cc9b16
add _8 precision variants for w3emc, sp, ip
AlexanderRichert-NOAA Nov 21, 2023
1fbc677
submodule pointer
AlexanderRichert-NOAA Nov 21, 2023
a7aabe7
submodule pointer
AlexanderRichert-NOAA Nov 21, 2023
68da01f
submodule pointer (gmake fix)
AlexanderRichert-NOAA Nov 21, 2023
c3e7d5c
mysql: set download_boost as default
AlexanderRichert-NOAA Nov 21, 2023
8d33659
submodule pointer (mysql update)
AlexanderRichert-NOAA Nov 21, 2023
4525443
submodule pointer (merge jcsda_emc_spack_stack)
AlexanderRichert-NOAA Nov 21, 2023
458572a
fiddling with submodule
AlexanderRichert-NOAA Nov 21, 2023
f0640ad
Merge remote-tracking branch 'jcsda/develop' into nov2023_spackmerge
AlexanderRichert-NOAA Nov 21, 2023
f146a26
point submodule back to test repo
AlexanderRichert-NOAA Nov 21, 2023
b04cdf0
submodule pointer (lmod.py fix)
AlexanderRichert-NOAA Nov 21, 2023
d496370
submodule pointer (containers __init__.py fix)
AlexanderRichert-NOAA Nov 21, 2023
aef9bbb
pin gettext version because of intel (ubuntu CI) issue (one-arg stati…
AlexanderRichert-NOAA Nov 21, 2023
ee7a96a
fix macos-ci-aarch64.yaml (buildcache build-env call)
AlexanderRichert-NOAA Nov 22, 2023
d8e18a1
fix ci (buildcache calls)
AlexanderRichert-NOAA Nov 22, 2023
ea55f96
Update submodule pointer for spack
climbfuji Nov 22, 2023
db71994
Update submodule pointer for spack
climbfuji Nov 22, 2023
3a4c991
Trigger CI
climbfuji Nov 23, 2023
63a608c
submodule pointer (revert prebuilt aws; add rust-bootstrap for py-cry…
AlexanderRichert-NOAA Nov 29, 2023
c3cce38
set py-cryptography+rust_bootstrap by default
AlexanderRichert-NOAA Nov 29, 2023
88a181f
remove openssl version setting
AlexanderRichert-NOAA Nov 29, 2023
e087963
submodule pointer
AlexanderRichert-NOAA Nov 29, 2023
df51b66
remove py-crypto version setting
AlexanderRichert-NOAA Nov 29, 2023
e2e3b1d
use rust-bootstrap for py-setuptools-rust
AlexanderRichert-NOAA Nov 29, 2023
ab7b0cf
submodule pointer
AlexanderRichert-NOAA Nov 30, 2023
cedf950
pin py-numpy version
AlexanderRichert-NOAA Nov 30, 2023
199a93b
test numpy build (revert this commit)
AlexanderRichert-NOAA Nov 30, 2023
2f9b718
Revert "test numpy build (revert this commit)"
AlexanderRichert-NOAA Nov 30, 2023
e1cfc21
re-pin py-setuptools version
AlexanderRichert-NOAA Nov 30, 2023
9963f47
debug (revert this commit)
AlexanderRichert-NOAA Nov 30, 2023
a57f031
submodule pointer (hdf-eos2/apple-clang)
AlexanderRichert-NOAA Nov 30, 2023
e5588b4
Revert "debug (revert this commit)"
AlexanderRichert-NOAA Nov 30, 2023
d901856
submodule pointer (test hdf-eos2 tweak)
AlexanderRichert-NOAA Nov 30, 2023
793bad4
revert me
AlexanderRichert-NOAA Nov 30, 2023
65f8cce
Revert "revert me"
AlexanderRichert-NOAA Nov 30, 2023
c3d0116
Merge branch 'develop' into nov2023_spackmerge
AlexanderRichert-NOAA Dec 1, 2023
2ab5589
Merge branch 'develop' of https://github.com/jcsda/spack-stack into n…
climbfuji Dec 4, 2023
c8d7167
update rhel-emc packages.yaml (remove bison,python,llvm)
AlexanderRichert-NOAA Dec 5, 2023
96c85aa
Update variant ectrans for ecmwf-atlas to just trans
climbfuji Dec 5, 2023
88edf67
set zlib to be the provider of zlib-api in common/packages.yaml
AlexanderRichert-NOAA Dec 5, 2023
305414d
Bump sp to 2.5.0
climbfuji Dec 5, 2023
4c2b758
Merge branch 'nov2023_spackmerge' of https://github.com/AlexanderRich…
climbfuji Dec 5, 2023
bad3b9b
S4 site config update: remove external perl
climbfuji Dec 5, 2023
ba2743b
update submodule pointer (met fix)
AlexanderRichert-NOAA Dec 5, 2023
f8c3ad5
Update configs/sites/nautilus/packages.yaml
climbfuji Dec 5, 2023
6b78fc5
Update doc/source/KnownIssues.rst
climbfuji Dec 5, 2023
390cced
Update doc/source/KnownIssues.rst for Discover
climbfuji Dec 6, 2023
2362336
Pin patchelf version on Derecho to avoid build errors with Intel
climbfuji Dec 6, 2023
953ec46
Don't use external perl for Linux
climbfuji Dec 6, 2023
7a92ab7
Revert .gitmodules and update submodule pointer for spack
climbfuji Dec 7, 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
2 changes: 1 addition & 1 deletion .github/workflows/macos-ci-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ jobs:
# base-env
echo "base-env ..."
spack install --fail-fast --source --no-check-signature base-env 2>&1 | tee log.install.apple-clang-14.0.3.base-env
spack buildcache create -a -u /Users/ec2-user/spack-stack/build-cache/
spack buildcache create -a -u /Users/ec2-user/spack-stack/build-cache/ base-env

# the rest
echo "${{ inputs.template || 'unified-dev' }} ..."
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos-ci-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:
# base-env
echo "base-env ..."
spack install --fail-fast --source --no-check-signature base-env 2>&1 | tee log.install.apple-clang-14.0.0.base-env
spack buildcache create -a -u /Users/ec2-user/spack-stack/build-cache/
spack buildcache create -a -u /Users/ec2-user/spack-stack/build-cache/ base-env

# the rest
echo "${{ inputs.template || 'unified-dev' }} ..."
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu-ci-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ jobs:
# base-env
echo "base-env ..."
spack install --fail-fast --source --no-check-signature base-env 2>&1 | tee log.install.intel-2022.1.0.base-env
spack buildcache create -a -u /home/ubuntu/spack-stack/build-cache/
spack buildcache create -a -u /home/ubuntu/spack-stack/build-cache/ base-env

# the rest
echo "${{ inputs.template || 'unified-dev' }} ..."
Expand Down
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
path = spack
#url = https://github.com/spack/spack
#branch = develop
url = https://github.com/jcsda/spack
branch = jcsda_emc_spack_stack
url = https://github.com/AlexanderRichert-NOAA/spack
branch = nov2023_spackmerge
[submodule "doc/CMakeModules"]
path = doc/CMakeModules
url = https://github.com/noaa-emc/cmakemodules
Expand Down
30 changes: 17 additions & 13 deletions configs/common/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
jpeg: [libjpeg-turbo]
lapack: [openblas]
yacc: [bison]
zlib-api: [zlib]
#
# This version of awscli goes with [email protected]
awscli:
Expand Down Expand Up @@ -52,7 +53,7 @@
variants: linalg=eigen,lapack compression=lz4,bzip2
ecmwf-atlas:
version: ['0.35.0']
variants: +fckit +ectrans +tesselation +fftw
variants: +fckit +trans +tesselation +fftw
ectrans:
version: ['1.2.0']
variants: ~mkl +fftw
Expand Down Expand Up @@ -82,7 +83,7 @@
#version: ['2023.01']
#variants: precision=32,64 +quad_precision +gfs_phys +openmp +pic constants=GFS build_type=Release
version: ['2023.02.01']
climbfuji marked this conversation as resolved.
Show resolved Hide resolved
variants: precision=32,64 +quad_precision +gfs_phys +openmp +pic constants=GFS build_type=Release +use_fmsio
variants: precision=32,64 +quad_precision +gfs_phys +openmp +pic constants=GFS build_type=Release +deprecated_io
fontconfig:
variants: +pic
freetype:
Expand All @@ -93,6 +94,8 @@
version: ['1.6.4']
g2tmpl:
version: ['1.10.2']
gettext:
version: ['0.21.1']
gfsio:
version: ['1.4.1']
gftl-shared:
Expand All @@ -119,6 +122,7 @@
variants: +hl +fortran +mpi ~threadsafe +szip
ip:
version: ['4.3.0']
variants: precision=4,d,8
ip2:
version: ['1.1.2']
jasper:
Expand Down Expand Up @@ -152,6 +156,8 @@
version: ['5.1.0']
mpich:
variants: ~hwloc +two_level_namespace
mysql:
variants: +download_boost
AlexanderRichert-NOAA marked this conversation as resolved.
Show resolved Hide resolved
nco:
version: ['5.0.6']
variants: ~doc
Expand Down Expand Up @@ -189,7 +195,6 @@
variants: +internal-hwloc +two_level_namespace
# Pin openssl to avoid duplicate packages being built
openssl:
version: ['1.1.1u']
variants: +shared
p4est:
version: ['2.8']
Expand All @@ -204,7 +209,7 @@
pkgconf:
buildable: False
prod-util:
version: ['1.2.2']
version: ['2.1.0']
proj:
version: ['8.1.0']
variants: ~tiff
Expand All @@ -219,9 +224,8 @@
variants: +plotting
py-click:
version: ['8.0.3']
# Pin py-cryptography to a version earlier than 3.4 to avoid the rust dependency
py-cryptography:
version: ['3.3.2']
variants: +rust_bootstrap
py-eccodes:
version: ['1.4.2']
py-h5py:
Expand All @@ -237,8 +241,7 @@
version: ['1.5.8']
variants: ~mpi
py-numpy:
version: ['1.22.3']
variants: +blas +lapack
climbfuji marked this conversation as resolved.
Show resolved Hide resolved
require: ['@1.22.3']
py-pandas:
variants: +excel
# To avoid pip._vendor.pep517.wrappers.BackendInvalid errors with newer
Expand Down Expand Up @@ -266,10 +269,9 @@
version: ['1.9.3']
# Pin the py-setuptools version to avoid duplicate Python packages
py-setuptools:
version: ['59.4.0']
# Pin the py-setuptools-scm version to avoid duplicate Python packages
py-setuptools-scm:
version: ['7.0.5']
require: ['@63.4.3']
py-setuptools-rust:
variants: +rust_bootstrap
py-shapely:
version: ['1.8.0']
qt:
Expand All @@ -284,13 +286,15 @@
sigio:
version: ['2.3.2']
sp:
version: ['2.3.3']
version: ['2.5.0']
variants: precision=4,d,8
udunits:
version: ['2.2.28']
upp:
version: ['10.0.10']
w3emc:
version: ['2.10.0']
variants: precision=4,d,8
w3nco:
version: ['2.4.1']
wget:
Expand Down
4 changes: 2 additions & 2 deletions configs/containers/specs/jedi-ci.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
### spack-stack-1.5.1 / skylab-6.1.0 containers for fv3-jedi and mpas-jedi (but not for ufs-jedi)
specs: [[email protected], [email protected], [email protected], [email protected],
[email protected], [email protected], [email protected], [email protected], [email protected], [email protected], ecflow@5,
[email protected], [email protected] +fckit +ectrans +tesselation +fftw, [email protected], [email protected] +fftw,
[email protected], [email protected] +fckit +trans +tesselation +fftw, [email protected], [email protected] +fftw,
[email protected], [email protected], fms@release-jcsda, [email protected], [email protected], [email protected],
[email protected], [email protected], [email protected], [email protected], [email protected], [email protected],
[email protected], [email protected], [email protected], [email protected],
[email protected], [email protected], [email protected],
[email protected], [email protected], [email protected], [email protected],
[email protected], [email protected], [email protected],
[email protected], py-pip, [email protected], [email protected], [email protected], [email protected],
sp@2.3.3, [email protected], [email protected], [email protected], [email protected], [email protected], [email protected],
sp@2.5.0, [email protected], [email protected], [email protected], [email protected], [email protected], [email protected],
[email protected], [email protected], [email protected], shumlib@macos_clang_linux_intel_port,
[email protected], [email protected]]
# Notes:
Expand Down
3 changes: 3 additions & 0 deletions configs/sites/derecho/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ packages:
# Need to force spack to build python with ssl variant when using older openssl from OS
python:
require: "+ssl"
# Newer versions of patchelf (tested 0.18.0) don't build with Intel on Derecho
patchelf:
version:: ['0.17.2']

### All other external packages listed alphabetically
autoconf:
Expand Down
24 changes: 0 additions & 24 deletions configs/sites/emc-rhel/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ packages:
externals:
- spec: [email protected]
prefix: /usr
bison:
externals:
- spec: [email protected]
prefix: /usr
bzip2:
externals:
- spec: [email protected]
Expand Down Expand Up @@ -128,22 +124,6 @@ packages:
externals:
- spec: [email protected]
prefix: /usr
llvm:
externals:
- spec: [email protected]+clang~lld~lldb
prefix: /usr
extra_attributes:
compilers:
c: /usr/bin/clang
cxx: /usr/bin/clang++
llvm-doe:
externals:
- spec: [email protected]+clang~lld~lldb
prefix: /usr
extra_attributes:
compilers:
c: /usr/bin/clang
cxx: /usr/bin/clang++
m4:
externals:
- spec: [email protected]
Expand All @@ -156,10 +136,6 @@ packages:
externals:
- spec: [email protected]
prefix: /usr
python:
externals:
- spec: [email protected]+bz2+crypt+ctypes+dbm+lzma+nis+pyexpat~pythoncmd+readline+sqlite3+ssl+tix+tkinter+uuid+zlib
prefix: /usr
rsync:
externals:
- spec: [email protected]
Expand Down
2 changes: 1 addition & 1 deletion configs/sites/nautilus/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ packages:
fftw-api:: [intel-oneapi-mkl]
lapack:: [intel-oneapi-mkl]
ectrans:
variants:: +mkl
variants:: +mkl ~fftw
gsibec:
variants:: +mkl

Expand Down
4 changes: 0 additions & 4 deletions configs/sites/s4/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,6 @@ packages:
prefix: /data/prod/jedi/spack-stack/mysql-8.0.31
modules:
- mysql/8.0.31
perl:
externals:
- spec: [email protected]~cpanm+shared+threads
prefix: /usr
pkg-config:
externals:
- spec: [email protected]
Expand Down
8 changes: 8 additions & 0 deletions doc/source/KnownIssues.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ General

When using a role account to install spack-stack, it is sometimes necessary to run graphical applications such as the ``qt`` online installer. The following website describes in detail how this can be done: https://www.thegeekdiary.com/how-to-set-x11-forwarding-export-remote-display-for-users-who-switch-accounts-using-sudo/

7. ``==> Error: the key "core_compilers" must be set in modules.yaml`` during ``spack module [lmod|tcl] refresh``

This error usually indicates that the wrong module type is used in the ``spack module ... refresh`` command. For example, the system is configured for ``lmod``, but the command used is ``spack module tcl refresh``.

==============================
MSU Hercules
==============================
Expand All @@ -45,6 +49,10 @@ NASA Discover

Discover's connection to the outside world can be very slow and spack sometimes aborts with fetch timeouts. Try again until it works, sometimes have to wait for a bit.

2. ``configure: error: cannot guess build type; you must specify one`` when building ``freetype`` or other packages that use configure scripts

This can happen if a spack install is started in a ``screen`` session, because Discover puts the temporary data in directories like ``/gpfsm/dnb33/tdirs/login/discover13.29716.dheinzel``, which get wiped out after some time. Without ``screen``, this problem doesn't occur.

==============================
NOAA Parallel Works
==============================
Expand Down
1 change: 0 additions & 1 deletion doc/source/NewSiteConfigs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,6 @@ It is recommended to increase the stacksize limit by using ``ulimit -S -s unlimi
--exclude bison --exclude cmake \
--exclude curl --exclude openssl \
--exclude openssh
spack external find --scope system perl
spack external find --scope system wget
spack external find --scope system mysql
spack external find --scope system texlive
Expand Down
2 changes: 1 addition & 1 deletion spack
Submodule spack updated 2290 files
Loading