Skip to content

Commit 5709643

Browse files
committed
Merge branch '2023.06-software.eessi.io' of github-trz:EESSI/software-layer into 2023.06-a64fx-2023a-eb490-apps-2
2 parents 16408d5 + 9c62fde commit 5709643

24 files changed

Lines changed: 150 additions & 146 deletions

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

Lines changed: 32 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,41 @@ on:
88
permissions:
99
contents: read # to fetch code (actions/checkout)
1010
env:
11+
EESSI_VERSION: '2023.06'
1112
EESSI_ACCELERATOR_TARGETS: |
1213
x86_64/amd/zen2:
1314
- nvidia/cc80
1415
x86_64/amd/zen3:
1516
- nvidia/cc80
1617
jobs:
1718
check_missing:
18-
runs-on: ubuntu-24.04
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
EESSI_VERSION:
23-
- 2023.06
24-
EESSI_SOFTWARE_SUBDIR_OVERRIDE:
25-
- aarch64/generic
26-
- aarch64/neoverse_n1
27-
- aarch64/neoverse_v1
28-
- x86_64/amd/zen2
29-
- x86_64/amd/zen3
30-
- x86_64/amd/zen4
31-
- x86_64/intel/haswell
32-
- x86_64/intel/sapphirerapids
33-
- x86_64/intel/skylake_avx512
34-
- x86_64/generic
22+
include:
23+
# Arm CPU targets
24+
- runs_on: ubuntu-24.04-arm
25+
EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/generic
26+
- runs_on: ubuntu-24.04-arm
27+
EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/neoverse_n1
28+
- runs_on: ubuntu-24.04-arm
29+
EESSI_SOFTWARE_SUBDIR_OVERRIDE: aarch64/neoverse_v1
30+
# x86_64 CPU targets
31+
- runs_on: ubuntu-24.04
32+
EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/amd/zen2
33+
- runs_on: ubuntu-24.04
34+
EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/amd/zen3
35+
- runs_on: ubuntu-24.04
36+
EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/amd/zen4
37+
- runs_on: ubuntu-24.04
38+
EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/haswell
39+
- runs_on: ubuntu-24.04
40+
EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/sapphirerapids
41+
- runs_on: ubuntu-24.04
42+
EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/skylake_avx512
43+
- runs_on: ubuntu-24.04
44+
EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/generic
45+
runs-on: ${{ matrix.runs_on }}
3546
steps:
3647
- name: Check out software-layer repository
3748
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -46,20 +57,20 @@ jobs:
4657
- name: Test check_missing_installations.sh script
4758
run: |
4859
export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}}
49-
source /cvmfs/software.eessi.io/versions/${{matrix.EESSI_VERSION}}/init/bash
60+
source /cvmfs/software.eessi.io/versions/${EESSI_VERSION}/init/bash
5061
# set $EESSI_CPU_FAMILY to the CPU architecture that corresponds to $EESSI_SOFTWARE_SUBDIR_OVERRIDE (part before the first slash),
5162
# to prevent issues with checks in the Easybuild configuration that use this variable
5263
export EESSI_CPU_FAMILY=${EESSI_SOFTWARE_SUBDIR_OVERRIDE%%/*}
5364
module load EasyBuild
5465
which eb
5566
eb --version
56-
export EESSI_PREFIX=/cvmfs/software.eessi.io/versions/${{matrix.EESSI_VERSION}}
67+
export EESSI_PREFIX=/cvmfs/software.eessi.io/versions/${EESSI_VERSION}
5768
export EESSI_OS_TYPE=linux
5869
env | grep ^EESSI | sort
5970
6071
# first check the CPU-only builds for this CPU target
61-
echo "just run check_missing_installations.sh (should use easystacks/software.eessi.io/${{matrix.EESSI_VERSION}}/eessi-${{matrix.EESSI_VERSION}}-*.yml with latest EasyBuild release)"
62-
for easystack_file in $(EESSI_VERSION=${{matrix.EESSI_VERSION}} .github/workflows/scripts/only_latest_easystacks.sh); do
72+
echo "just run check_missing_installations.sh (should use easystacks/software.eessi.io/${EESSI_VERSION}/eessi-${EESSI_VERSION}-*.yml with latest EasyBuild release)"
73+
for easystack_file in $(EESSI_VERSION=${EESSI_VERSION} .github/workflows/scripts/only_latest_easystacks.sh); do
6374
echo "check missing installations for ${easystack_file}..."
6475
./check_missing_installations.sh ${easystack_file}
6576
ec=$?
@@ -74,7 +85,7 @@ jobs:
7485
for accel in ${accelerators}; do
7586
module use ${EESSI_SOFTWARE_PATH}/accel/${accel}/modules/all
7687
echo "checking missing installations for accelerator ${accel} using modulepath: ${MODULEPATH}"
77-
for easystack_file in $(EESSI_VERSION=${{matrix.EESSI_VERSION}} ACCEL_EASYSTACKS=1 .github/workflows/scripts/only_latest_easystacks.sh); do
88+
for easystack_file in $(EESSI_VERSION=${EESSI_VERSION} ACCEL_EASYSTACKS=1 .github/workflows/scripts/only_latest_easystacks.sh); do
7889
echo "check missing installations for ${easystack_file}..."
7990
./check_missing_installations.sh ${easystack_file}
8091
ec=$?
@@ -87,14 +98,14 @@ jobs:
8798
- name: Test check_missing_installations.sh with missing package (GCC/8.3.0)
8899
run: |
89100
export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}}
90-
source /cvmfs/software.eessi.io/versions/${{matrix.EESSI_VERSION}}/init/bash
101+
source /cvmfs/software.eessi.io/versions/${EESSI_VERSION}/init/bash
91102
# set $EESSI_CPU_FAMILY to the CPU architecture that corresponds to $EESSI_SOFTWARE_SUBDIR_OVERRIDE (part before the first slash),
92103
# to prevent issues with checks in the Easybuild configuration that use this variable
93104
export EESSI_CPU_FAMILY=${EESSI_SOFTWARE_SUBDIR_OVERRIDE%%/*}
94105
module load EasyBuild
95106
which eb
96107
eb --version
97-
export EESSI_PREFIX=/cvmfs/software.eessi.io/versions/${{matrix.EESSI_VERSION}}
108+
export EESSI_PREFIX=/cvmfs/software.eessi.io/versions/${EESSI_VERSION}
98109
export EESSI_OS_TYPE=linux
99110
env | grep ^EESSI | sort
100111
# create dummy easystack file with a single entry (something that is not installed in EESSI)

.github/workflows/tests_archdetect.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ jobs:
2323
- aarch64/neoverse_n1/Azure-Ubuntu20-Altra
2424
- aarch64/neoverse_n1/AWS-awslinux-graviton2
2525
- aarch64/neoverse_v1/AWS-awslinux-graviton3
26+
- aarch64/nvidia/grace/Jureca-Rocky95
27+
- aarch64/google/axion/GCP-axion
2628
# commented out since these targets are currently not supported in software.eessi.io repo
2729
# (and some tests assume that the corresponding subdirectory in software layer is there)
2830
# - ppc64le/power9le/unknown-power9le

EESSI-install-software.sh

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,8 @@ fi
242242
# order is important: these are needed to install a full CUDA SDK in host_injections
243243
# for now, this just reinstalls all scripts. Note the most elegant, but works
244244

245-
# Only run install_scripts.sh if not dev.eessi.io for security
246-
if [[ "${EESSI_CVMFS_REPO}" != /cvmfs/dev.eessi.io ]]; then
245+
# Only run install_scripts.sh if not in dev.eessi.io for security
246+
if [[ -z ${EESSI_DEV_PROJECT} ]]; then
247247
${TOPDIR}/install_scripts.sh --prefix ${EESSI_PREFIX}
248248
fi
249249

@@ -268,8 +268,19 @@ export EESSI_CVMFS_INSTALL=1
268268
# NOTE 3, we have to set a default for EASYBUILD_INSTALLPATH here in cases the
269269
# EESSI-extend module itself needs to be installed.
270270
export EASYBUILD_INSTALLPATH=${EESSI_PREFIX}/software/${EESSI_OS_TYPE}/${EESSI_SOFTWARE_SUBDIR_OVERRIDE}
271+
272+
# If in dev.eessi.io, allow building on top of software.eessi.io via EESSI-extend
273+
if [[ ! -z ${EESSI_DEV_PROJECT} ]]; then
274+
# We keep track of the old install path for settings paths to SitePackage.lua and .lmodrc later
275+
EASYBUILD_INSTALLPATH_STANDARD=${EASYBUILD_INSTALLPATH}
276+
# Need to unset $EESSI_CVMFS_INSTALL to use $EESSI_PROJECT_INSTALL
277+
unset EESSI_CVMFS_INSTALL
278+
export EESSI_PROJECT_INSTALL=${EESSI_CVMFS_REPO_OVERRIDE}
279+
echo ">> \$EESSI_PROJECT_INSTALL set to ${EESSI_PROJECT_INSTALL}"
280+
fi
281+
271282
echo "DEBUG: before loading EESSI-extend // EASYBUILD_INSTALLPATH='${EASYBUILD_INSTALLPATH}'"
272-
source load_eessi_extend_module.sh ${EESSI_VERSION}
283+
source $TOPDIR/load_eessi_extend_module.sh ${EESSI_VERSION}
273284
echo "DEBUG: after loading EESSI-extend // EASYBUILD_INSTALLPATH='${EASYBUILD_INSTALLPATH}'"
274285

275286
# Install full CUDA SDK and cu* libraries in host_injections
@@ -319,11 +330,6 @@ if [ ! -z ${EESSI_ACCELERATOR_TARGET} ]; then
319330
fi
320331
fi
321332

322-
# If in dev.eessi.io, allow building on top of software.eessi.io
323-
if [[ "${EESSI_CVMFS_REPO}" == /cvmfs/dev.eessi.io ]]; then
324-
module use /cvmfs/software.eessi.io/versions/$EESSI_VERSION/software/${EESSI_OS_TYPE}/${EESSI_SOFTWARE_SUBDIR_OVERRIDE}/modules/all
325-
fi
326-
327333
echo "DEBUG: adding path '$EASYBUILD_INSTALLPATH/modules/all' to MODULEPATH='${MODULEPATH}'"
328334
#module use $EASYBUILD_INSTALLPATH/modules/all
329335
safe_module_use $EASYBUILD_INSTALLPATH/modules/all
@@ -354,7 +360,7 @@ else
354360
echo -e "Processing easystack file ${easystack_file}...\n\n"
355361

356362
# determine version of EasyBuild module to load based on EasyBuild version included in name of easystack file
357-
eb_version=$(echo ${easystack_file} | sed 's/.*eb-\([0-9.]*\).*/\1/g')
363+
eb_version=$(echo ${easystack_file} | sed 's/.*eb-\([0-9.]*\).*.yml/\1/g')
358364

359365
# load EasyBuild module (will be installed if it's not available yet)
360366
source ${TOPDIR}/load_easybuild_module.sh ${eb_version}
@@ -396,7 +402,15 @@ else
396402
fi
397403

398404
echo "DEBUG: before creating/updating lmod config files // EASYBUILD_INSTALLPATH='${EASYBUILD_INSTALLPATH}'"
399-
export LMOD_CONFIG_DIR="${EASYBUILD_INSTALLPATH}/.lmod"
405+
if [[ ! -z ${EESSI_DEV_PROJECT} ]]; then
406+
# Make sure .lmod files are not checked for dev.eeessi.io
407+
export LMOD_CONFIG_DIR="${EASYBUILD_INSTALLPATH_STANDARD}/.lmod"
408+
export LMOD_PACKAGE_PATH="${EASYBUILD_INSTALLPATH_STANDARD}/.lmod"
409+
else
410+
export LMOD_CONFIG_DIR="${EASYBUILD_INSTALLPATH}/.lmod"
411+
export LMOD_PACKAGE_PATH="${EASYBUILD_INSTALLPATH}/.lmod"
412+
fi
413+
400414
lmod_rc_file="$LMOD_CONFIG_DIR/lmodrc.lua"
401415
echo "DEBUG: lmod_rc_file='${lmod_rc_file}'"
402416
if [[ ! -z ${EESSI_ACCELERATOR_TARGET} ]]; then
@@ -411,7 +425,6 @@ if [ ! -f $lmod_rc_file ] || [ ${lmodrc_changed} == '0' ]; then
411425
check_exit_code $? "$lmod_rc_file created" "Failed to create $lmod_rc_file"
412426
fi
413427

414-
export LMOD_PACKAGE_PATH="${EASYBUILD_INSTALLPATH}/.lmod"
415428
lmod_sitepackage_file="$LMOD_PACKAGE_PATH/SitePackage.lua"
416429
if [[ ! -z ${EESSI_ACCELERATOR_TARGET} ]]; then
417430
# EESSI_ACCELERATOR_TARGET is set, so let's remove the accelerator path from $lmod_sitepackage_file

EESSI-remove-software.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ if [ $EUID -eq 0 ]; then
108108
else
109109
for easystack_file in ${changed_easystacks_rebuilds}; do
110110
# determine version of EasyBuild module to load based on EasyBuild version included in name of easystack file
111-
eb_version=$(echo ${easystack_file} | sed 's/.*eb-\([0-9.]*\).*/\1/g')
111+
eb_version=$(echo ${easystack_file} | sed 's/.*eb-\([0-9.]*\).*.yml/\1/g')
112112

113113
# load EasyBuild module (will be installed if it's not available yet)
114114
source ${TOPDIR}/load_easybuild_module.sh ${eb_version}

bot/build.sh

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,9 @@ echo "bot/build.sh: EESSI_VERSION_OVERRIDE='${EESSI_VERSION_OVERRIDE}'"
147147
# determine CVMFS repo to be used from .repository.repo_name in ${JOB_CFG_FILE}
148148
# here, just set EESSI_CVMFS_REPO_OVERRIDE, a bit further down
149149
# "source init/eessi_defaults" via sourcing init/minimal_eessi_env
150-
export EESSI_CVMFS_REPO_OVERRIDE=/cvmfs/${REPOSITORY_NAME}
150+
# Note: iff ${EESSI_DEV_PROJECT} is defined (building for dev.eessi.io), then we
151+
# append the project subdirectory to ${EESSI_CVMFS_REPO_OVERRIDE}
152+
export EESSI_CVMFS_REPO_OVERRIDE=/cvmfs/${REPOSITORY_NAME}${EESSI_DEV_PROJECT:+/$EESSI_DEV_PROJECT}
151153
echo "bot/build.sh: EESSI_CVMFS_REPO_OVERRIDE='${EESSI_CVMFS_REPO_OVERRIDE}'"
152154

153155
# determine CPU architecture to be used from entry .architecture in ${JOB_CFG_FILE}
@@ -318,7 +320,15 @@ fi
318320
timestamp=$(date +%s)
319321
# to set EESSI_VERSION we need to source init/eessi_defaults now
320322
source $software_layer_dir/init/eessi_defaults
321-
export TGZ=$(printf "eessi-%s-software-%s-%s-%d.tar.gz" ${EESSI_VERSION} ${EESSI_OS_TYPE} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE//\//-} ${timestamp})
323+
# Note: iff ${EESSI_DEV_PROJECT} is defined (building for dev.eessi.io), then we
324+
# append the project (subdirectory) name to the end tarball name. This is information
325+
# then used at the ingestion stage. If ${EESSI_DEV_PROJECT} is not defined, nothing is
326+
# appended
327+
export TGZ=$(printf "eessi-%s-software-%s-%s-%b%d.tar.gz" ${EESSI_VERSION} ${EESSI_OS_TYPE} ${EESSI_SOFTWARE_SUBDIR_OVERRIDE//\//-} ${EESSI_DEV_PROJECT:+$EESSI_DEV_PROJECT-} ${timestamp})
328+
329+
# Export EESSI_DEV_PROJECT to use it (if needed) when making tarball
330+
echo "bot/build.sh: EESSI_DEV_PROJECT='${EESSI_DEV_PROJECT}'"
331+
export EESSI_DEV_PROJECT=${EESSI_DEV_PROJECT}
322332

323333
# value of first parameter to create_tarball.sh - TMP_IN_CONTAINER - needs to be
324334
# synchronised with setting of TMP_IN_CONTAINER in eessi_container.sh

bot/inspect.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ echo "bot/inspect.sh: EESSI_VERSION_OVERRIDE='${EESSI_VERSION_OVERRIDE}'"
209209
# determine CVMFS repo to be used from .repository.repo_name in ${JOB_CFG_FILE}
210210
# here, just set EESSI_CVMFS_REPO_OVERRIDE, a bit further down
211211
# "source init/eessi_defaults" via sourcing init/minimal_eessi_env
212-
export EESSI_CVMFS_REPO_OVERRIDE="/cvmfs/$(cfg_get_value 'repository' 'repo_name')"
212+
export EESSI_CVMFS_REPO_OVERRIDE="/cvmfs/$(cfg_get_value 'repository' 'repo_name')${EESSI_DEV_PROJECT:+/$EESSI_DEV_PROJECT}"
213213
echo "bot/inspect.sh: EESSI_CVMFS_REPO_OVERRIDE='${EESSI_CVMFS_REPO_OVERRIDE}'"
214214

215215
# determine architecture to be used from entry .architecture in ${JOB_CFG_FILE}

create_lmodsitepackage.py

Lines changed: 1 addition & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -231,73 +231,6 @@
231231
end
232232
end
233233
234-
local function using_eessi_accel_stack ()
235-
local modulepath = os.getenv("MODULEPATH") or ""
236-
local accel_stack_in_modulepath = false
237-
238-
-- Check if we are using an EESSI version 2023 accelerator stack by checking if the $MODULEPATH contains
239-
-- a path that starts with /cvmfs/software.eessi.io and contains accel/nvidia/ccNN
240-
for path in string.gmatch(modulepath, '(.-):') do
241-
if string.sub(path, 1, 41) == "/cvmfs/software.eessi.io/versions/2023.06" then
242-
if string.find(path, "accel/nvidia/cc%d%d") then
243-
accel_stack_in_modulepath = true
244-
break
245-
end
246-
end
247-
end
248-
return accel_stack_in_modulepath
249-
end
250-
251-
local function eessi_removed_module_warning_startup_hook(usrCmd)
252-
if usrCmd == 'load' and not os.getenv("EESSI_SKIP_REMOVED_MODULES_CHECK") then
253-
local CUDA_RELOCATION_MSG = [[All CUDA installations and modules depending on CUDA have been relocated to GPU-specific stacks.
254-
Please see https://www.eessi.io/docs/site_specific_config/gpu/ for more information.]]
255-
256-
local RELOCATED_CUDA_MODULES = {
257-
['NCCL'] = CUDA_RELOCATION_MSG,
258-
['NCCL/2.18.3-GCCcore-12.3.0-CUDA-12.1.1'] = CUDA_RELOCATION_MSG,
259-
['UCX-CUDA'] = CUDA_RELOCATION_MSG,
260-
['UCX-CUDA/1.14.1-GCCcore-12.3.0-CUDA-12.1.1'] = CUDA_RELOCATION_MSG,
261-
-- we also have non-CUDA versions of OSU Micro Benchmarks, so only match the CUDA version
262-
['OSU-Micro-Benchmarks/7.2-gompi-2023a-CUDA-12.1.1'] = CUDA_RELOCATION_MSG,
263-
['UCC-CUDA'] = CUDA_RELOCATION_MSG,
264-
['UCC-CUDA/1.2.0-GCCcore-12.3.0-CUDA-12.1.1'] = CUDA_RELOCATION_MSG,
265-
['CUDA'] = CUDA_RELOCATION_MSG,
266-
['CUDA/12.1.1'] = CUDA_RELOCATION_MSG,
267-
['CUDA-Samples'] = CUDA_RELOCATION_MSG,
268-
['CUDA-Samples/12.1-GCC-12.3.0-CUDA-12.1.1'] = CUDA_RELOCATION_MSG,
269-
}
270-
271-
local REMOVED_MODULES = {
272-
['ipympl/0.9.3-foss-2023a'] = 'This module has been replaced by ipympl/0.9.3-gfbf-2023a',
273-
}
274-
275-
local masterTbl = masterTbl()
276-
local error_msg = ""
277-
-- The CUDA messages should only be shown if the accelerator stack is NOT being used
278-
if not using_eessi_accel_stack() then
279-
for _, module in pairs(masterTbl.pargs) do
280-
if RELOCATED_CUDA_MODULES[module] ~= nil then
281-
error_msg = error_msg .. module .. ': ' .. RELOCATED_CUDA_MODULES[module] .. '\\n\\n'
282-
end
283-
end
284-
end
285-
for _, module in pairs(masterTbl.pargs) do
286-
if REMOVED_MODULES[module] ~= nil then
287-
error_msg = error_msg .. module .. ': ' .. REMOVED_MODULES[module] .. '\\n\\n'
288-
end
289-
end
290-
if error_msg ~= "" then
291-
LmodError('\\n' .. error_msg .. 'If you know what you are doing and you want to ignore this check for removed/relocated modules, set $EESSI_SKIP_REMOVED_MODULES_CHECK to any value.')
292-
end
293-
end
294-
end
295-
296-
function eessi_startup_hook(usrCmd)
297-
eessi_removed_module_warning_startup_hook(usrCmd)
298-
end
299-
300-
hook.register("startup", eessi_startup_hook)
301234
hook.register("load", eessi_load_hook)
302235
303236
"""
@@ -320,7 +253,7 @@
320253
modT.fullName:match("GCC%-([0-9]*.[0-9]*.[0-9]*)") or
321254
modT.fullName:match("GCCcore%-([0-9]*.[0-9]*.[0-9]*)")
322255
323-
-- if nothing matches, return
256+
-- if nothing matches, return
324257
if tcver == nil then return end
325258
326259
-- if we have matches, check if the toolchain version is either 2022b or 12.2.0

create_tarball.sh

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,18 @@ echo ">> tmpdir: $tmpdir"
2020
os="linux"
2121
source ${base_dir}/init/eessi_defaults
2222
cvmfs_repo=${EESSI_CVMFS_REPO}
23-
2423
software_dir="${cvmfs_repo}/versions/${eessi_version}/software/${os}/${cpu_arch_subdir}"
2524
if [ ! -d ${software_dir} ]; then
2625
echo "Software directory ${software_dir} does not exist?!" >&2
2726
exit 2
2827
fi
2928

30-
cvmfs_repo_name=${cvmfs_repo#/cvmfs/}
31-
overlay_upper_dir="${eessi_tmpdir}/${cvmfs_repo_name}/overlay-upper"
29+
# Need to extract the cvmfs_repo_name from the cvmfs_repo variable
30+
# - remove /${EESSI_DEV_PROJECT} from the end (if it exists)
31+
# - remove /cvmfs/ from the beginning
32+
cvmfs_repo_name=${cvmfs_repo%"/${EESSI_DEV_PROJECT}"}
33+
cvmfs_repo_name=${cvmfs_repo_name#/cvmfs/}
34+
overlay_upper_dir="${eessi_tmpdir}/${cvmfs_repo_name}/overlay-upper${EESSI_DEV_PROJECT:+/$EESSI_DEV_PROJECT}"
3235

3336
software_dir_overlay="${overlay_upper_dir}/versions/${eessi_version}"
3437
if [ ! -d ${software_dir_overlay} ]; then

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,13 @@ easyconfigs:
44
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/22292
55
# and https://github.com/easybuilders/easybuild-easyconfigs/pull/22646
66
from-commit: b212c00fdc3983678037429719f1b210cb978b42
7+
- MUSCLE-5.1.0-GCCcore-12.3.0.eb:
8+
options:
9+
# See https://github.com/easybuilders/easybuild-easyconfigs/pull/22780
10+
from-commit: ff159780fbaa881fb442b0ee1b37cd9e3d981ca9
11+
- bcgTree-1.2.1-foss-2023a.eb:
12+
options:
13+
# see https://github.com/easybuilders/easybuild-easyconfigs/pull/22707
14+
# and https://github.com/easybuilders/easybuild-easyconfigs/pull/22540
15+
# and https://github.com/easybuilders/easybuild-easyconfigs/pull/22781
16+
from-commit: 720c5b5b8280bf342d827617ee14738f3d231097
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
easyconfigs:
2+
#This is an outdated version of the Z3-4.12.2-GCCcore-12.3.0 easyconfig, adding it to keep sync with the other stacks
3+
#see https://github.com/easybuilders/easybuild-easyconfigs/pull/20050
4+
- Z3-4.12.2-GCCcore-12.3.0-Python-3.11.3.eb

0 commit comments

Comments
 (0)