Merge branch '2023.06' into 2023.06_2021a_R-4.1.0

.github/workflows/test_eessi.yml

@@ -32,6 +32,7 @@ jobs:
         - eessi-2023.06-eb-4.8.1-system.yml
         - eessi-2023.06-eb-4.8.1-2021a.yml
         - eessi-2023.06-eb-4.8.1-2021b.yml
+        - eessi-2023.06-eb-4.8.1-2022a.yml
     steps:
         - name: Check out software-layer repository
           uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0

bot/build.sh

@@ -57,23 +57,27 @@ echo "bot/build.sh: LOCAL_TMP='${LOCAL_TMP}'"
 BUILD_LOGS_DIR=$(cfg_get_value "site_config" "build_logs_dir")
 echo "bot/build.sh: BUILD_LOGS_DIR='${BUILD_LOGS_DIR}'"
 # if $BUILD_LOGS_DIR is set, add it to $SINGULARITY_BIND so the path is available in the build container
-mkdir -p ${BUILD_LOGS_DIR}
-if [[ -z ${SINGULARITY_BIND} ]]; then
-    export SINGULARITY_BIND="${BUILD_LOGS_DIR}"
-else
-    export SINGULARITY_BIND="${SINGULARITY_BIND},${BUILD_LOGS_DIR}"
+if [[ ! -z ${BUILD_LOGS_DIR} ]]; then
+    mkdir -p ${BUILD_LOGS_DIR}
+    if [[ -z ${SINGULARITY_BIND} ]]; then
+        export SINGULARITY_BIND="${BUILD_LOGS_DIR}"
+    else
+        export SINGULARITY_BIND="${SINGULARITY_BIND},${BUILD_LOGS_DIR}"
+    fi
 fi
 
 # check if path to directory on shared filesystem is specified,
 # and use it as location for source tarballs used by EasyBuild if so
 SHARED_FS_PATH=$(cfg_get_value "site_config" "shared_fs_path")
 echo "bot/build.sh: SHARED_FS_PATH='${SHARED_FS_PATH}'"
 # if $SHARED_FS_PATH is set, add it to $SINGULARITY_BIND so the path is available in the build container
-mkdir -p ${SHARED_FS_PATH}
-if [[ -z ${SINGULARITY_BIND} ]]; then
-    export SINGULARITY_BIND="${SHARED_FS_PATH}"
-else
-    export SINGULARITY_BIND="${SINGULARITY_BIND},${SHARED_FS_PATH}"
+if [[ ! -z ${SHARED_FS_PATH} ]]; then
+    mkdir -p ${SHARED_FS_PATH}
+    if [[ -z ${SINGULARITY_BIND} ]]; then
+        export SINGULARITY_BIND="${SHARED_FS_PATH}"
+    else
+        export SINGULARITY_BIND="${SINGULARITY_BIND},${SHARED_FS_PATH}"
+    fi
 fi
 
 SINGULARITY_CACHEDIR=$(cfg_get_value "site_config" "container_cachedir")

eb_hooks.py

@@ -300,6 +300,16 @@ def pre_single_extension_isoband(ext, *args, **kwargs):
         ext.cfg['preinstallopts'] = "sed -i 's/SIGSTKSZ/32768/g' src/testthat/vendor/catch.h && "
 
 
+def pre_test_hook_ignore_failing_tests_FFTWMPI(self, *args, **kwargs):
+    """
+    Pre-test hook for FFTW.MPI: skip failing tests for FFTW.MPI 3.3.10 on neoverse_v1
+    cfr. https://github.com/EESSI/software-layer/issues/325
+    """
+    cpu_target = get_eessi_envvar('EESSI_SOFTWARE_SUBDIR')
+    if self.name == 'FFTW.MPI' and self.version == '3.3.10' and cpu_target == 'aarch64/neoverse_v1':
+        self.cfg['testopts'] = "|| echo ignoring failing tests"
+
+
 PARSE_HOOKS = {
     'CGAL': parse_hook_cgal_toolchainopts_precise,
     'fontconfig': parse_hook_fontconfig_add_fonts,
@@ -321,6 +331,7 @@ def pre_single_extension_isoband(ext, *args, **kwargs):
 
 PRE_TEST_HOOKS = {
     'SciPy-bundle': pre_test_hook_ignore_failing_tests_SciPybundle,
+    'FFTW.MPI': pre_test_hook_ignore_failing_tests_FFTWMPI,
 }
 
 PRE_SINGLE_EXTENSION_HOOKS = {

eessi-2023.06-eb-4.8.1-2022a.yml

@@ -0,0 +1,7 @@
+easyconfigs:
+  - OpenBLAS-0.3.20-GCC-11.3.0:
+      # use easyconfig that includes patch to fix detection of Neoverse V1 CPUs,
+      # see https://github.com/easybuilders/easybuild-easyconfigs/pull/18870
+      options:
+        from-pr: 18870
+  - foss-2022a