Skip to content

Commit ef32e8e

Browse files
authored
[feature/update_to_spack_v1] External zlib, external runtime libraries, MPI meta-modules updates, NRL site config updates round 2 of X (#1782)
This PR is for branch feature/update_to_spack_v1. spack-packages submodule update for Intel oneAPI FPP bug affecting NASA packages, to allow for external Intel oneAPI runtime libraries, for ESMF bug (linking to MPI C++ libraries) Numerous additional spack-packages updates from the authoritative repo (contributed by @AlexanderRichert-NOAA) Return control over zlib libraries to site configs (can be external or spack-built) Return control over runtime libraries to site configs (can be external or spack-built) Updates to MPI meta-modules: set correct compiler wrapper and backend environment variables, set additional environment variables that define the MPI install prefix NRL site config updates, second round (more to come in a follow-up PR)
1 parent dda49c1 commit ef32e8e

51 files changed

Lines changed: 623 additions & 2385 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.cfg‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
cxx: /opt/intel/oneapi/compiler/2024.2/bin/icpx
1313
fortran: /opt/intel/oneapi/compiler/2024.2/bin/ifx
1414
intel-oneapi-runtime:
15-
# LINK TO BUG REPORT HERE
16-
#buildable: false
15+
buildable: false
1716
externals:
1817
- spec: intel-oneapi-runtime@2024.2.0
1918
prefix: /opt/intel/oneapi

‎.github/workflows/ubuntu-ci-x86_64-oneapi.cfg‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
cxx: /opt/intel/oneapi/compiler/2024.2/bin/icpx
1313
fortran: /opt/intel/oneapi/compiler/2024.2/bin/ifort
1414
intel-oneapi-runtime:
15-
# LINK TO BUG REPORT HERE
16-
#buildable: false
15+
buildable: false
1716
externals:
1817
- spec: intel-oneapi-runtime@2024.2.0
1918
prefix: /opt/intel/oneapi

‎configs/common/packages.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,6 @@ packages:
123123
g2tmpl:
124124
require:
125125
- '@1.13.0'
126-
gcc-runtime:
127-
require:
128-
- '%gcc'
129126
# This version builds with Intel oneAPI compilers, newer/older versions don't
130127
gdal:
131128
require:

‎configs/common/packages_oneapi.yaml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,3 @@ packages:
4848
qt:
4949
require:
5050
- '%gcc'
51-
# Prevent issues with fault Intel libraries
52-
# when using tar etc by building zlib-api with gcc
53-
zlib:
54-
require:
55-
- '%gcc'
56-
zlib-ng:
57-
buildable: False

‎configs/sites/tier1/atlantis/compilers.yaml.old‎

Lines changed: 0 additions & 113 deletions
This file was deleted.

‎configs/sites/tier1/atlantis/packages.yaml‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
packages:
22
# Modification of common packages
3-
4-
## Pin py-torch to 2.5.1 to avoid build errors with 2.6.0
5-
#py-torch:
6-
# require:
7-
# - '@2.5.1'
3+
zlib-api:
4+
buildable: False
85

96
# All other packages listed alphabetically
107
autoconf:
@@ -74,11 +71,6 @@ packages:
7471
externals:
7572
- spec: openssh@8.0p1
7673
prefix: /usr
77-
# Can no longer use, issues with py-cryptography
78-
#openssl:
79-
# externals:
80-
# - spec: openssl@1.1.1k
81-
# prefix: /usr
8274
pkgconf:
8375
externals:
8476
- spec: pkgconf@1.4.2
@@ -103,7 +95,8 @@ packages:
10395
externals:
10496
- spec: wget@1.19.5
10597
prefix: /usr
106-
#zlib:
107-
# externals:
108-
# - spec: zlib@1.2.11
109-
# prefix: /usr
98+
zlib:
99+
buildable: False
100+
externals:
101+
- spec: zlib@1.2.11
102+
prefix: /usr

‎configs/sites/tier1/atlantis/packages_gcc-13.4.0.yaml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,14 @@ packages:
22
mpi:
33
buildable: False
44
require:
5-
- "openmpi@4.1.8"
5+
- openmpi@4.1.8
6+
gcc-runtime:
7+
buildable: False
8+
externals:
9+
- spec: gcc-runtime@13.4.0%gcc@13.4.0
10+
prefix: /gpfs/neptune/spack-stack/gcc-13.4.0
611
gcc:
12+
buildable: False
713
externals:
814
- spec: gcc@13.4.0 languages:='c,c++,fortran'
915
prefix: /gpfs/neptune/spack-stack/gcc-13.4.0
@@ -14,11 +20,8 @@ packages:
1420
c: /gpfs/neptune/spack-stack/gcc-13.4.0/bin/gcc
1521
cxx: /gpfs/neptune/spack-stack/gcc-13.4.0/bin/g++
1622
fortran: /gpfs/neptune/spack-stack/gcc-13.4.0/bin/gfortran
17-
gcc-runtime:
18-
externals:
19-
- spec: gcc-runtime@13.4.0%gcc@13.4.0
20-
prefix: /gpfs/neptune/spack-stack/gcc-13.4.0
2123
openmpi:
24+
buildable: False
2225
externals:
2326
- spec: openmpi@4.1.8
2427
prefix: /gpfs/neptune/spack-stack/openmpi-4.1.8/gcc-13.4.0
Lines changed: 28 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
11
packages:
22
mpi:
3-
buildable: False
3+
buildable: false
44
require:
5-
- "intel-oneapi-mpi@2021.13"
6-
intel-oneapi-compilers:
5+
- intel-oneapi-mpi@2021.13
6+
intel-oneapi-runtime:
7+
buildable: false
78
externals:
8-
- spec: intel-oneapi-compilers@2024.2.1
9+
- spec: intel-oneapi-runtime@2024.2.1
910
prefix: /cm/shared/apps/intel/oneapi-2024.2.1
1011
modules:
1112
- intel-oneapi-2024.2.1
1213
- tbb/2021.13
1314
- compiler-rt/2024.2.1
14-
- compiler/2024.2.1
15+
intel-oneapi-compilers:
16+
buildable: false
17+
externals:
18+
- spec: intel-oneapi-compilers@2024.2.1
19+
prefix: /cm/shared/apps/intel/oneapi-2024.2.1
20+
modules:
21+
- intel-oneapi-2024.2.1
1522
extra_attributes:
1623
compilers:
1724
c: /cm/shared/apps/intel/oneapi-2024.2.1/compiler/2024.2/bin/icx
@@ -24,39 +31,13 @@ packages:
2431
extra_rpaths:
2532
- /cm/local/apps/gcc/11.2.0/lib64
2633
- /cm/local/apps/gcc/11.2.0/lib
27-
intel-oneapi-mpi:
28-
buildable: false
29-
externals:
30-
- spec: intel-oneapi-mpi@2021.13%oneapi@2024.2.1
31-
prefix: /cm/shared/apps/intel/oneapi-2024.2.1
32-
modules:
33-
- mpi/2021.13
34-
- slurm
35-
intel-oneapi-mkl:
36-
buildable: false
37-
externals:
38-
- spec: intel-oneapi-mkl@2024.2
39-
prefix: /cm/shared/apps/intel/oneapi-2024.2.1
40-
modules:
41-
- mkl/2024.2
42-
intel-oneapi-tbb:
34+
gcc-runtime:
4335
buildable: false
4436
externals:
45-
- spec: intel-oneapi-tbb@2021.13
46-
prefix: /cm/shared/apps/intel/oneapi-2024.2.1
47-
modules:
48-
- tbb/2021.13
49-
intel-oneapi-runtime:
50-
# LINK TO BUG REPORT HERE
51-
#buildable: false
52-
externals:
53-
- spec: intel-oneapi-runtime@2024.2.1%oneapi@2024.2.1
54-
prefix: /cm/shared/apps/intel/oneapi-2024.2.1
55-
modules:
56-
- intel-oneapi-2024.2.1
57-
- tbb/2021.13
58-
- compiler-rt/2024.2.1
37+
- spec: gcc-runtime@11.2.0
38+
prefix: /cm/local/apps/gcc/11.2.0
5939
gcc:
40+
buildable: false
6041
externals:
6142
- spec: gcc@11.2.0 languages:='c,c++'
6243
prefix: /cm/local/apps/gcc/11.2.0
@@ -65,7 +46,16 @@ packages:
6546
c: /cm/local/apps/gcc/11.2.0/bin/gcc
6647
cxx: /cm/local/apps/gcc/11.2.0/bin/g++
6748
fortran: /cm/local/apps/gcc/11.2.0/bin/gfortran
68-
gcc-runtime:
49+
intel-oneapi-mpi:
50+
buildable: false
6951
externals:
70-
- spec: gcc-runtime@11.2.0%gcc@11.2.0
71-
prefix: /cm/local/apps/gcc/11.2.0
52+
- spec: intel-oneapi-mpi@2021.13
53+
prefix: /cm/shared/apps/intel/oneapi-2024.2.1
54+
modules:
55+
- mpi/2021.13
56+
- slurm
57+
intel-oneapi-mkl:
58+
buildable: false
59+
externals:
60+
- spec: intel-oneapi-mkl@2024.2
61+
prefix: /cm/shared/apps/intel/oneapi-2024.2.1

‎configs/sites/tier1/atlantis/packages_oneapi.yaml.notyetupdated‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎configs/sites/tier1/blueback/compilers.gcc-direct.tmp‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)