From 52d98f325aff4bfd1736bf579ecae37a4eef3d3c Mon Sep 17 00:00:00 2001 From: Damian Alvarez <d.alvarez@fz-juelich.de> Date: Mon, 9 Oct 2023 10:12:00 +0200 Subject: [PATCH] To add CUDA support for hwloc, which dissapeared by mistake in 2023 and 2024 Extra: Fix wrong file name --- Golden_Repo/h/hwloc/hwloc-2.7.1-GCCcore-11.3.0.eb | 5 +++-- ...CV-4.7.0-gcccoremkl-11.3.0-2022.1.0-CUDA-11.7-contrib.eb} | 0 2 files changed, 3 insertions(+), 2 deletions(-) rename Golden_Repo/o/OpenCV/{OpenCV-4.7.0-gcccoremkl-11.3.0-2022.1.0-CUDA-12.0-contrib.eb => OpenCV-4.7.0-gcccoremkl-11.3.0-2022.1.0-CUDA-11.7-contrib.eb} (100%) diff --git a/Golden_Repo/h/hwloc/hwloc-2.7.1-GCCcore-11.3.0.eb b/Golden_Repo/h/hwloc/hwloc-2.7.1-GCCcore-11.3.0.eb index bd30b42db..338e12aac 100644 --- a/Golden_Repo/h/hwloc/hwloc-2.7.1-GCCcore-11.3.0.eb +++ b/Golden_Repo/h/hwloc/hwloc-2.7.1-GCCcore-11.3.0.eb @@ -30,10 +30,11 @@ dependencies = [ ('numactl', '2.0.15'), ('libxml2', '2.9.13'), ('libpciaccess', '0.16'), + ('CUDA', '11.7', '', SYSTEM), ] -configopts = "--enable-libnuma=$EBROOTNUMACTL " -configopts += "--disable-cairo --disable-opencl --disable-cuda --disable-nvml --disable-gl --disable-libudev " +configopts = "--enable-libnuma=$EBROOTNUMACTL --enable-cuda --enable-nvml --enable-opencl " +configopts += "--disable-cairo --disable-gl --disable-libudev " sanity_check_paths = { 'files': ['bin/lstopo', 'include/hwloc/linux.h', diff --git a/Golden_Repo/o/OpenCV/OpenCV-4.7.0-gcccoremkl-11.3.0-2022.1.0-CUDA-12.0-contrib.eb b/Golden_Repo/o/OpenCV/OpenCV-4.7.0-gcccoremkl-11.3.0-2022.1.0-CUDA-11.7-contrib.eb similarity index 100% rename from Golden_Repo/o/OpenCV/OpenCV-4.7.0-gcccoremkl-11.3.0-2022.1.0-CUDA-12.0-contrib.eb rename to Golden_Repo/o/OpenCV/OpenCV-4.7.0-gcccoremkl-11.3.0-2022.1.0-CUDA-11.7-contrib.eb -- GitLab