Skip to content

Commit 01aeb00

Browse files
ocaisaocaisa
authored
Merge branch 'main' into gmsh-4.15.0
2 parents 081f8a7 + 3978110 commit 01aeb00

10 files changed

Lines changed: 336 additions & 84 deletions

‎.github/workflows/test-software.eessi.io.yml‎

Lines changed: 27 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -10,62 +10,28 @@ permissions:
1010
env:
1111
# list below should correspond with table @ https://eessi.io/docs/software_layer/gpu_targets/
1212
EESSI_ACCELERATOR_TARGETS: |
13-
# Arm (except A64FX)
14-
aarch64/generic:
15-
- nvidia/cc70
16-
- nvidia/cc80
17-
- nvidia/cc90
18-
aarch64/neoverse_n1:
19-
- nvidia/cc70
20-
- nvidia/cc80
21-
- nvidia/cc90
22-
aarch64/neoverse_v1:
23-
- nvidia/cc70
24-
- nvidia/cc80
25-
- nvidia/cc90
26-
aarch64/nvidia/grace:
27-
- nvidia/cc70
28-
- nvidia/cc80
29-
- nvidia/cc90
30-
# x86 generic
31-
x86_64/generic:
32-
- nvidia/cc70
33-
- nvidia/cc80
34-
- nvidia/cc90
35-
# AMD
36-
x86_64/amd/zen2:
37-
- nvidia/cc70
38-
- nvidia/cc80
39-
- nvidia/cc90
40-
x86_64/amd/zen3:
41-
- nvidia/cc70
42-
- nvidia/cc80
43-
- nvidia/cc90
44-
x86_64/amd/zen4:
45-
- nvidia/cc70
46-
- nvidia/cc80
47-
- nvidia/cc90
48-
# Intel
49-
x86_64/intel/haswell:
50-
- nvidia/cc70
51-
- nvidia/cc80
52-
- nvidia/cc90
53-
x86_64/intel/sapphirerapids:
54-
- nvidia/cc70
55-
- nvidia/cc80
56-
- nvidia/cc90
57-
x86_64/intel/skylake_avx512:
58-
- nvidia/cc70
59-
- nvidia/cc80
60-
- nvidia/cc90
61-
x86_64/intel/icelake:
62-
- nvidia/cc70
63-
- nvidia/cc80
64-
- nvidia/cc90
65-
x86_64/intel/cascadelake:
66-
- nvidia/cc70
67-
- nvidia/cc80
68-
- nvidia/cc90
13+
2023.06:
14+
# Provide a default set of compute capabilities
15+
default:
16+
- nvidia/cc70
17+
- nvidia/cc80
18+
- nvidia/cc90
19+
# and then allow for special cases for specific architectures
20+
x86_64/amd/zen2:
21+
- nvidia/cc70
22+
- nvidia/cc80
23+
- nvidia/cc90
24+
aarch64/a64fx: []
25+
2025.06:
26+
# Provide a default set of compute capabilities
27+
default:
28+
- nvidia/cc70
29+
- nvidia/cc80
30+
- nvidia/cc90
31+
- nvidia/cc100
32+
- nvidia/cc120
33+
# and then allow for special cases for specific architectures
34+
aarch64/a64fx: []
6935
jobs:
7036
check_missing:
7137
strategy:
@@ -139,6 +105,9 @@ jobs:
139105
- runs_on: ubuntu-24.04
140106
EESSI_VERSION: 2025.06
141107
EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/amd/zen4
108+
- runs_on: ubuntu-24.04
109+
EESSI_VERSION: 2025.06
110+
EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/amd/zen5
142111
- runs_on: ubuntu-24.04
143112
EESSI_VERSION: 2025.06
144113
EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/haswell
@@ -209,8 +178,8 @@ jobs:
209178
done
210179
211180
# now check the accelerator builds for this CPU target
212-
accelerators=$(echo "${EESSI_ACCELERATOR_TARGETS}" | yq ".${EESSI_SOFTWARE_SUBDIR_OVERRIDE}[]")
213-
if [ -z ${accelerators} ]; then
181+
accelerators=$(echo "${EESSI_ACCELERATOR_TARGETS}" | yq ".\"${{matrix.EESSI_VERSION}}\".\"${EESSI_SOFTWARE_SUBDIR_OVERRIDE}\" // .\"${{matrix.EESSI_VERSION}}\".default | .[]")
182+
if [ -z "${accelerators}" ]; then
214183
echo "no accelerator targets defined for ${EESSI_SOFTWARE_SUBDIR_OVERRIDE}"
215184
else
216185
for accel in ${accelerators}; do

‎.github/workflows/test_compare_stacks.yml‎

Lines changed: 40 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,39 +9,53 @@ permissions:
99
contents: read # to fetch code (actions/checkout)
1010
env:
1111
CUDA_COMPUTE_CAPABILITIES_YAML: |
12-
# Provide a default set of compute capabilities
13-
default:
14-
- cc70
15-
- cc80
16-
- cc90
17-
# and then allow for special cases for specific architectures
18-
x86_64/amd/zen2:
19-
- cc70
20-
- cc80
21-
- cc90
22-
aarch64/a64fx: []
12+
2023.06:
13+
# Provide a default set of compute capabilities
14+
default:
15+
- cc70
16+
- cc80
17+
- cc90
18+
# and then allow for special cases for specific architectures
19+
x86_64/amd/zen2:
20+
- cc70
21+
- cc80
22+
- cc90
23+
aarch64/a64fx: []
24+
2025.06:
25+
# Provide a default set of compute capabilities
26+
default:
27+
- cc70
28+
- cc80
29+
- cc90
30+
- cc100
31+
- cc120
32+
aarch64/a64fx: []
2333
jobs:
2434
compare_stacks:
2535
runs-on: ubuntu-24.04
2636
strategy:
2737
fail-fast: false
2838
matrix:
2939
EESSI_VERSION:
30-
- 2023.06
31-
- 2025.06
40+
- 2023.06
41+
- 2025.06
3242
COMPARISON_ARCH:
33-
- aarch64/a64fx
34-
- aarch64/neoverse_n1
35-
- aarch64/neoverse_v1
36-
- aarch64/nvidia/grace
37-
- x86_64/amd/zen2
38-
- x86_64/amd/zen3
39-
- x86_64/amd/zen4
40-
- x86_64/intel/haswell
41-
- x86_64/intel/skylake_avx512
42-
- x86_64/intel/sapphirerapids
43-
- x86_64/intel/icelake
44-
- x86_64/intel/cascadelake
43+
- aarch64/a64fx
44+
- aarch64/neoverse_n1
45+
- aarch64/neoverse_v1
46+
- aarch64/nvidia/grace
47+
- x86_64/amd/zen2
48+
- x86_64/amd/zen3
49+
- x86_64/amd/zen4
50+
- x86_64/amd/zen5
51+
- x86_64/intel/haswell
52+
- x86_64/intel/skylake_avx512
53+
- x86_64/intel/sapphirerapids
54+
- x86_64/intel/icelake
55+
- x86_64/intel/cascadelake
56+
exclude:
57+
- EESSI_VERSION: 2023.06
58+
COMPARISON_ARCH: x86_64/amd/zen5
4559
# Example of how a specific target can be excluded:
4660
# exclude:
4761
# - EESSI_VERSION: 2023.06
@@ -65,7 +79,7 @@ jobs:
6579
# (which assumes the structure /cvmfs/software.eessi.io/versions/2023.06/software/linux/$COMPARISON_ARCH/accel/nvidia/$cc/modules/all)
6680
6781
# Parse the yaml that makes the compute capabilities arch-dependent
68-
CUDA_COMPUTE_CAPABILITIES=$(echo "${CUDA_COMPUTE_CAPABILITIES_YAML}" | yq ".\"${{matrix.COMPARISON_ARCH}}\" // .default | .[]" | tr '\n' ' ')
82+
CUDA_COMPUTE_CAPABILITIES=$(echo "${CUDA_COMPUTE_CAPABILITIES_YAML}" | yq ".\"${{matrix.EESSI_VERSION}}\".\"${{matrix.COMPARISON_ARCH}}\" // .\"${{matrix.EESSI_VERSION}}\".default | .[]" | tr '\n' ' ')
6983
export CUDA_COMPUTE_CAPABILITIES=${CUDA_COMPUTE_CAPABILITIES%% } # trim trailing space
7084
7185
.github/workflows/scripts/compare_to_generic.sh ${EESSI_PREFIX}/software/${EESSI_OS_TYPE} ${{matrix.COMPARISON_ARCH}}

