From 3be4823474774211581bc2dd85b5fd98e7eec746 Mon Sep 17 00:00:00 2001 From: Tim Kok Date: Thu, 19 Oct 2023 18:42:41 +0200 Subject: [PATCH 01/14] Add DP3-6.0-foss-2022a and WSClean-3.4-foss-2022a --- eessi-2023.06-eb-4.8.1-2022a.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/eessi-2023.06-eb-4.8.1-2022a.yml b/eessi-2023.06-eb-4.8.1-2022a.yml index 8317a40b7a..28b469ee24 100644 --- a/eessi-2023.06-eb-4.8.1-2022a.yml +++ b/eessi-2023.06-eb-4.8.1-2022a.yml @@ -10,3 +10,9 @@ easyconfigs: - ESPResSo-4.2.1-foss-2022a: options: from-pr: 18963 + - DP3-6.0-foss-2022a: + options: + from-pr: 19010 + - WSClean-3.4-foss-2022a: + options: + from-pr: 19010 From 207fb71f0991101edf13ebc1e51387af77087178 Mon Sep 17 00:00:00 2001 From: Tim Kok Date: Mon, 30 Oct 2023 10:56:24 +0100 Subject: [PATCH 02/14] Add EasyBuild v4.8.2 --- eessi-2023.06-eb-4.8.0-system.yml | 3 +++ eessi-2023.06-eb-4.8.1-2022a.yml | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/eessi-2023.06-eb-4.8.0-system.yml b/eessi-2023.06-eb-4.8.0-system.yml index 2928f110b0..8db29e3c61 100644 --- a/eessi-2023.06-eb-4.8.0-system.yml +++ b/eessi-2023.06-eb-4.8.0-system.yml @@ -8,3 +8,6 @@ easyconfigs: - EasyBuild-4.8.1.eb: options: from-pr: 18761 + - EasyBuild-4.8.2.eb: + options: + from-pr: 19101 diff --git a/eessi-2023.06-eb-4.8.1-2022a.yml b/eessi-2023.06-eb-4.8.1-2022a.yml index 28b469ee24..8317a40b7a 100644 --- a/eessi-2023.06-eb-4.8.1-2022a.yml +++ b/eessi-2023.06-eb-4.8.1-2022a.yml @@ -10,9 +10,3 @@ easyconfigs: - ESPResSo-4.2.1-foss-2022a: options: from-pr: 18963 - - DP3-6.0-foss-2022a: - options: - from-pr: 19010 - - WSClean-3.4-foss-2022a: - options: - from-pr: 19010 From 10830788bdff71a15cc4a51488763b805ef2582f Mon Sep 17 00:00:00 2001 From: Tim Kok Date: Mon, 30 Oct 2023 10:57:32 +0100 Subject: [PATCH 03/14] Add EasyBuild v4.8.2 --- eessi-2023.06-eb-4.8.2-2022a.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 eessi-2023.06-eb-4.8.2-2022a.yml diff --git a/eessi-2023.06-eb-4.8.2-2022a.yml b/eessi-2023.06-eb-4.8.2-2022a.yml new file mode 100644 index 0000000000..5e812716f2 --- /dev/null +++ b/eessi-2023.06-eb-4.8.2-2022a.yml @@ -0,0 +1,3 @@ +easyconfigs: + - DP3-6.0-foss-2022a: + - WSClean-3.4-foss-2022a: From e2644fa581b67b52acddab01285880b993e17fe0 Mon Sep 17 00:00:00 2001 From: Tim Kok Date: Mon, 30 Oct 2023 11:23:31 +0100 Subject: [PATCH 04/14] Add EasyBuild 4.8.2 to 4.8.1 system file --- eessi-2023.06-eb-4.8.1-system.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eessi-2023.06-eb-4.8.1-system.yml b/eessi-2023.06-eb-4.8.1-system.yml index 1e9664e10f..3d0e1c3c32 100644 --- a/eessi-2023.06-eb-4.8.1-system.yml +++ b/eessi-2023.06-eb-4.8.1-system.yml @@ -4,3 +4,6 @@ easyconfigs: - ReFrame-4.3.3.eb: options: from-pr: 18851 + - EasyBuild-4.8.2.eb: + options: + from-pr: 19101 From eb503d9d73904de99ff7d2a3c7d118298ac1461f Mon Sep 17 00:00:00 2001 From: Tim Kok Date: Mon, 30 Oct 2023 11:24:59 +0100 Subject: [PATCH 05/14] Remove EasyBuild 4.8.2 from 4.8.0 system file --- eessi-2023.06-eb-4.8.0-system.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/eessi-2023.06-eb-4.8.0-system.yml b/eessi-2023.06-eb-4.8.0-system.yml index 8db29e3c61..2928f110b0 100644 --- a/eessi-2023.06-eb-4.8.0-system.yml +++ b/eessi-2023.06-eb-4.8.0-system.yml @@ -8,6 +8,3 @@ easyconfigs: - EasyBuild-4.8.1.eb: options: from-pr: 18761 - - EasyBuild-4.8.2.eb: - options: - from-pr: 19101 From 23b23f1a86a038f5ef616799af118cb43c1a972c Mon Sep 17 00:00:00 2001 From: Tim Kok Date: Mon, 30 Oct 2023 13:20:47 +0100 Subject: [PATCH 06/14] Try loading module without cache before exiting --- load_easybuild_module.sh | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/load_easybuild_module.sh b/load_easybuild_module.sh index 4ff2a3c37c..c027a4b4b1 100755 --- a/load_easybuild_module.sh +++ b/load_easybuild_module.sh @@ -23,14 +23,14 @@ fi EB_VERSION=${1} # make sure that environment variables that we expect to be set are indeed set -if [ -z "${TMPDIR}" ]; then +if [ -z "${TMPDIR}" ]; then echo "\$TMPDIR is not set" >&2 exit 2 fi # ${EB} is used to specify which 'eb' command should be used; # can potentially be more than just 'eb', for example when using 'eb --optarch=GENERIC' -if [ -z "${EB}" ]; then +if [ -z "${EB}" ]; then echo "\$EB is not set" >&2 exit 2 fi @@ -75,17 +75,22 @@ else if [[ $? -eq 0 ]]; then echo_green ">> Module for EasyBuild v${EB_VERSION} found!" else - eb_ec=EasyBuild-${EB_VERSION}.eb - echo_yellow ">> Still no module for EasyBuild v${EB_VERSION}, trying with easyconfig ${eb_ec}..." - ${EB} --search ${eb_ec} | grep ${eb_ec} > /dev/null + module avail --ignore_cache 2>&1 | grep -i easybuild/${EB_VERSION} &> ${ml_av_easybuild_out} if [[ $? -eq 0 ]]; then - echo "Easyconfig ${eb_ec} found for EasyBuild v${EB_VERSION}, so installing it..." - ok_msg="EasyBuild v${EB_VERSION} installed, alright!" - fail_msg="Installing EasyBuild v${EB_VERSION}, yikes! (output: ${eb_install_out})" - ${EB} EasyBuild-${EB_VERSION}.eb 2>&1 | tee -a ${eb_install_out} - check_exit_code $? "${ok_msg}" "${fail_msg}" + echo_green ">> Module for EasyBuild v${EB_VERSION} found!" else - fatal_error "No easyconfig found for EasyBuild v${EB_VERSION}" + eb_ec=EasyBuild-${EB_VERSION}.eb + echo_yellow ">> Still no module for EasyBuild v${EB_VERSION}, trying with easyconfig ${eb_ec}..." + ${EB} --search ${eb_ec} | grep ${eb_ec} > /dev/null + if [[ $? -eq 0 ]]; then + echo "Easyconfig ${eb_ec} found for EasyBuild v${EB_VERSION}, so installing it..." + ok_msg="EasyBuild v${EB_VERSION} installed, alright!" + fail_msg="Installing EasyBuild v${EB_VERSION}, yikes! (output: ${eb_install_out})" + ${EB} EasyBuild-${EB_VERSION}.eb 2>&1 | tee -a ${eb_install_out} + check_exit_code $? "${ok_msg}" "${fail_msg}" + else + fatal_error "No easyconfig found for EasyBuild v${EB_VERSION}" + fi fi fi From 48735b571c31fcf443596c16fea87ad1e634a138 Mon Sep 17 00:00:00 2001 From: Tim Kok Date: Mon, 30 Oct 2023 13:55:18 +0100 Subject: [PATCH 07/14] Fix position ignore_cache flag --- load_easybuild_module.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/load_easybuild_module.sh b/load_easybuild_module.sh index c027a4b4b1..9f7716543a 100755 --- a/load_easybuild_module.sh +++ b/load_easybuild_module.sh @@ -75,7 +75,7 @@ else if [[ $? -eq 0 ]]; then echo_green ">> Module for EasyBuild v${EB_VERSION} found!" else - module avail --ignore_cache 2>&1 | grep -i easybuild/${EB_VERSION} &> ${ml_av_easybuild_out} + module --ignore_cache avail 2>&1 | grep -i easybuild/${EB_VERSION} &> ${ml_av_easybuild_out} if [[ $? -eq 0 ]]; then echo_green ">> Module for EasyBuild v${EB_VERSION} found!" else From d97d23bacf7671d9c8dbc0381d917ddb26a539cd Mon Sep 17 00:00:00 2001 From: Tim Kok Date: Mon, 30 Oct 2023 14:56:07 +0100 Subject: [PATCH 08/14] Also ignore cache when loading EB module --- load_easybuild_module.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/load_easybuild_module.sh b/load_easybuild_module.sh index 9f7716543a..11c780dcdd 100755 --- a/load_easybuild_module.sh +++ b/load_easybuild_module.sh @@ -71,10 +71,12 @@ else check_exit_code $? "${ok_msg}" "${fail_msg}" # maybe the module obtained with --install-latest-eb-release is exactly the EasyBuild version we wanted? + IGNORE_CACHE='' module avail 2>&1 | grep -i easybuild/${EB_VERSION} &> ${ml_av_easybuild_out} if [[ $? -eq 0 ]]; then echo_green ">> Module for EasyBuild v${EB_VERSION} found!" else + IGNORE_CACHE='--ignore_cache' module --ignore_cache avail 2>&1 | grep -i easybuild/${EB_VERSION} &> ${ml_av_easybuild_out} if [[ $? -eq 0 ]]; then echo_green ">> Module for EasyBuild v${EB_VERSION} found!" @@ -108,7 +110,7 @@ else fi echo ">> Loading EasyBuild v${EB_VERSION} module..." -module load EasyBuild/${EB_VERSION} +module ${IGNORE_CACHE} load EasyBuild/${EB_VERSION} eb_show_system_info_out=${TMPDIR}/eb_show_system_info.out ${EB} --show-system-info > ${eb_show_system_info_out} if [[ $? -eq 0 ]]; then From a8fdd91817d0bb9a884fb2bf42520f1919a1e51c Mon Sep 17 00:00:00 2001 From: Tim Kok Date: Mon, 30 Oct 2023 15:59:53 +0100 Subject: [PATCH 09/14] Move IGNORE_CACHE variable down --- load_easybuild_module.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/load_easybuild_module.sh b/load_easybuild_module.sh index 11c780dcdd..d1bfd18bb5 100755 --- a/load_easybuild_module.sh +++ b/load_easybuild_module.sh @@ -76,10 +76,10 @@ else if [[ $? -eq 0 ]]; then echo_green ">> Module for EasyBuild v${EB_VERSION} found!" else - IGNORE_CACHE='--ignore_cache' module --ignore_cache avail 2>&1 | grep -i easybuild/${EB_VERSION} &> ${ml_av_easybuild_out} if [[ $? -eq 0 ]]; then echo_green ">> Module for EasyBuild v${EB_VERSION} found!" + IGNORE_CACHE='--ignore_cache' else eb_ec=EasyBuild-${EB_VERSION}.eb echo_yellow ">> Still no module for EasyBuild v${EB_VERSION}, trying with easyconfig ${eb_ec}..." From 0f803f491d6dfbbeab55cc08d7d70d6e7d3b8e40 Mon Sep 17 00:00:00 2001 From: Tim Kok Date: Mon, 30 Oct 2023 18:12:41 +0100 Subject: [PATCH 10/14] Use correct 4.8.2 PR --- eessi-2023.06-eb-4.8.1-system.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eessi-2023.06-eb-4.8.1-system.yml b/eessi-2023.06-eb-4.8.1-system.yml index 3d0e1c3c32..b0731d2534 100644 --- a/eessi-2023.06-eb-4.8.1-system.yml +++ b/eessi-2023.06-eb-4.8.1-system.yml @@ -6,4 +6,4 @@ easyconfigs: from-pr: 18851 - EasyBuild-4.8.2.eb: options: - from-pr: 19101 + from-pr: 19105 From 2aee11e3dac9a9b748e1456aba10d68aca22fce6 Mon Sep 17 00:00:00 2001 From: Tim Kok Date: Tue, 31 Oct 2023 14:15:20 +0100 Subject: [PATCH 11/14] Test excluding filter-deps for AOFlagger and casacore --- eessi-2023.06-eb-4.8.2-2022a.yml | 52 ++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/eessi-2023.06-eb-4.8.2-2022a.yml b/eessi-2023.06-eb-4.8.2-2022a.yml index 5e812716f2..8dbfe5c223 100644 --- a/eessi-2023.06-eb-4.8.2-2022a.yml +++ b/eessi-2023.06-eb-4.8.2-2022a.yml @@ -1,3 +1,55 @@ easyconfigs: + - casacore-3.5.0-foss-2022a: + options: + from-pr: 19119 + # Exclude ncurses + filter-deps: + - Autoconf + - Automake + - Autotools + - binutils + - bzip2 + - DBus + - flex + - gettext + - gperf + - help2man + - intltool + - libreadline + - libtool + - Lua + - M4 + - makeinfo + - util-linux + - XZ + - zlib + - AOFlagger-3.4.0-foss-2022a: + options: + from-pr: 19119 + # Exclude Lua + filter-deps: + - Autoconf + - Automake + - Autotools + - binutils + - bzip2 + - DBus + - flex + - gettext + - gperf + - help2man + - intltool + - libreadline + - libtool + - ncurses + - M4 + - makeinfo + - util-linux + - XZ + - zlib - DP3-6.0-foss-2022a: + options: + from-pr: 19119 - WSClean-3.4-foss-2022a: + options: + from-pr: 19119 From 7259183a4965ff0c83b75a7bc2f04fb47d1c4381 Mon Sep 17 00:00:00 2001 From: Tim Kok Date: Tue, 31 Oct 2023 14:53:53 +0100 Subject: [PATCH 12/14] Remove casacore (ncurses is picked up from compat layer) --- eessi-2023.06-eb-4.8.2-2022a.yml | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/eessi-2023.06-eb-4.8.2-2022a.yml b/eessi-2023.06-eb-4.8.2-2022a.yml index 8dbfe5c223..6b0dbc0387 100644 --- a/eessi-2023.06-eb-4.8.2-2022a.yml +++ b/eessi-2023.06-eb-4.8.2-2022a.yml @@ -1,28 +1,4 @@ easyconfigs: - - casacore-3.5.0-foss-2022a: - options: - from-pr: 19119 - # Exclude ncurses - filter-deps: - - Autoconf - - Automake - - Autotools - - binutils - - bzip2 - - DBus - - flex - - gettext - - gperf - - help2man - - intltool - - libreadline - - libtool - - Lua - - M4 - - makeinfo - - util-linux - - XZ - - zlib - AOFlagger-3.4.0-foss-2022a: options: from-pr: 19119 From a7294c51c28d5be8a1871e4e165f708ec3ce0a16 Mon Sep 17 00:00:00 2001 From: t1mk1k <96469032+t1mk1k@users.noreply.github.com> Date: Tue, 31 Oct 2023 15:02:37 +0100 Subject: [PATCH 13/14] Explain why Lua is excluded from filter-deps Co-authored-by: ocaisa --- eessi-2023.06-eb-4.8.2-2022a.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eessi-2023.06-eb-4.8.2-2022a.yml b/eessi-2023.06-eb-4.8.2-2022a.yml index 6b0dbc0387..b0e1992efe 100644 --- a/eessi-2023.06-eb-4.8.2-2022a.yml +++ b/eessi-2023.06-eb-4.8.2-2022a.yml @@ -2,7 +2,7 @@ easyconfigs: - AOFlagger-3.4.0-foss-2022a: options: from-pr: 19119 - # Exclude Lua + # Exclude Lua from `filter-deps` as the compat layer version is too old for the software filter-deps: - Autoconf - Automake From 31894ec295344e55338be9b225efabff20f9ae9a Mon Sep 17 00:00:00 2001 From: Tim Kok Date: Tue, 31 Oct 2023 17:01:17 +0100 Subject: [PATCH 14/14] Include casacore and EveryBeam from PR 19119 --- eessi-2023.06-eb-4.8.2-2022a.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/eessi-2023.06-eb-4.8.2-2022a.yml b/eessi-2023.06-eb-4.8.2-2022a.yml index b0e1992efe..bab796db2b 100644 --- a/eessi-2023.06-eb-4.8.2-2022a.yml +++ b/eessi-2023.06-eb-4.8.2-2022a.yml @@ -1,4 +1,7 @@ easyconfigs: + - casacore-3.5.0-foss-2022a: + options: + from-pr: 19119 - AOFlagger-3.4.0-foss-2022a: options: from-pr: 19119 @@ -23,6 +26,9 @@ easyconfigs: - util-linux - XZ - zlib + - EveryBeam-0.5.2-foss-2022a: + options: + from-pr: 19119 - DP3-6.0-foss-2022a: options: from-pr: 19119