From a8b9fb96baa55fdd9841cfa150c2407fe553cf72 Mon Sep 17 00:00:00 2001 From: Richard Top Date: Wed, 28 Jun 2023 10:26:20 +0000 Subject: [PATCH 1/9] {2023.06}[foss/2021a] WRF-dmpar V4.3 --- eessi-2023.06-eb-4.7.2-2021a.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eessi-2023.06-eb-4.7.2-2021a.yml b/eessi-2023.06-eb-4.7.2-2021a.yml index a86e090ce6..2658ba08ac 100644 --- a/eessi-2023.06-eb-4.7.2-2021a.yml +++ b/eessi-2023.06-eb-4.7.2-2021a.yml @@ -9,3 +9,4 @@ easyconfigs: - Rust-1.52.1-GCCcore-10.3.0.eb - foss-2021a.eb - QuantumESPRESSO-6.7-foss-2021a.eb + - WRF-4.3-foss-2021a-dmpar.eb From 724125a26980bd65cf1e7dd50e254e4dc935f83a Mon Sep 17 00:00:00 2001 From: Richard Top Date: Fri, 4 Aug 2023 09:55:16 +0000 Subject: [PATCH 2/9] {2023.06}[foss/2021a] BAGEL V1.2.2 --- eessi-2023.06-eb-4.7.2-2021a.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eessi-2023.06-eb-4.7.2-2021a.yml b/eessi-2023.06-eb-4.7.2-2021a.yml index 60a80e3b12..4cbb85d671 100644 --- a/eessi-2023.06-eb-4.7.2-2021a.yml +++ b/eessi-2023.06-eb-4.7.2-2021a.yml @@ -15,3 +15,6 @@ easyconfigs: options: download-timeout: 1000 - libGLU-9.0.1-GCCcore-10.3.0.eb + - BAGEL-1.2.2-foss-2021a.eb: + options: + from-pr: 18446 From 7f8bd44ad86ee515404150700a06f2129dba1d20 Mon Sep 17 00:00:00 2001 From: Richard Top Date: Wed, 20 Sep 2023 06:30:34 +0000 Subject: [PATCH 3/9] fixed typo-code error --- eb_hooks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eb_hooks.py b/eb_hooks.py index 22857ae32d..e66b21278d 100644 --- a/eb_hooks.py +++ b/eb_hooks.py @@ -248,7 +248,7 @@ def pre_configure_hook_wrf_aarch64(self, *args, **kwargs): else: raise EasyBuildError("WRF-specific hook triggered for non-WRF easyconfig?!") -PARSE_HOOKS{ +PARSE_HOOKS = { 'CGAL': parse_hook_cgal_toolchainopts_precise, 'fontconfig': parse_hook_fontconfig_add_fonts, 'OpenBLAS': parse_hook_openblas_relax_lapack_tests_num_errors, From 155a08ce8daa973c7e496e9ed719f77179471c2f Mon Sep 17 00:00:00 2001 From: Richard Top Date: Thu, 28 Sep 2023 11:00:10 +0000 Subject: [PATCH 4/9] added the _OVERRIDE value in test_eessi.yml --- .github/workflows/test_eessi.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test_eessi.yml b/.github/workflows/test_eessi.yml index cf1395f199..60e86da99d 100644 --- a/.github/workflows/test_eessi.yml +++ b/.github/workflows/test_eessi.yml @@ -11,7 +11,7 @@ jobs: matrix: EESSI_VERSION: - 2023.06 - EESSI_SOFTWARE_SUBDIR: + EESSI_SOFTWARE_SUBDIR_OVERRIDE: - aarch64/generic - x86_64/amd/zen2 - x86_64/intel/broadwell @@ -41,7 +41,7 @@ jobs: eb --version export EESSI_PREFIX=/cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}} export EESSI_OS_TYPE=linux - export EESSI_SOFTWARE_SUBDIR=${{matrix.EESSI_SOFTWARE_SUBDIR}} + export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}} env | grep ^EESSI | sort echo "just run check_missing_installations.sh (should use eessi-${{matrix.EESSI_VERSION}}.yml)" ./check_missing_installations.sh ${{matrix.EASYSTACK_FILE}} @@ -53,7 +53,7 @@ jobs: eb --version export EESSI_PREFIX=/cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}} export EESSI_OS_TYPE=linux - export EESSI_SOFTWARE_SUBDIR=${{matrix.EESSI_SOFTWARE_SUBDIR}} + export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}} env | grep ^EESSI | sort echo "modify easystack file by adding a missing package (GCC/8.3.0)" echo " - GCC-8.3.0:" >> ${{matrix.EASYSTACK_FILE}} From 05f3817785dfd9cd4f6c2172d3ccb489a4ae5e65 Mon Sep 17 00:00:00 2001 From: Richard Top Date: Thu, 28 Sep 2023 11:09:44 +0000 Subject: [PATCH 5/9] modified declaration and exection order in test_eessi.yml --- .github/workflows/test_eessi.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_eessi.yml b/.github/workflows/test_eessi.yml index 60e86da99d..538732f3ce 100644 --- a/.github/workflows/test_eessi.yml +++ b/.github/workflows/test_eessi.yml @@ -37,11 +37,11 @@ jobs: - name: Test check_missing_installations.sh script run: | source /cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}}/init/bash + export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}} module load EasyBuild eb --version export EESSI_PREFIX=/cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}} export EESSI_OS_TYPE=linux - export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}} env | grep ^EESSI | sort echo "just run check_missing_installations.sh (should use eessi-${{matrix.EESSI_VERSION}}.yml)" ./check_missing_installations.sh ${{matrix.EASYSTACK_FILE}} @@ -49,11 +49,11 @@ jobs: - name: Test check_missing_installations.sh with missing package (GCC/8.3.0) run: | source /cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}}/init/bash + export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}} module load EasyBuild eb --version export EESSI_PREFIX=/cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}} export EESSI_OS_TYPE=linux - export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}} env | grep ^EESSI | sort echo "modify easystack file by adding a missing package (GCC/8.3.0)" echo " - GCC-8.3.0:" >> ${{matrix.EASYSTACK_FILE}} From f5f9e0d835b00c24b1c4091932223f39d224c5f3 Mon Sep 17 00:00:00 2001 From: Richard Top Date: Thu, 28 Sep 2023 11:13:02 +0000 Subject: [PATCH 6/9] modified declaration and exection order in test_eessi.yml --- .github/workflows/test_eessi.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_eessi.yml b/.github/workflows/test_eessi.yml index 538732f3ce..b42195c9ab 100644 --- a/.github/workflows/test_eessi.yml +++ b/.github/workflows/test_eessi.yml @@ -36,8 +36,8 @@ jobs: - name: Test check_missing_installations.sh script run: | - source /cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}}/init/bash export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}} + source /cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}}/init/bash module load EasyBuild eb --version export EESSI_PREFIX=/cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}} @@ -48,8 +48,8 @@ jobs: - name: Test check_missing_installations.sh with missing package (GCC/8.3.0) run: | - source /cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}}/init/bash export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}} + source /cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}}/init/bash module load EasyBuild eb --version export EESSI_PREFIX=/cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}} From 00337394dd8be8a72861a7436474e211dea85366 Mon Sep 17 00:00:00 2001 From: Richard Top Date: Thu, 28 Sep 2023 11:41:32 +0000 Subject: [PATCH 7/9] which eb in test_eessi.yml --- .github/workflows/test_eessi.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test_eessi.yml b/.github/workflows/test_eessi.yml index b42195c9ab..2fc071da8b 100644 --- a/.github/workflows/test_eessi.yml +++ b/.github/workflows/test_eessi.yml @@ -39,6 +39,7 @@ jobs: export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}} source /cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}}/init/bash module load EasyBuild + which eb eb --version export EESSI_PREFIX=/cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}} export EESSI_OS_TYPE=linux @@ -51,6 +52,7 @@ jobs: export EESSI_SOFTWARE_SUBDIR_OVERRIDE=${{matrix.EESSI_SOFTWARE_SUBDIR_OVERRIDE}} source /cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}}/init/bash module load EasyBuild + which eb eb --version export EESSI_PREFIX=/cvmfs/pilot.nessi.no/versions/${{matrix.EESSI_VERSION}} export EESSI_OS_TYPE=linux From 9e2e17ea7084e8c54fc9df085aae0726419a1de4 Mon Sep 17 00:00:00 2001 From: Thomas Roeblitz Date: Tue, 3 Oct 2023 14:38:51 +0200 Subject: [PATCH 8/9] remove cURL from filter-deps --- configure_easybuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure_easybuild b/configure_easybuild index 23f3920154..7dca1ce682 100644 --- a/configure_easybuild +++ b/configure_easybuild @@ -26,7 +26,7 @@ fi # note: filtering Bison may break some installations, like Qt5 (see https://github.com/EESSI/software-layer/issues/49) # filtering pkg-config breaks R-bundle-Bioconductor installation (see also https://github.com/easybuilders/easybuild-easyconfigs/pull/11104) # problems occur when filtering pkg-config with gnuplot too (picks up Lua 5.1 from $EPREFIX rather than from Lua 5.3 dependency) -DEPS_TO_FILTER=Autoconf,Automake,Autotools,binutils,bzip2,cURL,DBus,flex,gettext,gperf,help2man,intltool,libreadline,libtool,Lua,M4,makeinfo,ncurses,util-linux,XZ,zlib +DEPS_TO_FILTER=Autoconf,Automake,Autotools,binutils,bzip2,DBus,flex,gettext,gperf,help2man,intltool,libreadline,libtool,Lua,M4,makeinfo,ncurses,util-linux,XZ,zlib # For aarch64 we need to also filter out Yasm. # See https://github.com/easybuilders/easybuild-easyconfigs/issues/11190 if [[ "$EESSI_CPU_FAMILY" == "aarch64" ]]; then From e9962edfffcd7e3e14fe838308af6510cc86d19f Mon Sep 17 00:00:00 2001 From: Thomas Roeblitz Date: Tue, 3 Oct 2023 14:42:33 +0200 Subject: [PATCH 9/9] add ec files for git --- eessi-2023.06-eb-4.7.2-2021a.yml | 1 + eessi-2023.06-eb-4.7.2-2021b.yml | 1 + eessi-2023.06-eb-4.7.2-2022a.yml | 1 + eessi-2023.06-eb-4.7.2-2022b.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/eessi-2023.06-eb-4.7.2-2021a.yml b/eessi-2023.06-eb-4.7.2-2021a.yml index 8d4f37b22b..b7c703369b 100644 --- a/eessi-2023.06-eb-4.7.2-2021a.yml +++ b/eessi-2023.06-eb-4.7.2-2021a.yml @@ -3,6 +3,7 @@ easyconfigs: # - OpenSSL-1.1.eb: # options: # include-easyblocks-from-pr: 2922 + - git-2.32.0-GCCcore-10.3.0-nodocs.eb - GCC-10.3.0 - CMake-3.20.1-GCCcore-10.3.0.eb # - CMake-3.20.1-GCCcore-10.3.0.eb: diff --git a/eessi-2023.06-eb-4.7.2-2021b.yml b/eessi-2023.06-eb-4.7.2-2021b.yml index d6e2fb67ba..45776823ea 100644 --- a/eessi-2023.06-eb-4.7.2-2021b.yml +++ b/eessi-2023.06-eb-4.7.2-2021b.yml @@ -1,5 +1,6 @@ easyconfigs: - GCC-11.2.0 + - git-2.33.1-GCCcore-11.2.0-nodocs.eb - CMake-3.21.1-GCCcore-11.2.0.eb # - CMake-3.21.1-GCCcore-11.2.0.eb: # options: diff --git a/eessi-2023.06-eb-4.7.2-2022a.yml b/eessi-2023.06-eb-4.7.2-2022a.yml index 786f873999..9991de1508 100644 --- a/eessi-2023.06-eb-4.7.2-2022a.yml +++ b/eessi-2023.06-eb-4.7.2-2022a.yml @@ -1,5 +1,6 @@ easyconfigs: - GCC-11.3.0 + - git-2.36.0-GCCcore-11.3.0-nodocs.eb - CMake-3.23.1-GCCcore-11.3.0.eb # - CMake-3.23.1-GCCcore-11.3.0.eb: # options: diff --git a/eessi-2023.06-eb-4.7.2-2022b.yml b/eessi-2023.06-eb-4.7.2-2022b.yml index d691317ede..129b709b1c 100644 --- a/eessi-2023.06-eb-4.7.2-2022b.yml +++ b/eessi-2023.06-eb-4.7.2-2022b.yml @@ -1,5 +1,6 @@ easyconfigs: - GCC-12.2.0 + - git-2.38.1-GCCcore-12.2.0-nodocs.eb - CMake-3.24.3-GCCcore-12.2.0.eb # - CMake-3.24.3-GCCcore-12.2.0.eb: # options: