Merge branch 'main' into v2.9.0

Author: Chris Maunder

README.md

@@ -120,7 +120,7 @@ We will be constantly expanding the feature list.
 
 #### Supported Development Environments
 
-This current release works best with Visual Studio Code on Windows 10+. Ubuntu, Debian and macOS (both Intel and Apple Silicon). Visual Studio 2019+ support is included for Windows 10+.
+This current release works best with Visual Studio Code on Windows 10+. Ubuntu 22.04+, Debian and macOS (both Intel and Apple Silicon). Visual Studio 2019+ support is included for Windows 10+.
 
 The current release provides support for CPU on each platform, DirectML on Windows, CUDA on Windows and Linux, support for Apple Silicon GPUs, RockChip NPUs and Coral.AI TPUs. Support depends on the module itself.
 

devops/install/dotnet-install-arm.sh

@@ -5,7 +5,7 @@ bold="\e[1m"
 underline="\e[1;4m"
 reset="\e[0m"
 
-echo -e "${bold}.NET 7 Installer${reset}"
+echo -e "${bold}.NET 9 Installer${reset}"
 echo -e "${bold}Pete Codes / PJG Creations 2021${reset}"
 echo -e "${bold}CodeProject.AI edition${reset}"   # Drastically trimming output / SDK is optional
 

devops/install/dotnet-install.sh

@@ -329,6 +329,14 @@ get_machine_architecture() {
             echo "loongarch64"
             return 0
             ;;
+        riscv64)
+            echo "riscv64"
+            return 0
+            ;;
+        powerpc|ppc)
+            echo "ppc"
+            return 0
+            ;;
         esac
     fi
 
