Skip to content

Commit 4775eb2

Browse files
committed
Merge branch 'main' of github.com:EESSI/software-layer into rebuild_gromacs
2 parents 63ac507 + 3eeb632 commit 4775eb2

11 files changed

Lines changed: 162 additions & 2 deletions

easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2022b.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,24 @@ easyconfigs:
3535
# - HarfBuzz-5.3.1-GCCcore-12.2.0.eb
3636
## - Qt5-5.15.7-GCCcore-12.2.0.eb
3737
## - QuantumESPRESSO-7.2-foss-2022b.eb
38+
# Apps originaly added from gracehopper on https://github.com/EESSI/software-layer/pull/1031
39+
- MUMPS-5.6.1-foss-2022b-metis.eb
40+
# - GL2PS-1.4.2-GCCcore-12.2.0.eb
41+
# - GST-plugins-base-1.22.1-GCC-12.2.0.eb
42+
# - wxWidgets-3.2.2.1-GCC-12.2.0.eb
43+
- Archive-Zip-1.68-GCCcore-12.2.0.eb
44+
- jemalloc-5.3.0-GCCcore-12.2.0.eb
45+
- Judy-1.0.5-GCCcore-12.2.0.eb
46+
- libaio-0.3.113-GCCcore-12.2.0.eb
47+
- Z3-4.12.2-GCCcore-12.2.0.eb
48+
- tbb-2021.10.0-GCCcore-12.2.0.eb
49+
# - dask-2023.7.1-foss-2022b.eb
50+
# - netcdf4-python-1.6.3-foss-2022b.eb
51+
- Ruby-3.2.2-GCCcore-12.2.0.eb
52+
# originally built with EB 4.9.2; PR 21526 and PR 3467 included since EB 5.0.0, thus need to use *from-commit
53+
# - ROOT-6.26.10-foss-2022b.eb:
54+
# options:
55+
# # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21526
56+
# from-commit: 6cbfbd7d7a55dc7243f46d0beea510278f4718df
57+
# # see https://github.com/easybuilders/easybuild-easyblocks/pull/3467
58+
# include-easyblocks-from-commit: c3aebe1f133d064a228c5d6c282e898b83d74601

easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023a.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,3 +298,8 @@ easyconfigs:
298298
- Valgrind-3.21.0-gompi-2023a.eb
299299
- OrthoFinder-2.5.5-foss-2023a.eb
300300
- BWA-0.7.18-GCCcore-12.3.0.eb
301+
- lit-18.1.2-GCCcore-12.3.0.eb
302+
# needed due to changed/new dependencies for R-bundle-CRAN-2023.12-foss-2023a.eb
303+
# without any from-commit this will use a version from April 6, 2024
304+
# https://github.com/easybuilders/easybuild-easyconfigs/blob/88f6f9c7439c535e62461e6e71b1961c7be118b8/easybuild/easyconfigs/l/lit/lit-18.1.2-GCCcore-12.3.0.eb
305+
# EB 5.0.0 has a few changes to that

easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023b.yml

