{2023.06}[foss/2023a] CUDA 12.1.1 (rebuild) + limit CUDA hook to EESSI installs only, and remove duplication when creating symlinks

easystacks/software.eessi.io/2023.06/rebuilds/20240918-eb-4.9.3-CUDA-12.1.1-in-accel-prefix.yml

@@ -0,0 +1,7 @@
+# 2024.09.18
+# We need to reinstall CUDA in the accelerator prefixes
+# See https://github.com/EESSI/software-layer/pull/720
+easyconfigs:
+  - CUDA-12.1.1.eb:
+      options:
+        accept-eula-for: CUDA

eb_hooks.py

@@ -684,7 +684,13 @@ def post_sanitycheck_cuda(self, *args, **kwargs):
     Remove files from CUDA installation that we are not allowed to ship,
     and replace them with a symlink to a corresponding installation under host_injections.
     """
-    if self.name == 'CUDA':
+    # Make sure we only do this for CUDA and only if we are doing a CVMFS installation
+    is_eessi_install = (
+        self.installdir.startswith("/cvmfs/software.eessi.io/versions")
+        and not build_option("sanity_check_only")
+        and not build_option("module_only")
+    )
+    if self.name == 'CUDA' and is_eessi_install:
         print_msg("Replacing files in CUDA installation that we can not ship with symlinks to host_injections...")
 
         # read CUDA EULA, construct allowlist based on section 2.6 that specifies list of files that can be shipped
@@ -733,6 +739,11 @@ def post_sanitycheck_cuda(self, *args, **kwargs):
                                        basename, full_path)
                         # if it is not in the allowlist, delete the file and create a symlink to host_injections
                         host_inj_path = full_path.replace('versions', 'host_injections')
+                        # CUDA itself doesn't care about compute capability so remove this duplication from
+                        # under host_injections
+                        accel_subdir = os.getenv("EESSI_ACCELERATOR_TARGET")
+                        if accel_subdir:
+                            host_inj_path = host_inj_path.replace("/accel/%s" % accel_subdir, '')
                         # make sure source and target of symlink are not the same
                         if full_path == host_inj_path:
                             raise EasyBuildError("Source (%s) and target (%s) are the same location, are you sure you "