@@ -417,11 +425,17 @@ get_normalized_architecture_for_specific_sdk_version() {
 # args:
 # version or channel - $1
 is_arm64_supported() {
-    #any channel or version that starts with the specified versions
-    case "$1" in
-        ( "1"* | "2"* | "3"*  | "4"* | "5"*) 
-            echo false
-            return 0
+    # Extract the major version by splitting on the dot
+    major_version="${1%%.*}"
+
+    # Check if the major version is a valid number and less than 6
+    case "$major_version" in
+        [0-9]*)  
+            if [ "$major_version" -lt 6 ]; then
+                echo false
+                return 0
+            fi
+            ;;
     esac
 
     echo true
@@ -571,12 +585,10 @@ is_dotnet_package_installed() {
     local dotnet_package_path="$(combine_paths "$(combine_paths "$install_root" "$relative_path_to_package")" "$specific_version")"
     say_verbose "is_dotnet_package_installed: dotnet_package_path=$dotnet_package_path"
 
-    if [ ! -d "$dotnet_package_path" ]; then
-        # say_err "$dotnet_package_path does not exist"
-        return 1
-    else
-        # say_err "$dotnet_package_path exists"
+    if [ -d "$dotnet_package_path" ]; then
         return 0
+    else
+        return 1
     fi
 }
 
@@ -962,6 +974,39 @@ get_absolute_path() {
     return 0
 }
 
+# args:
+# override - $1 (boolean, true or false)
+get_cp_options() {
+    eval $invocation
+
+    local override="$1"
+    local override_switch=""
+
+    if [ "$override" = false ]; then
+        # cp: warning: behavior of -n is non-portable and may change in future; use --update=none instead
+        # override_switch="-n"
+        override_switch="--update=none"
+
+        # create temporary files to check if 'cp -u' is supported
+        tmp_dir="$(mktemp -d)"
+        tmp_file="$tmp_dir/testfile"
+        tmp_file2="$tmp_dir/testfile2"
+
+        touch "$tmp_file"
+
+        # use -u instead of -n if it's available
+        if cp -u "$tmp_file" "$tmp_file2" 2>/dev/null; then
+            override_switch="-u"
+        fi
+
+        # clean up
+        rm -f "$tmp_file" "$tmp_file2"
+        rm -rf "$tmp_dir"
+    fi
+
+    echo "$override_switch"
+}
+
 # args:
 # input_files - stdin
 # root_path - $1
@@ -973,17 +1018,7 @@ copy_files_or_dirs_from_list() {
     local root_path="$(remove_trailing_slash "$1")"
     local out_path="$(remove_trailing_slash "$2")"
     local override="$3"
-    local osname="$(get_current_os_name)"
-    local override_switch=$(
-        if [ "$override" = false ]; then
-            if [ "$osname" = "linux-musl" ]; then
-                printf -- "-u";
-            else
-                # cp: warning: behavior of -n is non-portable and may change in future; use --update=none instead
-                # printf -- "-n";
-                printf -- "--update=none";
-            fi
-        fi)
+    local override_switch="$(get_cp_options "$override")"
 
     cat | uniq | while read -r file_path; do
         local path="$(remove_beginning_slash "${file_path#$root_path}")"
@@ -1036,8 +1071,7 @@ extract_dotnet_package() {
 
     say "extract_dotnet_package: zip_path=$zip_path, temp_out_path=$temp_out_path, out_path=$out_path"
 
-    if [ ! -d "$temp_out_path" ]; then mkdir "$temp_out_path"; fi
-    
+
     local failed=false
     if [ "$quiet" != true ]; then
         tar -xzf "$zip_path" -C "$temp_out_path" > /dev/null || failed=true
@@ -1051,7 +1085,7 @@ extract_dotnet_package() {
 
     validate_remote_local_file_sizes "$zip_path" "$remote_file_size"
 
-    # rm -rf "$temp_out_path"
+    rm -rf "$temp_out_path"
     if [ -z ${keep_zip+x} ]; then
         rm -f "$zip_path" && say_verbose "Temporary archive file $zip_path was removed"
     fi
@@ -1767,7 +1801,7 @@ do
             zip_path="$1"
             ;;
         -?|--?|-h|--help|-[Hh]elp)
-            script_name="$(basename "$0")"
+            script_name="dotnet-install.sh"
             echo ".NET Tools Installer"
             echo "Usage:"
             echo "       # Install a .NET SDK of a given Quality from a given Channel"
@@ -1898,4 +1932,4 @@ fi
 
 say "Note that the script does not resolve dependencies during installation."
 say "To check the list of dependencies, go to https://learn.microsoft.com/dotnet/core/install, select your operating system and check the \"Dependencies\" section."
-say "Installation finished successfully."
+say "Installation finished successfully."

devops/install/install_CUDnn.bat devops/install/install_cuDNN.batdevops/install/install_CUDnn.bat renamed to devops/install/install_cuDNN.bat

@@ -37,13 +37,17 @@
 #   sudo apt-get update -y
 #   sudo apt-get -y install cuda-X.Y
 
+if [ "$1" == "" ]; then
+    echo "Please provide the CUDA version for which to install cuDNN"
+    exit
+fi
 
 # cuda_version=$1
 # Get major.minor CUDA version
 cuda_version=$(cut -d '.' -f 1,2 <<< "$1")
 
 # This script is intended to be called from setup.sh, which includes architecture
-# and os vars as well as writeline methods. If we don't find them, do quick checks
+# and os vars as well as writeLine methods. If we don't find them, do quick checks
 
 if [[ $(type -t writeLine) != function ]]; then
 
@@ -97,10 +101,14 @@ writeLine "Setting up CUDA ${cuda_version} and cuDNN" $color_info
 # ==============================================================================
 # GET SETTINGS
 
-cuda_GPGpublicKey=""
+cuda_GPGpublicKey="3bf863cc"
 
 case "$cuda_version" in
-  "12.2") cuda_version_full="12.2.1";  cuda_GPGpublicKey="3bf863cc" ;;
+  "12.6") cuda_version_full="12.6.1";  cuda_GPGpublicKey="3bf863cc" ;;
+  "12.5") cuda_version_full="12.5.1";  cuda_GPGpublicKey="3bf863cc" ;;
+  "12.5") cuda_version_full="12.4.1";  cuda_GPGpublicKey="3bf863cc" ;;
+  "12.3") cuda_version_full="12.3.2";  cuda_GPGpublicKey="3bf863cc" ;;
+  "12.2") cuda_version_full="12.2.2";  cuda_GPGpublicKey="3bf863cc" ;;
   "12.1") cuda_version_full="12.1.1";  cuda_GPGpublicKey="3bf863cc" ;;
   "12.0") cuda_version_full="12.0.1";  cuda_GPGpublicKey="3bf863cc" ;;
   "11.8") cuda_version_full="11.8.0";  cuda_GPGpublicKey="3bf863cc" ;;

