From f031b87b74a6aa6f57e270b60300080613655667 Mon Sep 17 00:00:00 2001 From: Thomas Roeblitz Date: Wed, 25 Oct 2023 10:42:00 +0200 Subject: [PATCH 1/6] {2023.06}[foss/2022a] add PROJ v9.0.0 --- EESSI-pilot-install-software.sh | 3 +++ eessi-2023.06-eb-4.8.1-2022a.yml | 2 ++ 2 files changed, 5 insertions(+) diff --git a/EESSI-pilot-install-software.sh b/EESSI-pilot-install-software.sh index 026919157f..209f4c3e91 100755 --- a/EESSI-pilot-install-software.sh +++ b/EESSI-pilot-install-software.sh @@ -208,6 +208,9 @@ for easystack_file in $(cat ${pr_diff} | grep '^+++' | cut -f2 -d' ' | sed 's@^[ ${EB} --easystack ${TOPDIR}/${easystack_file} --robot ec=$? + ${EB} --easystack ${TOPDIR}/${easystack_file} --robot + ec=$? + # copy EasyBuild log file if EasyBuild exited with an error if [ ${ec} -ne 0 ]; then eb_last_log=$(unset EB_VERBOSE; eb --last-log) diff --git a/eessi-2023.06-eb-4.8.1-2022a.yml b/eessi-2023.06-eb-4.8.1-2022a.yml index 840feb96bb..4d606f276f 100644 --- a/eessi-2023.06-eb-4.8.1-2022a.yml +++ b/eessi-2023.06-eb-4.8.1-2022a.yml @@ -63,3 +63,5 @@ easyconfigs: options: download-timeout: 1000 - ASE-3.22.1-foss-2022a.eb + - PROJ-9.0.0-GCCcore-11.3.0.eb + - PROJ-9.0.0-GCCcore-11.3.0.eb From 1956414fde9288288e96c771665dfcfb32f1d292 Mon Sep 17 00:00:00 2001 From: Thomas Roeblitz Date: Wed, 25 Oct 2023 10:48:46 +0200 Subject: [PATCH 2/6] show more debug info: env settings --- EESSI-pilot-install-software.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/EESSI-pilot-install-software.sh b/EESSI-pilot-install-software.sh index 209f4c3e91..7e775282fd 100755 --- a/EESSI-pilot-install-software.sh +++ b/EESSI-pilot-install-software.sh @@ -200,6 +200,11 @@ for easystack_file in $(cat ${pr_diff} | grep '^+++' | cut -f2 -d' ' | sed 's@^[ ${EB} --show-config + echo "################################################################################" + echo "#### SHOW ENV" + env | sort + echo "################################################################################" + echo_green "All set, let's start installing some software with EasyBuild v${eb_version} in ${EASYBUILD_INSTALLPATH}..." if [ -f ${easystack_file} ]; then From b959571a1e3136a779658e89dac1e3b0c1de8393 Mon Sep 17 00:00:00 2001 From: Thomas Roeblitz Date: Wed, 25 Oct 2023 11:28:58 +0200 Subject: [PATCH 3/6] remove some lua files from broadwell /cvmfs before building --- EESSI-pilot-install-software.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/EESSI-pilot-install-software.sh b/EESSI-pilot-install-software.sh index 7e775282fd..f9fc526669 100755 --- a/EESSI-pilot-install-software.sh +++ b/EESSI-pilot-install-software.sh @@ -200,10 +200,15 @@ for easystack_file in $(cat ${pr_diff} | grep '^+++' | cut -f2 -d' ' | sed 's@^[ ${EB} --show-config - echo "################################################################################" - echo "#### SHOW ENV" - env | sort - echo "################################################################################" + echo "Removing some lua files to trigger rebuilding packages" + rm /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/modules/all/jbigkit/2.1-GCCcore-11.3.0.lua + rm /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/modules/all/NASM/2.15.05-GCCcore-11.3.0.lua + rm /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/modules/all/libjpeg-turbo/2.1.3-GCCcore-11.3.0.lua + rm /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/modules/all/libdeflate/1.10-GCCcore-11.3.0.lua + rm /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/modules/all/gzip/1.12-GCCcore-11.3.0.lua + rm /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/modules/all/lz4/1.9.3-GCCcore-11.3.0.lua + rm /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/modules/all/zstd/1.5.2-GCCcore-11.3.0.lua + rm /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/modules/all/LibTIFF/4.3.0-GCCcore-11.3.0.lua echo_green "All set, let's start installing some software with EasyBuild v${eb_version} in ${EASYBUILD_INSTALLPATH}..." @@ -213,9 +218,6 @@ for easystack_file in $(cat ${pr_diff} | grep '^+++' | cut -f2 -d' ' | sed 's@^[ ${EB} --easystack ${TOPDIR}/${easystack_file} --robot ec=$? - ${EB} --easystack ${TOPDIR}/${easystack_file} --robot - ec=$? - # copy EasyBuild log file if EasyBuild exited with an error if [ ${ec} -ne 0 ]; then eb_last_log=$(unset EB_VERBOSE; eb --last-log) From 570fc524ef86a0207cc7bac54919400fbc55e998 Mon Sep 17 00:00:00 2001 From: Thomas Roeblitz Date: Wed, 25 Oct 2023 12:24:17 +0200 Subject: [PATCH 4/6] remove some software directories from broadwell /cvmfs before building --- EESSI-pilot-install-software.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/EESSI-pilot-install-software.sh b/EESSI-pilot-install-software.sh index f9fc526669..2ba9550170 100755 --- a/EESSI-pilot-install-software.sh +++ b/EESSI-pilot-install-software.sh @@ -202,13 +202,28 @@ for easystack_file in $(cat ${pr_diff} | grep '^+++' | cut -f2 -d' ' | sed 's@^[ echo "Removing some lua files to trigger rebuilding packages" rm /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/modules/all/jbigkit/2.1-GCCcore-11.3.0.lua + rm -rf /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/software/jbigkit/2.1-GCCcore-11.3.0 + rm /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/modules/all/NASM/2.15.05-GCCcore-11.3.0.lua + rm -rf /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/software/NASM/2.15.05-GCCcore-11.3.0 + rm /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/modules/all/libjpeg-turbo/2.1.3-GCCcore-11.3.0.lua + rm -rf /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/software/libjpeg-turbo/2.1.3-GCCcore-11.3.0 + rm /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/modules/all/libdeflate/1.10-GCCcore-11.3.0.lua + rm -rf /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/software/libdeflate/1.10-GCCcore-11.3.0 + rm /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/modules/all/gzip/1.12-GCCcore-11.3.0.lua + rm -rf /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/software/gzip/1.12-GCCcore-11.3.0 + rm /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/modules/all/lz4/1.9.3-GCCcore-11.3.0.lua + rm -rf /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/software/lz4/1.9.3-GCCcore-11.3.0 + rm /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/modules/all/zstd/1.5.2-GCCcore-11.3.0.lua + rm -rf /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/software/zstd/1.5.2-GCCcore-11.3.0 + rm /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/modules/all/LibTIFF/4.3.0-GCCcore-11.3.0.lua + rm -rf /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/software/LibTIFF/4.3.0-GCCcore-11.3.0 echo_green "All set, let's start installing some software with EasyBuild v${eb_version} in ${EASYBUILD_INSTALLPATH}..." From 73dd57ca2cdcf65287ef7f6c4833e435e856d28c Mon Sep 17 00:00:00 2001 From: Thomas Roeblitz Date: Wed, 25 Oct 2023 12:57:28 +0200 Subject: [PATCH 5/6] undo extra steps, just install PROJ --- EESSI-pilot-install-software.sh | 25 ------------------------- eessi-2023.06-eb-4.8.1-2022a.yml | 1 - 2 files changed, 26 deletions(-) diff --git a/EESSI-pilot-install-software.sh b/EESSI-pilot-install-software.sh index 2ba9550170..026919157f 100755 --- a/EESSI-pilot-install-software.sh +++ b/EESSI-pilot-install-software.sh @@ -200,31 +200,6 @@ for easystack_file in $(cat ${pr_diff} | grep '^+++' | cut -f2 -d' ' | sed 's@^[ ${EB} --show-config - echo "Removing some lua files to trigger rebuilding packages" - rm /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/modules/all/jbigkit/2.1-GCCcore-11.3.0.lua - rm -rf /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/software/jbigkit/2.1-GCCcore-11.3.0 - - rm /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/modules/all/NASM/2.15.05-GCCcore-11.3.0.lua - rm -rf /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/software/NASM/2.15.05-GCCcore-11.3.0 - - rm /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/modules/all/libjpeg-turbo/2.1.3-GCCcore-11.3.0.lua - rm -rf /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/software/libjpeg-turbo/2.1.3-GCCcore-11.3.0 - - rm /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/modules/all/libdeflate/1.10-GCCcore-11.3.0.lua - rm -rf /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/software/libdeflate/1.10-GCCcore-11.3.0 - - rm /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/modules/all/gzip/1.12-GCCcore-11.3.0.lua - rm -rf /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/software/gzip/1.12-GCCcore-11.3.0 - - rm /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/modules/all/lz4/1.9.3-GCCcore-11.3.0.lua - rm -rf /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/software/lz4/1.9.3-GCCcore-11.3.0 - - rm /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/modules/all/zstd/1.5.2-GCCcore-11.3.0.lua - rm -rf /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/software/zstd/1.5.2-GCCcore-11.3.0 - - rm /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/modules/all/LibTIFF/4.3.0-GCCcore-11.3.0.lua - rm -rf /cvmfs/pilot.nessi.no/versions/2023.06/software/linux/x86_64/intel/broadwell/software/LibTIFF/4.3.0-GCCcore-11.3.0 - echo_green "All set, let's start installing some software with EasyBuild v${eb_version} in ${EASYBUILD_INSTALLPATH}..." if [ -f ${easystack_file} ]; then diff --git a/eessi-2023.06-eb-4.8.1-2022a.yml b/eessi-2023.06-eb-4.8.1-2022a.yml index 4d606f276f..49e78f974b 100644 --- a/eessi-2023.06-eb-4.8.1-2022a.yml +++ b/eessi-2023.06-eb-4.8.1-2022a.yml @@ -64,4 +64,3 @@ easyconfigs: download-timeout: 1000 - ASE-3.22.1-foss-2022a.eb - PROJ-9.0.0-GCCcore-11.3.0.eb - - PROJ-9.0.0-GCCcore-11.3.0.eb From 386d7ade737dad30689f08cb2a12fac96f247f15 Mon Sep 17 00:00:00 2001 From: Thomas Roeblitz Date: Wed, 25 Oct 2023 14:15:37 +0200 Subject: [PATCH 6/6] comment out missing software installs on cascadelake --- eessi-2023.06-eb-4.8.1-2022a.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eessi-2023.06-eb-4.8.1-2022a.yml b/eessi-2023.06-eb-4.8.1-2022a.yml index 49e78f974b..ea27b3c19d 100644 --- a/eessi-2023.06-eb-4.8.1-2022a.yml +++ b/eessi-2023.06-eb-4.8.1-2022a.yml @@ -59,8 +59,8 @@ easyconfigs: # Uses a custom hook since has zlib as dependency which has hard coded header and library path within Pillow code. options: from-pr: 18881 - - ParaView-5.10.1-foss-2022a-mpi.eb: - options: - download-timeout: 1000 - - ASE-3.22.1-foss-2022a.eb + # - ParaView-5.10.1-foss-2022a-mpi.eb: + # options: + # download-timeout: 1000 + # - ASE-3.22.1-foss-2022a.eb - PROJ-9.0.0-GCCcore-11.3.0.eb