Merge branch '2023.06-software.eessi.io' into megahit

Author: boegel

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

@@ -1,7 +1,12 @@
 easyconfigs:
   - buildenv-default-foss-2023a.eb 
+  - Zoltan-3.901-foss-2023a.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/23068
+        from-commit: 644b17f1b42bbf8eb4ad56d9e8f125b8c52d7258
+  - OpenFOAM-12-foss-2023a.eb
   - MEGAHIT-1.2.9-GCCcore-12.3.0.eb:
-        options:
-          # fix support for non-x86_64 systems,
-          # see https://github.com/easybuilders/easybuild-easyconfigs/pull/23073
-          - from-commit: 6acf5617670d860cee1d12b120c18699be3c1a68
+      options:
+        # fix support for non-x86_64 systems,
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/23073
+        from-commit: 6acf5617670d860cee1d12b120c18699be3c1a68

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

@@ -1,2 +1,4 @@
 easyconfigs:
   - buildenv-default-foss-2023b.eb 
+  - VSEARCH-2.30.0-GCC-13.2.0.eb
+  - cutadapt-5.0-GCCcore-13.2.0.eb

eb_hooks.py

@@ -422,6 +422,37 @@ def pre_fetch_hook(self, *args, **kwargs):
     if cpu_target == CPU_TARGET_ZEN4:
         pre_fetch_hook_zen4_gcccore1220(self, *args, **kwargs)
 
+    # Always check the software installation path
+    pre_fetch_hook_check_installation_path(self, *args, **kwargs)
+
+
+# Check the installation path so we verify that accelerator software always gets installed into the correct location
+def pre_fetch_hook_check_installation_path(self, *args, **kwargs):
+    # When we know the CUDA status, we will need to verify the installation path
+    # if we are doing an EESSI or host_injections installation
+    accelerator_deps = ['CUDA']
+    strict_eessi_installation = (
+        bool(re.search(EESSI_INSTALLATION_REGEX, self.installdir)) or
+        self.installdir.startswith(HOST_INJECTIONS_LOCATION))
+    if strict_eessi_installation:
+        dependency_names = self.cfg.dependency_names()
+        if self.cfg.name in accelerator_deps or any(dep in dependency_names for dep in accelerator_deps):
+            # Make sure the path is an accelerator location
+            if "/accel/" not in self.installdir:
+                raise EasyBuildError(
+                    f"It seems you are trying to install an accelerator package {self.cfg.name} into a "
+                    f"non-accelerator location {self.installdir}. You need to reconfigure your installation to target "
+                    "the correct location."
+                    )
+        else:
+            # If we don't have an accelerator dependency then we should be in a CPU installation path
+            if "/accel/" in self.installdir:
+                raise EasyBuildError(
+                    f"It seems you are trying to install a CPU-only package {self.cfg.name} into accelerator location "
+                    f"{self.installdir}. If this is a dependency of the package you are really interested in you will "
+                    "need to first install the CPU-only dependencies of that package."
+                    )
+
 
 def pre_fetch_hook_zen4_gcccore1220(self, *args, **kwargs):
     """Use --force --module-only if building a foss-2022b-based EasyConfig for Zen4.
@@ -600,6 +631,18 @@ def pre_configure_hook_score_p(self, *args, **kwargs):
         raise EasyBuildError("Score-P-specific hook triggered for non-Score-P easyconfig?!")
 
 
+def pre_configure_hook_vsearch(self, *args, **kwargs):
+    """
+    Pre-configure hook for VSEARCH
+    - Workaround for a Zlib macro being renamed in Gentoo, see https://bugs.gentoo.org/383179 
+      (solves "expected initializer before 'OF'" errors)
+    """
+    if self.name == 'VSEARCH':
+        self.cfg.update('configopts', 'CPPFLAGS="-DOF=_Z_OF ${CPPFLAGS}"')
+    else:
+        raise EasyBuildError("VSEARCH-specific hook triggered for non-VSEARCH easyconfig?!")
+
+
 def pre_configure_hook_extrae(self, *args, **kwargs):
     """
     Pre-configure hook for Extrae
@@ -1286,6 +1329,7 @@ def post_module_hook(self, *args, **kwargs):
     'WRF': pre_configure_hook_wrf_aarch64,
     'LAMMPS': pre_configure_hook_LAMMPS_zen4,
     'Score-P': pre_configure_hook_score_p,
+    'VSEARCH': pre_configure_hook_vsearch,
 }
 
 PRE_TEST_HOOKS = {