Skip to content

{2023.06}[foss/2022a] DP3 6.0 and WSClean 3.4 #370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ocaisa merged 15 commits into from
Nov 1, 2023
Merged

{2023.06}[foss/2022a] DP3 6.0 and WSClean 3.4 #370

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
3be4823
Add DP3-6.0-foss-2022a and WSClean-3.4-foss-2022a
Oct 19, 2023
207fb71
Add EasyBuild v4.8.2
Oct 30, 2023
1083078
Add EasyBuild v4.8.2
Oct 30, 2023
e2644fa
Add EasyBuild 4.8.2 to 4.8.1 system file
Oct 30, 2023
eb503d9
Remove EasyBuild 4.8.2 from 4.8.0 system file
Oct 30, 2023
23b23f1
Try loading module without cache before exiting
Oct 30, 2023
48735b5
Fix position ignore_cache flag
Oct 30, 2023
d97d23b
Also ignore cache when loading EB module
Oct 30, 2023
a8fdd91
Move IGNORE_CACHE variable down
Oct 30, 2023
0f803f4
Use correct 4.8.2 PR
Oct 30, 2023
d1b12b7
Merge branch 'EESSI:2023.06' into add-wsclean-dp3-to-2022a
t1mk1k Oct 31, 2023
2aee11e
Test excluding filter-deps for AOFlagger and casacore
Oct 31, 2023
7259183
Remove casacore (ncurses is picked up from compat layer)
Oct 31, 2023
a7294c5
Explain why Lua is excluded from filter-deps
t1mk1k Oct 31, 2023
31894ec
Include casacore and EveryBeam from PR 19119
Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions eessi-2023.06-eb-4.8.1-system.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ easyconfigs:
- ReFrame-4.3.3.eb:
options:
from-pr: 18851
- EasyBuild-4.8.2.eb:
options:
from-pr: 19101
3 changes: 3 additions & 0 deletions eessi-2023.06-eb-4.8.2-2022a.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
easyconfigs:
- DP3-6.0-foss-2022a:
- WSClean-3.4-foss-2022a:
27 changes: 16 additions & 11 deletions load_easybuild_module.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 --ignore_cache avail 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

Expand Down