More work on getting CUDA/cuDNN and libs in Linux setup

Author: Chris Maunder

src/SDK/install.sh

@@ -61,7 +61,8 @@ if [ "$os" = "linux" ]; then
 
     # - Needed for opencv-python (TODO: review these and move into module installers that actually use OpenCV)
     packages="ffmpeg libsm6 libxext6"
-    # - So we can query glxinfo for GPU info (mesa) and install modules (the rest)
+    # - So we can query glxinfo for GPU info (mesa) and install modules (the rest).
+    # NOTE: The general setup.sh file should have already installed curl and wget
     packages="${packages} mesa-utils curl rsync unzip wget"
     installAptPackages "${packages}"
 

src/scripts/utils.sh

@@ -2330,6 +2330,7 @@ function getCudaVersion () {
     fi
 
     cuda_major_version=${cuda_version%%.*}
+    cuda_minor_version=${cuda_version#*.}
     cuda_major_minor=$(echo "$cuda_version" | sed 's/\./_/g')
 
     echo $cuda_version

src/setup.sh

@@ -900,21 +900,35 @@ elif [ "${edgeDevice}" = "Raspberry Pi" ] || [ "${edgeDevice}" = "Orange Pi" ] |
 else 
     cuda_version=$(getCudaVersion)
     cuda_major_version=${cuda_version%%.*}
+    cuda_minor_version=${cuda_version#*.}
     cuda_major_minor=$(echo "$cuda_version" | sed 's/\./_/g')
 
     if [ "$cuda_version" != "" ]; then
 
         hasCUDA=true
         cuDNN_version=$(getcuDNNVersion)
 
-        if [ "$cuDNN_version" == "" ]; then
+        installKeyring=false
+        if [ "$cuDNN_version" == "" ] || [ ! -x "$(command -v nvcc)" ]; then
             wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/cuda-keyring_1.1-1_all.deb
             sudo dpkg -i cuda-keyring_1.1-1_all.deb
             rm cuda-keyring_1.1-1_all.deb
+        fi
+
+        if [ "$cuDNN_version" == "" ]; then
+            # cuDNN
+            # https://developer.nvidia.com/cudnn-downloads?target_os=Linux&target_arch=x86_64&Distribution=Ubuntu&target_version=22.04&target_type=deb_local
             sudo apt-get update
             sudo apt-get -y install "cudnn-cuda-$cuda_major_version"
         fi
 
+        if [ ! -x "$(command -v nvcc)" ]; then
+            # CUDA toolkit
+            # https://developer.nvidia.com/cuda-downloads?target_os=Linux&target_arch=x86_64&Distribution=WSL-Ubuntu&target_version=2.0&target_type=deb_network
+            sudo apt-get update
+            sudo apt-get -y install cuda-toolkit-${cuda_major_version}-${cuda_minor_version}
+        fi
+
         # disable this
         if [ "${systemName}" = "WSL-but-we're-ignoring-this-for-now" ]; then # we're disabling this on purpose
             checkForAdminRights