Lines changed: 66 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ easyconfigs:
107107
# options:
108108
# from-pr: 20792
109109
- Valgrind-3.23.0-gompi-2023b.eb
110-
# recipes taken from https://github.com/EESSI/software-layer/pull/996
110+
# recipes taken from https://github.com/EESSI/software-layer/pull/996
111111
- lit-18.1.7-GCCcore-13.2.0.eb:
112112
options:
113113
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/20902
@@ -116,4 +116,68 @@ easyconfigs:
116116
options:
117117
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/22469
118118
from-commit: fc22841fef99cbb2a221c18029b15e692e78c27c
119-
119+
- PDT-3.25.2-GCCcore-13.2.0.eb:
120+
options:
121+
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/22523
122+
from-commit: 0044f08898e12cfd31177bfce0747ef2172226d1
123+
# from here on easyconfigs were originally built with EB 4.9.3
124+
# originally built with EB 4.9.3, PR 21436 was merged into develop before EB
125+
# 4.9.4 was released, but maybe it wasn't included in EB 4.9.4, to be on the safe
126+
# side we just use the commit, PR 3569 was targetting Sapphire Rapids, so likely
127+
# that is not needed here, however we keep it to stay in sync with what was used
128+
# for Sapphire Rapids
129+
- LAMMPS-29Aug2024-foss-2023b-kokkos.eb:
130+
options:
131+
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/21436
132+
from-commit: 9dc24e57880a8adb06ae10557c5315e66671a533
133+
# see https://github.com/easybuilders/easybuild-easyblocks/pull/3569
134+
include-easyblocks-from-commit: 362b4679193612e04abe336fa041e2a34d183991
135+
# included for gracehopper on https://github.com/EESSI/software-layer/pull/993
136+
- SIONlib-1.7.7-GCCcore-13.2.0-tools.eb:
137+
options:
138+
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/21752
139+
# NOTE, commit is the last one before the merge commit for PR 21752
140+
from-commit: 6b8b53493a1188a5baa56a133574daac239730e7
141+
- Score-P-8.4-gompi-2023b.eb:
142+
options:
143+
# see https://github.com/easybuilders/easybuild-easyblocks/pull/3496
144+
# NOTE, commit is the last one before the merge commit for PR 3496
145+
include-easyblocks-from-commit: 60633b0acfd41a0732992d9e16800dae71a056eb
146+
- Cython-3.0.10-GCCcore-13.2.0.eb
147+
- Mustache-1.3.3-foss-2023b.eb:
148+
options:
149+
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/21783
150+
# NOTE, commit is the last one before the merge commit for PR 21783
151+
from-commit: 5fa3db9eb36f91cba3fbf351549f8ba2849abc33
152+
- GDRCopy-2.4-GCCcore-13.2.0.eb
153+
# - GROMACS-2024.4-foss-2023b.eb:
154+
# options:
155+
# # https://github.com/easybuilders/easybuild-easyconfigs/pull/21851
156+
# # NOTE, below commit is the merge commit for PR 21851
157+
# from-commit: f0fa64b440deaf5fb0a6d26ff1bb3e9f36626c8a
158+
# Disable Gromacs build, there is an error with a test that require a further analysis
159+
- SlurmViewer-1.0.1-GCCcore-13.2.0.eb:
160+
options:
161+
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/21899
162+
# NOTE, below commit is the merge commit for PR 21899
163+
from-commit: 0bdeb23c9ea5a3caefd353ecd936919424c1bba4
164+
- wxWidgets-3.2.6-GCC-13.2.0.eb:
165+
options:
166+
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/21915
167+
# NOTE, below commit is the merge commit for PR 21915
168+
from-commit: 58f16c0caf8c5494c68e9eda8cbf19e9145d3cfa
169+
- DP3-6.2-foss-2023b.eb:
170+
options:
171+
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/21765
172+
# NOTE, below commit is the merge commit for PR 21765
173+
from-commit: c7e4bfe1a57cf9781ce346ba8ae9081644408c23
174+
- WSClean-3.5-foss-2023b.eb:
175+
options:
176+
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/21765
177+
# NOTE, below commit is the merge commit for PR 21765
178+
from-commit: c7e4bfe1a57cf9781ce346ba8ae9081644408c23
179+
- EveryBeam-0.6.1-foss-2023b.eb:
180+
options:
181+
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/21765
182+
# NOTE, below commit is the merge commit for PR 21765
183+
from-commit: c7e4bfe1a57cf9781ce346ba8ae9081644408c23
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
easyconfigs:
2+
- MLflow-2.18.0-gfbf-2023b.eb
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# We'll rebuild all CUDA software, for various reasons
2+
# 1. We now have a proper CUDA sanity check, and if anything was 'wrong' with our current CUDA installs, we'd like
3+
# to know about it
4+
# 2. The PR implementing a CI to check for differences between officially supported CUDA Compute Capabilities shows
5+
# that there are a lot of missing installations https://github.com/EESSI/software-layer/pull/1087 . A rebuild PR like
6+
# this will have the convenient side effect of filling all those holes
7+
easyconfigs:
8+
- ESPResSo-4.2.2-foss-2023a-CUDA-12.1.1.eb:
9+
options:
10+
# need an additional patch to build for the right CUDA architecture,
11+
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/23795
12+
from-commit: f3940e57527848706505b846ac4f2fce86fd5def
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# We'll rebuild all CUDA software, for various reasons
2+
# 1. We now have a proper CUDA sanity check, and if anything was 'wrong' with our current CUDA installs, we'd like
3+
# to know about it
4+
# 2. The PR implementing a CI to check for differences between officially supported CUDA Compute Capabilities shows
5+
# that there are a lot of missing installations https://github.com/EESSI/software-layer/pull/1087 . A rebuild PR like
6+
# this will have the convenient side effect of filling all those holes
7+
easyconfigs:
8+
- UCX-CUDA-1.15.0-GCCcore-13.2.0-CUDA-12.4.0.eb
9+
- NCCL-2.20.5-GCCcore-13.2.0-CUDA-12.4.0.eb:
10+
options:
11+
cuda-sanity-check-accept-missing-ptx: True
12+
- UCC-CUDA-1.2.0-GCCcore-13.2.0-CUDA-12.4.0.eb
13+
- OSU-Micro-Benchmarks-7.5-gompi-2023b-CUDA-12.4.0.eb

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ easyconfigs:
22
- Java-11.0.27.eb
33
- Java-17.0.15.eb
44
- Java-21.0.7.eb
5+
- Trimmomatic-0.39-Java-11.eb
6+
- FastQC-0.12.1-Java-11.eb

