fix merge conflict

easystacks/software.eessi.io/2023.06/accel/nvidia/eessi-2023.06-eb-4.9.4-2023b-CUDA.yml

@@ -0,0 +1,5 @@
+easyconfigs:
+  - CUDA-12.4.0.eb:
+      options:
+        accept-eula-for: CUDA
+  - UCX-CUDA-1.15.0-GCCcore-13.2.0-CUDA-12.4.0.eb

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

@@ -25,6 +25,10 @@ easyconfigs:
       options:
         # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21657
         from-commit: 7f1f0e60487e7e1fcb5c4e6bc4fbc4f89994e3fd
+  - LightGBM-4.5.0-foss-2023a.eb:
+      options:
+        # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21699
+        from-commit: e3407bd127d248c08960f6b09c973da0fdecc2c3
   - OpenFOAM-v2406-foss-2023a.eb:
       options:
         # see https://github.com/easybuilders/easybuild-easyblocks/pull/3519

eb_hooks.py

@@ -786,6 +786,11 @@ def post_postproc_cuda(self, *args, **kwargs):
             for word in line.split():
                 if any(ext in word for ext in file_extensions):
                     allowlist.append(os.path.splitext(word)[0])
+        # The EULA of CUDA 12.4 introduced a typo (confirmed by NVIDIA):
+        # libnvrtx-builtins_static.so should be libnvrtc-builtins_static.so
+        if 'libnvrtx-builtins_static' in allowlist:
+            allowlist.remove('libnvrtx-builtins_static')
+            allowlist.append('libnvrtc-builtins_static')
         allowlist = sorted(set(allowlist))
         self.log.info("Allowlist for files in CUDA installation that can be redistributed: " + ', '.join(allowlist))
 

install_scripts.sh

@@ -132,6 +132,7 @@ copy_files_by_list ${TOPDIR}/scripts/gpu_support/nvidia ${INSTALL_PREFIX}/script
 # Easystacks to be used to install software in host injections
 host_injections_easystacks=(
     eessi-2023.06-eb-4.9.4-2023a-CUDA-host-injections.yml
+    eessi-2023.06-eb-4.9.4-2023b-CUDA-host-injections.yml
 )
 copy_files_by_list ${TOPDIR}/scripts/gpu_support/nvidia/easystacks \
 ${INSTALL_PREFIX}/scripts/gpu_support/nvidia/easystacks "${host_injections_easystacks[@]}"

scripts/gpu_support/nvidia/easystacks/eessi-2023.06-eb-4.9.4-2023b-CUDA-host-injections.yml

@@ -0,0 +1,4 @@
+# This EasyStack provides a list of all the EasyConfigs that should be installed in host_injections 
+# for nvidia GPU support, because they cannot (fully) be shipped as part of EESSI due to license constraints
+easyconfigs:
+  - CUDA-12.4.0.eb