Small adjustments to make things work on Debian10, remove debug statement

Author: huebner-m

gpu_support/add_nvidia_gpu_support.sh

@@ -106,6 +106,10 @@ do
     cuda_compat_urls=$(echo $cuda_compat_urls | cut -d " " -f2-)
     latest_driver_version="${latest_cuda_compat_url%-*}"
     latest_driver_version="${latest_driver_version##*-}"
+    # URLs differ for different OSes; check if we already have a number, if not remove string part that is not needed
+    if [[ ! $latest_driver_version =~ ^[0-9]+$ ]]; then
+      latest_driver_version="${latest_driver_version##*_}"
+    fi
 
     install_compat_libs=false
     host_injections_dir="/cvmfs/pilot.eessi-hpc.org/host_injections/nvidia"

gpu_support/get_cuda_compatlibs.sh

@@ -5,7 +5,6 @@ current_dir=$(dirname $(realpath $0))
 # Get arch type from EESSI environment
 if [[ -z "${EESSI_CPU_FAMILY}" ]]; then
   # set up basic environment variables, EasyBuild and Lmod
-  echo Here!!
   EESSI_SILENT=1 source /cvmfs/pilot.eessi-hpc.org/versions/2021.12/init/bash
 fi
 eessi_cpu_family="${EESSI_CPU_FAMILY:-x86_64}"
@@ -52,7 +51,7 @@ ver=${ver%.*}
 # build URL for CUDA libraries
 cuda_url="https://developer.download.nvidia.com/compute/cuda/repos/"${os}${ver}"/"${eessi_cpu_family}"/"
 # get all versions in decending order
-files=$(curl -s "${cuda_url}" | grep 'cuda-compat' | sed 's/<\/\?[^>]\+>//g' | xargs -n1 | sort -r )
+files=$(curl -s "${cuda_url}" | grep 'cuda-compat' | sed 's/<\/\?[^>]\+>//g' | xargs -n1 | /cvmfs/pilot.eessi-hpc.org/latest/compat/linux/${eessi_cpu_family}/bin/sort -r --version-sort )
 if [[ -z "${files// }" ]]; then
         echo "Could not find any compat lib files under" ${cuda_url}
         exit 1

gpu_support/install_cuda_compatlibs.sh

@@ -51,6 +51,7 @@ fi
 cd $host_injections_dir
 cuda_dir=$(basename ${tmpdir}/usr/local/cuda-*)
 # TODO: This would prevent error messages if folder already exists, but could be problematic if only some files are missing in destination dir
+rm -rf ${cuda_dir}
 mv -n ${tmpdir}/usr/local/cuda-* .
 rm -r ${tmpdir}