Merge branch '2023.06-software.eessi.io' of github-trz:EESSI/software-layer into 2023.06-a64fx-2023a-eb491-apps-pytorch

Author: truib

det_submit_opts.py

@@ -266,34 +266,34 @@ easyconfigs:
 # R-bundle-CRAN requires a lot of time. We first build that one and afterwards
 # continue with the ones below.
 #
-## while PR 20379 is included since EB 4.9.2, we need to use a commit to avoid
-## rebuilding R-bundle-Bioconductor due to the later PR 21948 which was only made
-## available with EB 5.0.0
-##  - R-bundle-Bioconductor-3.18-foss-2023a-R-4.3.2.eb:
-##      options:
-##        from-pr: 20379
+# while PR 20379 is included since EB 4.9.2, we need to use a commit to avoid
+# rebuilding R-bundle-Bioconductor due to the later PR 21948 which was only made
+# available with EB 5.0.0
 #  - R-bundle-Bioconductor-3.18-foss-2023a-R-4.3.2.eb:
 #      options:
-#        # (additional extensions have been added)
-#        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21948
-#        from-commit: f9cfe6ac7d9019970c2be3e8b09db4d846cf005a
-## PR 18852 is included since EB 4.9.2
-##  - ipympl-0.9.3-gfbf-2023a.eb:
-##      options:
-##        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/18852
-##        from-pr: 18852
-#  - ipympl-0.9.3-gfbf-2023a.eb
-## PR 20595 is included since EB 4.9.2
-##  - ESPResSo-4.2.2-foss-2023a.eb:
-##      options:
-##        from-pr: 20595
-#  - ESPResSo-4.2.2-foss-2023a.eb
-#  - GATK-4.5.0.0-GCCcore-12.3.0-Java-17.eb
-#  - WhatsHap-2.2-foss-2023a.eb
-## PR 20784 is included since EB 4.9.2
-##  - BLAST+-2.14.1-gompi-2023a.eb:
-##      options:
-##        from-pr: 20784
-#  - BLAST+-2.14.1-gompi-2023a.eb
-#  - Valgrind-3.21.0-gompi-2023a.eb
-#  - OrthoFinder-2.5.5-foss-2023a.eb
+#        from-pr: 20379
+  - R-bundle-Bioconductor-3.18-foss-2023a-R-4.3.2.eb:
+      options:
+        # (additional extensions have been added)
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21948
+        from-commit: f9cfe6ac7d9019970c2be3e8b09db4d846cf005a
+# PR 18852 is included since EB 4.9.2
+#  - ipympl-0.9.3-gfbf-2023a.eb:
+#      options:
+#        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/18852
+#        from-pr: 18852
+  - ipympl-0.9.3-gfbf-2023a.eb
+# PR 20595 is included since EB 4.9.2
+#  - ESPResSo-4.2.2-foss-2023a.eb:
+#      options:
+#        from-pr: 20595
+  - ESPResSo-4.2.2-foss-2023a.eb
+  - GATK-4.5.0.0-GCCcore-12.3.0-Java-17.eb
+  - WhatsHap-2.2-foss-2023a.eb
+# PR 20784 is included since EB 4.9.2
+#  - BLAST+-2.14.1-gompi-2023a.eb:
+#      options:
+#        from-pr: 20784
+  - BLAST+-2.14.1-gompi-2023a.eb
+  - Valgrind-3.21.0-gompi-2023a.eb
+  - OrthoFinder-2.5.5-foss-2023a.eb

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

@@ -80,12 +80,10 @@ easyconfigs:
   - OpenJPEG-2.5.0-GCCcore-13.2.0.eb
   - libwebp-1.3.2-GCCcore-13.2.0.eb
   - Wayland-1.22.0-GCCcore-13.2.0.eb
-# building nodejs (dependency of Qt5) failed in a first attempt, so we build the
-# other packages and pick that up later
-## originally built with EB 4.9.0, PR was included since EB 4.9.1
-##  - Qt5-5.15.13-GCCcore-13.2.0.eb:
-##      options:
-##        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20201
-##        from-pr: 20201
-#  - Qt5-5.15.13-GCCcore-13.2.0.eb
   - OSU-Micro-Benchmarks-7.2-gompi-2023b.eb
+# originally built with EB 4.9.0, PR was included since EB 4.9.1
+#  - Qt5-5.15.13-GCCcore-13.2.0.eb:
+#      options:
+#        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/20201
+#        from-pr: 20201
+  - Qt5-5.15.13-GCCcore-13.2.0.eb

easystacks/software.eessi.io/2023.06/a64fx/eessi-2023.06-eb-4.9.4-2023b.yml

@@ -13,6 +13,7 @@
 from easybuild.tools.run import run_cmd
 from easybuild.tools.systemtools import AARCH64, POWER, X86_64, get_cpu_architecture, get_cpu_features
 from easybuild.tools.toolchain.compiler import OPTARCH_GENERIC
+from easybuild.tools.version import VERSION as EASYBUILD_VERSION
 
 # prefer importing LooseVersion from easybuild.tools, but fall back to distuils in case EasyBuild <= 4.7.0 is used
 try:
@@ -126,9 +127,15 @@ def post_ready_hook(self, *args, **kwargs):
     Post-ready hook: limit parallellism for selected builds based on software name and CPU target.
                      parallelism needs to be limited because some builds require a lot of memory per used core.
     """
-    # 'parallel' easyconfig parameter is set via EasyBlock.set_parallel in ready step based on available cores.
+    # 'parallel' (EB4) or 'max_parallel' (EB5) easyconfig parameter is set via EasyBlock.set_parallel in ready step
+    # based on available cores.
+
+    # Check whether we have EasyBuild 4 or 5
+    parallel_param = 'parallel'
+    if EASYBUILD_VERSION >= '5':
+        parallel_param = 'max_parallel'
     # get current parallelism setting
-    parallel = self.cfg['parallel']
+    parallel = self.cfg[parallel_param]
     if parallel == 1:
         return  # no need to limit if already using 1 core
 
@@ -152,7 +159,7 @@ def post_ready_hook(self, *args, **kwargs):
 
         # apply the limit if it's different from current
         if new_parallel != parallel:
-            self.cfg['parallel'] = new_parallel
+            self.cfg[parallel_param] = new_parallel
             msg = "limiting parallelism to %s (was %s) for %s on %s to avoid out-of-memory failures during building/testing"
             print_msg(msg % (new_parallel, parallel, self.name, cpu_target), log=self.log)
 
@@ -1273,6 +1280,9 @@ def set_maximum(parallel, max_value):
         '*': (divide_by_factor, 2),
         CPU_TARGET_A64FX: (set_maximum, 12),
     },
+    'nodejs': {
+        CPU_TARGET_A64FX: (divide_by_factor, 2),
+    },
     'MBX': {
         '*': (divide_by_factor, 2),
     },
@@ -1284,7 +1294,7 @@ def set_maximum(parallel, max_value):
         CPU_TARGET_A64FX: (set_maximum, 8),
     },
     'Qt5': {
-        CPU_TARGET_A64FX: (divide_by_factor, 2),
+        CPU_TARGET_A64FX: (set_maximum, 8),
     },
     'ROOT': {
         CPU_TARGET_A64FX: (divide_by_factor, 2),