Skip to content

Commit ec0a508

Browse files
bedrogebedroge
committed
Merge branch '2023.06-software.eessi.io' of github.com:EESSI/software-layer into icelake_cclake_batch16
2 parents 826da7a + d4d07eb commit ec0a508

9 files changed

Lines changed: 33 additions & 11 deletions

File tree

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ jobs:
2727
EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/neoverse_n1
2828
- runs_on: ubuntu-24.04-arm
2929
EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/neoverse_v1
30+
- runs_on: ubuntu-24.04-arm
31+
EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/nvidia/grace
3032
# x86_64 CPU targets
3133
- runs_on: ubuntu-24.04
3234
EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/amd/zen2

‎easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.0.0-001-system.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
easyconfigs:
2+
- Nextflow-24.10.2.eb

‎easystacks/software.eessi.io/2023.06/icelake_cclake/036c-eb-4.9.0.yml‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,15 @@ easyconfigs:
4141
- /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/LibTIFF/4.6.0-GCCcore-13.2.0/easybuild/LibTIFF-4.6.0-GCCcore-13.2.0.eb:
4242
options:
4343
include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/LibTIFF/4.6.0-GCCcore-13.2.0/easybuild/reprod/easyblocks/*.py
44-
- /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/Pillow/10.2.0-GCCcore-13.2.0/easybuild/Pillow-10.2.0-GCCcore-13.2.0.eb:
44+
- /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/LittleCMS/2.15-GCCcore-13.2.0/easybuild/LittleCMS-2.15-GCCcore-13.2.0.eb:
4545
options:
46-
include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/Pillow/10.2.0-GCCcore-13.2.0/easybuild/reprod/easyblocks/*.py
46+
include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/LittleCMS/2.15-GCCcore-13.2.0/easybuild/reprod/easyblocks/*.py
47+
- /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/giflib/5.2.1-GCCcore-13.2.0/easybuild/giflib-5.2.1-GCCcore-13.2.0.eb:
48+
options:
49+
include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/giflib/5.2.1-GCCcore-13.2.0/easybuild/reprod/easyblocks/*.py
50+
- /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/OpenJPEG/2.5.0-GCCcore-13.2.0/easybuild/OpenJPEG-2.5.0-GCCcore-13.2.0.eb:
51+
options:
52+
include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/OpenJPEG/2.5.0-GCCcore-13.2.0/easybuild/reprod/easyblocks/*.py
53+
- /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/libwebp/1.3.2-GCCcore-13.2.0/easybuild/libwebp-1.3.2-GCCcore-13.2.0.eb:
54+
options:
55+
include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/libwebp/1.3.2-GCCcore-13.2.0/easybuild/reprod/easyblocks/*.py

‎easystacks/software.eessi.io/2023.06/icelake_cclake/036d-eb-4.9.1.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
easyconfigs:
2+
- /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/Pillow/10.2.0-GCCcore-13.2.0/easybuild/Pillow-10.2.0-GCCcore-13.2.0.eb:
3+
options:
4+
include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/Pillow/10.2.0-GCCcore-13.2.0/easybuild/reprod/easyblocks/*.py
25
- matplotlib-3.8.2-gfbf-2023b.eb:
36
options:
47
include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/matplotlib/3.8.2-gfbf-2023b/easybuild/reprod/easyblocks/*.py

‎easystacks/software.eessi.io/2023.06/icelake_cclake/049-eb-4.9.4.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# 049-eb-4.9.1.yml: total build duration = 512 minutes
1+
# 049-eb-4.9.4.yml: total build duration = 512 minutes
22
easyconfigs:
3-
- /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/R/4.2.2-foss-2022b/easybuild/R-4.2.2-foss-2022b.eb:
4-
options:
5-
include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/R/4.2.2-foss-2022b/easybuild/reprod/easyblocks/*.py
3+
- R-4.2.2-foss-2022b.eb

‎easystacks/software.eessi.io/2023.06/icelake_cclake/057-eb-4.9.2.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,10 @@ easyconfigs:
5151
- /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/numba/0.58.1-foss-2023a/easybuild/numba-0.58.1-foss-2023a.eb:
5252
options:
5353
include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/numba/0.58.1-foss-2023a/easybuild/reprod/easyblocks/*.py
54-
- /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/librosa/0.10.1-foss-2023a/easybuild/librosa-0.10.1-foss-2023a.eb:
54+
- librosa-0.10.1-foss-2023a.eb:
5555
options:
56+
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/21434
57+
from-commit: 4b6170603150c9c93602b0deb726869d19a390f0
5658
include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/librosa/0.10.1-foss-2023a/easybuild/reprod/easyblocks/*.py
5759
- /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/xarray/2023.9.0-gfbf-2023a/easybuild/xarray-2023.9.0-gfbf-2023a.eb:
5860
options:

easystacks/software.eessi.io/2023.06/icelake_cclake/059-eb-4.9.2.yml renamed to easystacks/software.eessi.io/2023.06/icelake_cclake/059a-eb-4.9.2.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,3 @@ easyconfigs:
33
- /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/R-bundle-CRAN/2024.06-foss-2023b/easybuild/R-bundle-CRAN-2024.06-foss-2023b.eb:
44
options:
55
include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/R-bundle-CRAN/2024.06-foss-2023b/easybuild/reprod/easyblocks/*.py
6-
- /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/ReFrame/4.6.2/easybuild/ReFrame-4.6.2.eb:
7-
options:
8-
include-easyblocks: /cvmfs/software.eessi.io/versions/2023.06/software/linux/x86_64/intel/haswell/software/ReFrame/4.6.2/easybuild/reprod/easyblocks/*.py

‎easystacks/software.eessi.io/2023.06/rebuilds/20250501-eb-4.9.4-R-4.2.2-and-4.3.2-fix-CVE.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# 2025.05.01
2+
# Rebuild of R 4.2.2 and 4.3.2 to include patch for CVE,
3+
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/20462
4+
easyconfigs:
5+
- R-4.2.2-foss-2022b.eb
6+
- R-4.3.2-gfbf-2023a.eb

‎eb_hooks.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,10 @@ def pre_configure_hook_gromacs(self, *args, **kwargs):
615615
"""
616616
if self.name == 'GROMACS':
617617
cpu_target = get_eessi_envvar('EESSI_SOFTWARE_SUBDIR')
618-
if LooseVersion(self.version) <= LooseVersion('2024.1') and cpu_target == CPU_TARGET_NEOVERSE_V1 or LooseVersion(self.version) <= LooseVersion('2024.4') and CPU_TARGET_NVIDIA_GRACE:
618+
if (
619+
(LooseVersion(self.version) <= LooseVersion('2024.1') and cpu_target == CPU_TARGET_NEOVERSE_V1) or
620+
(LooseVersion(self.version) <= LooseVersion('2024.4') and cpu_target == CPU_TARGET_NVIDIA_GRACE)
621+
):
619622
self.cfg.update('configopts', '-DGMX_SIMD=ARM_NEON_ASIMD')
620623
print_msg(
621624
"Avoiding use of SVE instructions for GROMACS %s by using ARM_NEON_ASIMD as GMX_SIMD value",

0 commit comments

Comments
 (0)