Merge remote-tracking branch 'origin/2023.06-software.eessi.io' into maqao

Author: ocaisa

.github/workflows/test-software.eessi.io.yml

@@ -42,6 +42,10 @@ jobs:
             EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/sapphirerapids
           - runs_on: ubuntu-24.04
             EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/skylake_avx512
+          - runs_on: ubuntu-24.04
+            EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/icelake
+          - runs_on: ubuntu-24.04
+            EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/intel/cascadelake
           - runs_on: ubuntu-24.04
             EESSI_SOFTWARE_SUBDIR_OVERRIDE: x86_64/generic
     runs-on: ${{ matrix.runs_on }}

.github/workflows/test_compare_stacks.yml

@@ -31,6 +31,8 @@ jobs:
         - x86_64/intel/haswell
         - x86_64/intel/skylake_avx512
         - x86_64/intel/sapphirerapids
+        - x86_64/intel/icelake
+        - x86_64/intel/cascadelake
     steps:
         - name: Check out software-layer repository
           uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

eb_hooks.py

@@ -534,6 +534,25 @@ def pre_configure_hook_BLIS_a64fx(self, *args, **kwargs):
         raise EasyBuildError("BLIS-specific hook triggered for non-BLIS easyconfig?!")
 
 
+def pre_configure_hook_CUDA_Samples_test_remove(self, *args, **kwargs):
+    """skip immaTensorCoreGemm in CUDA-Samples for compute capability 7.0."""
+    if self.name == 'CUDA-Samples' and self.version in ['12.1']:
+        # Get compute capability from build option
+        cuda_caps = build_option('cuda_compute_capabilities')
+        # Check if compute capability 7.0 is in the list
+        if cuda_caps and '7.0' in cuda_caps:
+            print_msg("Applying hook for CUDA-Samples %s with compute capability 7.0", self.version)
+            # local_filters is set by the easyblock, remove path to the Makefile instead
+            makefile_path = os.path.join(self.start_dir, 'Samples/3_CUDA_Features/immaTensorCoreGemm/Makefile')
+            if os.path.exists(makefile_path):
+                remove_file(makefile_path)
+                print_msg("Removed Makefile at %s to skip immaTensorCoreGemm build", makefile_path)
+            else:
+                print_msg("Makefile not found at %s", makefile_path)
+    else:
+        raise EasyBuildError("CUDA-Samples-specific hook triggered for non-CUDA-Samples easyconfig?!")
+
+
 def pre_configure_hook_score_p(self, *args, **kwargs):
     """
     Pre-configure hook for Score-p
@@ -1192,6 +1211,7 @@ def post_module_hook(self, *args, **kwargs):
 
 PRE_CONFIGURE_HOOKS = {
     'BLIS': pre_configure_hook_BLIS_a64fx,
+    'CUDA-Samples': pre_configure_hook_CUDA_Samples_test_remove,
     'GObject-Introspection': pre_configure_hook_gobject_introspection,
     'Extrae': pre_configure_hook_extrae,
     'GROMACS': pre_configure_hook_gromacs,