Skip to content

Commit

Permalink
Update site configs for Atlantis, Narwhal, Nautilus (JCSDA#1266)
Browse files Browse the repository at this point in the history
This PR updates the site configs for Atlantis, Narwhal, Nautilus, and also the instructions for Narwhal on how to build and use new environments. Notable changes:

Atlantis: Remove external openssl, issues with py-cryptography
Narwhal: Update cray-libsci for Intel, and configure GNU without Cray wrappers
Nautilus: Use intel-oneapi-mkl as linalg provider with GNU because of problems with using openblas in downstream applications (ELF load command address/offset not properly aligned when loading libopenblas.so; https://github.com/OpenMathLib/OpenBLAS/wiki/Faq#ELFoffset)
  • Loading branch information
climbfuji authored Aug 22, 2024
1 parent cee10bb commit 4a95ab5
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 12 deletions.
9 changes: 5 additions & 4 deletions configs/sites/tier1/atlantis/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,11 @@ packages:
externals:
- spec: [email protected]+lex
prefix: /usr
openssl:
externals:
- spec: [email protected]
prefix: /usr
# Can no longer use, issues with py-cryptography
#openssl:
# externals:
# - spec: [email protected]
# prefix: /usr
gawk:
externals:
- spec: [email protected]
Expand Down
13 changes: 8 additions & 5 deletions configs/sites/tier1/narwhal/compilers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,30 @@ compilers::
modules:
- PrgEnv-intel/8.3.3
- intel-classic/2023.2.0
- cray-libsci/23.05.1.4
- libfabric/1.12.1.2.2.1
environment:
prepend_path:
PATH: '/opt/cray/pe/gcc/10.3.0/snos/bin'
CPATH: '/opt/cray/pe/gcc/10.3.0/snos/include'
LD_LIBRARY_PATH: '/opt/cray/libfabric/1.12.1.2.2.1/lib64:/opt/cray/pe/libsci/22.11.1.2/INTEL/19.0/x86_64/lib:/opt/cray/pe/gcc/10.3.0/snos/lib:/opt/cray/pe/gcc/10.3.0/snos/lib64'
LD_LIBRARY_PATH: '/opt/cray/libfabric/1.12.1.2.2.1/lib64:/opt/cray/pe/libsci/23.05.1.4/INTEL/2022.2/x86_64/lib:/opt/cray/pe/gcc/10.3.0/snos/lib:/opt/cray/pe/gcc/10.3.0/snos/lib64'
set:
CRAYPE_LINK_TYPE: 'dynamic'
extra_rpaths: []
- compiler:
spec: [email protected]
paths:
cc: cc
cxx: CC
f77: ftn
fc: ftn
cc: /opt/cray/pe/gcc/10.3.0/bin/gcc
cxx: /opt/cray/pe/gcc/10.3.0/bin/g++
f77: /opt/cray/pe/gcc/10.3.0/bin/gfortran
fc: /opt/cray/pe/gcc/10.3.0/bin/gfortran
flags: {}
operating_system: sles15
modules:
- PrgEnv-gnu/8.3.3
- gcc/10.3.0
- cray-libsci/22.11.1.2
- libfabric/1.12.1.2.2.1
environment:
prepend_path:
LD_LIBRARY_PATH: '/opt/cray/libfabric/1.12.1.2.2.1/lib64:/opt/cray/pe/libsci/22.11.1.2/GNU/9.1/x86_64/lib'
Expand Down
2 changes: 1 addition & 1 deletion configs/sites/tier1/narwhal/packages_gcc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ packages:
buildable: False
cray-mpich:
externals:
- spec: [email protected]%[email protected] ~wrappers
- spec: [email protected]%[email protected] +wrappers
modules:
- cray-mpich-ucx/8.1.21
- craype-network-ucx
20 changes: 20 additions & 0 deletions configs/sites/tier1/nautilus/packages_gcc.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
packages:
# On Nautilus, use intel-oneapi-mkl as provider
# for blas, lapack, fftw-api with GNU because of
# problems using openblas in downstream applications
# (e.g. py-pandas):
# ELF load command address/offset not properly aligned" when loading libopenblas.so
# https://github.com/OpenMathLib/OpenBLAS/wiki/Faq#ELFoffset
all:
compiler:: [[email protected]]
providers:
mpi:: [[email protected]]
blas:: [intel-oneapi-mkl]
fftw-api:: [intel-oneapi-mkl]
lapack:: [intel-oneapi-mkl]
mpi:
buildable: False
openmpi:
Expand All @@ -12,3 +21,14 @@ packages:
modules:
- penguin/openmpi/5.0.1/gcc-8.5.0
- slurm
openblas:
buildable: False
ectrans:
require::
- '@1.2.0 +mkl ~fftw'
gsibec:
require::
- '@1.2.1 +mkl'
py-numpy:
require::
- '@:1.25 ^intel-oneapi-mkl'
12 changes: 10 additions & 2 deletions doc/source/PreConfiguredSites.rst
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,12 @@ With Intel, the following is required for building new spack environments and fo
module unload intel
module load intel-classic/2023.2.0
module unload cray-mpich
module load cray-mpich/8.1.21
module unload craype-network-ofi
module load craype-network-ucx
module load cray-mpich-ucx/8.1.21
module load libfabric/1.12.1.2.2.1
module unload cray-libsci
module load cray-libsci/23.05.1.4
THIS SECTION IS OUT OF DATE, REFER TO 1.7.0 RELEASE DOCUMENTATION - - For ``spack-stack-1.7.0`` with Intel, proceed with loading the following modules:

Expand All @@ -279,8 +283,12 @@ With GNU, the following is required for building new spack environments and for
module unload gcc
module load gcc/10.3.0
module unload cray-mpich
module load cray-mpich/8.1.21
module unload craype-network-ofi
module load craype-network-ucx
module load cray-mpich-ucx/8.1.21
module load libfabric/1.12.1.2.2.1
module unload cray-libsci
module load cray-libsci/22.11.1.2
THIS SECTION IS OUT OF DATE, REFER TO 1.7.0 RELEASE DOCUMENTATION - For ``spack-stack-1.7.0`` with GNU, proceed with loading the following modules:

Expand Down

0 comments on commit 4a95ab5

Please sign in to comment.