Skip to content

Commit 269f7e9

Browse files
authored
Merge branch 'EESSI:2023.06-software.eessi.io' into siesta
2 parents c47eb40 + 01b2e0f commit 269f7e9

13 files changed

Lines changed: 465 additions & 9 deletions

.github/workflows/tests_link_nvidia_host_libraries.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,8 @@ jobs:
120120
# List dir with libraries
121121
echo "Showing content of /tmp/nvidia_libs"
122122
echo "$(ls -l /tmp/nvidia_libs)"
123+
echo "Showing content of /tmp/nvidia_libs_duplicate"
124+
echo "$(ls -l /tmp/nvidia_libs_duplicate)"
123125
echo "Showing content of /opt/eessi/nvidia/x86_64/host"
124126
echo "$(ls -l /opt/eessi/nvidia/x86_64/host)"
125127
@@ -152,9 +154,9 @@ jobs:
152154
exit 1
153155
fi
154156
155-
# Verify it points to our mock library in /tmp/nvidia_libs
156-
if [[ "$target" != "/tmp/nvidia_libs/$lib"* && "$target" != *"/tmp/nvidia_libs/"* ]]; then
157-
echo "Error: Symlink $lib_path points to $target, which is not in our mock directory"
157+
# Verify it points to our mock library in /tmp/nvidia_libs or /tmp/nvidia_libs_duplicate
158+
if [[ "$target" != "/tmp/nvidia_libs/$lib"* && "$target" != "/tmp/nvidia_libs_duplicate/$lib"* ]]; then
159+
echo "Error: Symlink $lib_path points to $target, which is not in our mock directories"
158160
exit 1
159161
fi
160162
@@ -194,3 +196,4 @@ jobs:
194196
echo "$output" | grep "have already been linked" || { echo "Missing 'already linked' message"; exit 1; }
195197
196198
echo "Second normal run test passed"
199+

EESSI-install-software.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,7 @@ fi
271271

272272
# Install NVIDIA drivers in host_injections (if they exist)
273273
if command_exists "nvidia-smi"; then
274+
export LD_LIBRARY_PATH="/.singularity.d/libs:${LD_LIBRARY_PATH}"
274275
nvidia-smi --version
275276
ec=$?
276277
if [ ${ec} -eq 0 ]; then

bot/build.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,15 @@ if [[ "${REPOSITORY_NAME}" == "dev.eessi.io" ]]; then
184184
COMMON_ARGS+=("--repository" "software.eessi.io,access=ro")
185185
fi
186186

187+
# add $software_layer_dir and /dev as extra bind paths
188+
# - $software_layer_dir is needed because it is used as prefix for running scripts
189+
# - /dev is needed to access /dev/fuse
190+
COMMON_ARGS+=("--extra-bind-paths" "${software_layer_dir},/dev")
191+
192+
# pass through '--contain' to avoid leaking in scripts into the container session
193+
# note, --pass-through can be used multiple times if needed
194+
COMMON_ARGS+=("--pass-through" "--contain")
195+
187196
# make sure to use the same parent dir for storing tarballs of tmp
188197
PREVIOUS_TMP_DIR=${PWD}/previous_tmp
189198

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,8 @@ easyconfigs:
5454
options:
5555
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/22610
5656
from-commit: 10e47e2fdd4f23fd5a52ae167771f8e9c78da411
57+
- lit-18.1.2-GCCcore-12.3.0.eb
58+
# needed due to changed/new dependencies for R-bundle-CRAN-2023.12-foss-2023a.eb
59+
# without any from-commit this will use a version from April 6, 2024
60+
# https://github.com/easybuilders/easybuild-easyconfigs/blob/88f6f9c7439c535e62461e6e71b1961c7be118b8/easybuild/easyconfigs/l/lit/lit-18.1.2-GCCcore-12.3.0.eb
61+
# EB 5.0.0 has a few changes to that

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,12 @@ easyconfigs:
3636
- EveryBeam-0.6.1-foss-2023b.eb:
3737
options:
3838
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/21765
39-
from-commit: c7e4bfe1a57cf9781ce346ba8ae9081644408c23
39+
from-commit: c7e4bfe1a57cf9781ce346ba8ae9081644408c23
40+
- lit-18.1.7-GCCcore-13.2.0.eb:
41+
options:
42+
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/20902
43+
from-commit: 79f4cf21490f7f5b187af889be5426c1332a497d
44+
- astropy-7.0.0-gfbf-2023b.eb:
45+
options:
46+
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/22469
47+
from-commit: fc22841fef99cbb2a221c18029b15e692e78c27c
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
easyconfigs:
2+
- CUDA-12.4.0.eb:
3+
options:
4+
accept-eula-for: CUDA
5+
# see https://github.com/easybuilders/easybuild-easyblocks/pull/3516
6+
include-easyblocks-from-commit: 3469151ce7e4f85415c877dee555aeea7691c757
7+
- UCX-CUDA-1.15.0-GCCcore-13.2.0-CUDA-12.4.0.eb
8+
- UCC-CUDA-1.2.0-GCCcore-13.2.0-CUDA-12.4.0.eb:
9+
options:
10+
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/21565
11+
from-commit: 46141a3f40e699433fac03af2d3ed81bd5a62da7
12+
- OSU-Micro-Benchmarks-7.5-gompi-2023b-CUDA-12.4.0.eb:
13+
options:
14+
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/21926
15+
# from-commit: de79ec74eb076e1aceda5e21235a73c05ed6764c
16+
# use merge commit
17+
from-commit: f3bd10b19f7caf4de3302bc7a73749341db9c7d8
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
easyconfigs:
2+
- EasyBuild-4.8.2.eb
3+
- EasyBuild-4.9.0.eb
4+
- EasyBuild-4.9.1.eb
5+
- EasyBuild-4.9.2.eb
6+
- EasyBuild-4.9.3.eb
7+
- EasyBuild-4.9.4.eb:
8+
options:
9+
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/21465
10+
from-commit: 39cdebd7bd2cb4a9c170ee22439401316b2e7a25
11+
- Nextflow-23.10.0.eb
12+
- ReFrame-4.3.3.eb:
13+
options:
14+
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/22183
15+
from-commit: 2b2fe53c885799cbf13b77ddfa9532c48b296e9d
16+
- ReFrame-4.6.2.eb
17+
- Pandoc-3.6.2.eb:
18+
options:
19+
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/22493
20+
from-commit: da8ed20bad0dd1c6533c568f6c4fbb7c3d15342e
Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
easyconfigs:
2+
- GCCcore-12.3.0.eb
3+
- OpenBLAS-0.3.23-GCC-12.3.0.eb
4+
- Rust-1.70.0-GCCcore-12.3.0.eb
5+
- OpenMPI-4.1.5-GCC-12.3.0
6+
- foss-2023a.eb
7+
- pybind11-2.11.1-GCCcore-12.3.0.eb
8+
- SciPy-bundle-2023.07-gfbf-2023a.eb:
9+
options:
10+
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/21693
11+
from-commit: 7c5144d2c1a061cd9f08b5901970b7f6ec5eb5c0
12+
- TensorFlow-2.13.0-foss-2023a.eb
13+
- X11-20230603-GCCcore-12.3.0.eb
14+
- HarfBuzz-5.3.1-GCCcore-12.3.0.eb
15+
- Qt5-5.15.10-GCCcore-12.3.0.eb
16+
- OSU-Micro-Benchmarks-7.1-1-gompi-2023a.eb
17+
- LHAPDF-6.5.4-GCC-12.3.0.eb
18+
- LoopTools-2.15-GCC-12.3.0.eb
19+
- R-4.3.2-gfbf-2023a.eb
20+
- Boost-1.82.0-GCC-12.3.0.eb:
21+
options:
22+
# source URLs for Boost have changed, corresponding PR is
23+
# https://github.com/easybuilders/easybuild-easyconfigs/pull/22157
24+
from-commit: 5bebccf792ccf35a8ee3250bc8fed86dff5d5df9
25+
- netCDF-4.9.2-gompi-2023a.eb
26+
- FFmpeg-6.0-GCCcore-12.3.0.eb
27+
- ALL-0.9.2-foss-2023a.eb
28+
- CDO-2.2.2-gompi-2023a.eb
29+
- BWA-0.7.17-20220923-GCCcore-12.3.0.eb
30+
- METIS-5.1.0-GCCcore-12.3.0.eb
31+
- SCOTCH-7.0.3-gompi-2023a.eb
32+
- CGAL-5.6-GCCcore-12.3.0.eb
33+
- ParaView-5.11.2-foss-2023a.eb
34+
- gnuplot-5.4.8-GCCcore-12.3.0.eb
35+
- Boost.MPI-1.82.0-gompi-2023a.eb:
36+
options:
37+
# source URLs for Boost.MPI have changed, corresponding PR is
38+
# https://github.com/easybuilders/easybuild-easyconfigs/pull/22240
39+
# Boost.MPI is a dependency of ESPResSo
40+
from-commit: e610fe1ac5393d1de668a466fdaaea74c580ee03
41+
- ESPResSo-4.2.1-foss-2023a.eb
42+
- Rivet-3.1.9-gompi-2023a-HepMC3-3.2.6.eb
43+
- Pillow-10.0.0-GCCcore-12.3.0.eb
44+
- sympy-1.12-gfbf-2023a.eb
45+
- networkx-3.1-gfbf-2023a.eb
46+
- expecttest-0.1.5-GCCcore-12.3.0.eb
47+
- PyYAML-6.0-GCCcore-12.3.0.eb
48+
- pytest-flakefinder-1.1.0-GCCcore-12.3.0.eb
49+
- pytest-rerunfailures-12.0-GCCcore-12.3.0.eb
50+
- pytest-shard-0.1.2-GCCcore-12.3.0.eb
51+
- scikit-learn-1.3.1-gfbf-2023a.eb
52+
- MUMPS-5.6.1-foss-2023a-metis.eb:
53+
options:
54+
# source URLs for MUMPS have changed, corresponding PR is
55+
# https://github.com/easybuilders/easybuild-easyconfigs/pull/22582
56+
# MUMPS is a dependency of snakemake
57+
from-commit: 0437ff1ad34283398f55d4a6e01e6540b1ae9688
58+
- snakemake-8.4.2-foss-2023a.eb
59+
- LAMMPS-2Aug2023_update2-foss-2023a-kokkos.eb
60+
- PyTorch-2.1.2-foss-2023a.eb
61+
- matplotlib-3.7.2-gfbf-2023a.eb
62+
- PyQt5-5.15.10-GCCcore-12.3.0.eb
63+
- Pillow-SIMD-9.5.0-GCCcore-12.3.0.eb
64+
- dask-2023.9.2-foss-2023a.eb
65+
- JupyterNotebook-7.0.2-GCCcore-12.3.0.eb
66+
- ImageMagick-7.1.1-15-GCCcore-12.3.0.eb
67+
- Z3-4.12.2-GCCcore-12.3.0.eb
68+
- PyOpenGL-3.1.7-GCCcore-12.3.0.eb
69+
- OpenJPEG-2.5.0-GCCcore-12.3.0.eb
70+
- Highway-1.0.4-GCCcore-12.3.0.eb
71+
- ELPA-2023.05.001-foss-2023a.eb
72+
- libxc-6.2.2-GCC-12.3.0.eb:
73+
options:
74+
# possible change in gitlabs tarball packaging, affected by .gitattributes
75+
# https://github.com/easybuilders/easybuild-easyconfigs/pull/22580
76+
from-commit: 456d64bbeacf465e8f7e7ff378864e26352d045d
77+
- ParMETIS-4.0.3-gompi-2023a.eb:
78+
options:
79+
# source URLs for ParMETIS-4.0.3 have changed, corresponding PR is
80+
# https://github.com/easybuilders/easybuild-easyconfigs/pull/22579
81+
# ParMETIS-4.0.3 is a dependency of SuperLU_DIST-8.1.2
82+
from-commit: 977e5208a720f23ace41b83b84da8b717d0aeada
83+
- SuperLU_DIST-8.1.2-foss-2023a.eb
84+
- PETSc-3.20.3-foss-2023a.eb
85+
- MODFLOW-6.4.4-foss-2023a.eb
86+
- NLopt-2.7.1-GCCcore-12.3.0.eb
87+
- nettle-3.9.1-GCCcore-12.3.0.eb
88+
- Xvfb-21.1.8-GCCcore-12.3.0.eb
89+
- libsndfile-1.2.2-GCCcore-12.3.0.eb
90+
- PostgreSQL-16.1-GCCcore-12.3.0.eb
91+
- ImageMagick-7.1.1-15-GCCcore-12.3.0.eb
92+
- GDAL-3.7.1-foss-2023a.eb

0 commit comments

Comments
 (0)