devops/install/install_cuDNN.sh

@@ -132,4 +132,19 @@ exit
 ```
 
 Your WSL virtual hard drive should be smaller and the space that was used 
-reclaimed by Windows.
+reclaimed by Windows.
+
+## GPU Support under WSL
+
+Please read [NVIDIAs guide](https://docs.nvidia.com/cuda/wsl-user-guide/index.html#step-1-install-nvidia-driver-for-gpu-support). The main points are:
+
+1. **DO NOT install NVIDIA drivers within WSL**. The Windows drivers will work under WSL, so installing drivers *inside* WSL will overwrite the Windows drivers and lead to issues
+
+2. **DO install the NVIDIA toolkit separately in WSL**. Head to the [toolkit download page](https://developer.nvidia.com/cuda-downloads?target_os=Linux&target_arch=x86_64&Distribution=WSL-Ubuntu&target_version=2.0&target_type=deb_network) to find the correct instructions. For Windows 11 on CUDA 12.6, for example, the instructions are
+
+    ``` bash
+    wget https://developer.download.nvidia.com/compute/cuda/repos/wsl-ubuntu/x86_64/cuda-keyring_1.1-1_all.deb
+    sudo dpkg -i cuda-keyring_1.1-1_all.deb
+    sudo apt-get update
+    sudo apt-get -y install cuda-toolkit-12-6
+    ```

docs/WSL-README.md

@@ -11,6 +11,6 @@ torchvision==0.14.0+cu117       # Installing TorchVision, for working with compu
 # Specific version because we have a patch
 ultralytics==8.1.2              # Installing Ultralytics package for object detection in images
 
-CodeProject-AI-SDK          # Installing the CodeProject.AI SDK
+CodeProject-AI-SDK              # Installing the CodeProject.AI SDK
 
 # last line empty..

src/demos/modules/PythonSimple/requirements.linux.cuda.txt

@@ -12,4 +12,6 @@ torchvision==0.14.1+cpu         # Installing TorchVision, for Computer Vision ba
 # Specific version because we have a patch
 ultralytics==8.1.2              # Installing Ultralytics package for object detection in images
 
+CodeProject-AI-SDK              # Installing the CodeProject.AI SDK
+
 # last line empty.

src/demos/modules/PythonSimple/requirements.linux.txt

@@ -5,6 +5,6 @@ numpy<2                         # Installing NumPy, a package for scientific com
 # Specific version because we have a patch
 ultralytics==8.1.2              # Installing Ultralytics package for object detection in images
 
-CodeProject-AI-SDK          # Installing the CodeProject.AI SDK
+CodeProject-AI-SDK              # Installing the CodeProject.AI SDK
 
 # last line empty.

src/demos/modules/PythonSimple/requirements.macos.txt

@@ -11,6 +11,6 @@ torchvision==0.14.0+cu117       # Installing TorchVision, for working with compu
 # Specific version because we have a patch
 ultralytics==8.1.2              # Installing Ultralytics package for object detection in images
 
-CodeProject-AI-SDK          # Installing the CodeProject.AI SDK
+CodeProject-AI-SDK              # Installing the CodeProject.AI SDK
 
 # last line empty.