easystacks/software.eessi.io/2023.06/eessi-2023.06-eb-5.1.1-2023a.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,10 @@ easyconfigs:
1010
# See https://github.com/easybuilders/easybuild-easyconfigs/pull/22932
1111
from-commit: 3211d34eb16ff31b8de3dfef55ecaaf1ec205c6f
1212
- MrBayes-3.2.7-gompi-2023a.eb
13+
- Flye-2.9.3-GCC-12.3.0.eb
14+
- websockify-0.13.0-gfbf-2023a.eb:
15+
options:
16+
# See https://github.com/easybuilders/easybuild-easyconfigs/pull/23596
17+
from-commit: daa610c5b3aaf43b80779805d85f13a1d5a8734e
18+
- MLflow-2.10.2-gfbf-2023a.eb
19+
- Salmon-1.10.3-GCC-12.3.0.eb
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
11
easyconfigs:
22
- openCARP-17.0-foss-2023b.eb
33
- libheif-1.19.5-GCCcore-13.2.0.eb
4+
- Subread-2.1.1-GCC-13.2.0.eb
5+
- Flye-2.9.4-GCC-13.2.0.eb
6+
- MLflow-2.18.0-gfbf-2023b.eb
7+
- snakemake-8.28.0-foss-2023b.eb:
8+
options:
9+
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/22371
10+
from-commit: 29f82e43229663c22f0c76cb3fc7b6dd5c407cd7
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# 2025.09.12
2+
# Python ctypes relies on LD_LIBRARY_PATH and doesn't respect rpath linking. There is a workaround
3+
# for the EasyBuild context in https://github.com/easybuilders/easybuild-easyblocks/pull/3352.
4+
#
5+
# This rebuild ensures this fix is available for all Python versions shipped with EESSI.
6+
#
7+
# See https://gitlab.com/eessi/support/-/issues/77
8+
easyconfigs:
9+
- Python-3.10.8-GCCcore-12.2.0-bare:
10+
options:
11+
# See https://github.com/easybuilders/easybuild-easyblocks/pull/3352
12+
include-easyblocks-from-commit: 1ee17c0f7726c69e97442f53c65c5f041d65c94f
13+
- Python-3.11.3-GCCcore-12.3.0:
14+
options:
15+
# See https://github.com/easybuilders/easybuild-easyblocks/pull/3352
16+
include-easyblocks-from-commit: 1ee17c0f7726c69e97442f53c65c5f041d65c94f
17+
- Python-3.11.5-GCCcore-13.2.0:
18+
options:
19+
# See https://github.com/easybuilders/easybuild-easyblocks/pull/3352
20+
include-easyblocks-from-commit: 1ee17c0f7726c69e97442f53c65c5f041d65c94f

0 commit comments

Comments
 (0)