‎easystacks/software.eessi.io/2025.06/accel/nvidia/eessi-2025.06-eb-5.2.0-2024a.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
easyconfigs:
2+
- UCX-CUDA-1.16.0-GCCcore-13.3.0-CUDA-12.6.0.eb:
3+
- NCCL-2.22.3-GCCcore-13.3.0-CUDA-12.6.0.eb:
4+
options:
5+
cuda-sanity-check-accept-missing-ptx: True
6+
- UCC-CUDA-1.3.0-GCCcore-13.3.0-CUDA-12.6.0.eb:
7+
- OSU-Micro-Benchmarks-7.5-gompi-2024a-CUDA-12.6.0.eb:

‎easystacks/software.eessi.io/2025.06/accel/nvidia/eessi-2025.06-eb-5.2.1-001-system.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
easyconfigs:
2+
- CUDA-12.9.1.eb:
3+
options:
4+
accept-eula-for: CUDA
5+
- cuDNN-9.15.0.57-CUDA-12.9.1.eb:
6+
options:
7+
accept-eula-for: cuDNN
8+
cuda-sanity-check-accept-missing-ptx: True

‎easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.2.1-2025a.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,12 @@ easyconfigs:
1414
# use -fno-tree-ter to work around compiler crash
1515
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/25466
1616
from-commit: b34ccbbec1027990a0fd49573287fc74b7580f43
17+
- netCDF-4.9.3-gompi-2025a.eb:
18+
options:
19+
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/25490
20+
from-commit: 5af71d7a638be23b0abebe84afb52ba79894bddf
21+
# see https://github.com/easybuilders/easybuild-easyblocks/pull/4086
22+
include-easyblocks-from-commit: df3ca300d7f9193241e6bee2be3d58b103323725
23+
- PyQt6-6.9.1-GCCcore-14.2.0.eb
24+
- VisPy-0.15.2-gfbf-2025a.eb
1725
- gmsh-4.15.0-foss-2025a.eb

‎easystacks/software.eessi.io/2025.06/eessi-2025.06-eb-5.2.1-2025b.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,9 @@ easyconfigs:
1212
options:
1313
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/25365
1414
from-commit: 7e74f85c32686a6c456d4978430de35751d6cefd
15+
- netCDF-4.9.3-gompi-2025b.eb:
16+
options:
17+
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/25490
18+
from-commit: 5af71d7a638be23b0abebe84afb52ba79894bddf
19+
# see https://github.com/easybuilders/easybuild-easyblocks/pull/4086
20+
include-easyblocks-from-commit: df3ca300d7f9193241e6bee2be3d58b103323725

‎easystacks/software.eessi.io/2025.06/rebuilds/20260306-eb-5.2.1-FFmpeg-zen5.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# rebuild FFmpeg to pick up on additional dependencies that were added,
2+
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/24901
3+
easyconfigs:
4+
- FFmpeg-7.0.2-GCCcore-13.3.0.eb
5+
- FFmpeg-7.1.1-GCCcore-14.2.0.eb

‎easystacks/software.eessi.io/2025.06/zen5/accel/nvidia/eessi-2025.06-eb-5.2.0-001-system.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
easyconfigs:
2+
- CUDA-12.6.0.eb:
3+
options:
4+
accept-eula-for: CUDA
5+
- CUDA-12.8.0.eb:
6+
options:
7+
accept-eula-for: CUDA
8+
- cuDNN-9.5.0.50-CUDA-12.6.0.eb:
9+
options:
10+
accept-eula-for: cuDNN
11+
cuda-sanity-check-accept-missing-ptx: True
12+
- cuDNN-9.10.1.4-CUDA-12.8.0.eb:
13+
options:
14+
accept-eula-for: cuDNN
15+
cuda-sanity-check-accept-missing-ptx: True

0 commit comments

Comments
 (0)