Corrected .NET / CUDA install on Linux

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.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
 }
 
@@ -958,6 +970,37 @@ 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
+        override_switch="-n"
+
+        # 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
@@ -969,15 +1012,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
-                printf -- "-n";
-            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}")"
@@ -1030,8 +1065,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
@@ -1045,7 +1079,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
@@ -1761,7 +1795,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"
@@ -1892,4 +1926,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.sh

@@ -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,7 +101,7 @@ 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" ;;

src/scripts/utils.sh

@@ -755,6 +755,7 @@ function setupDotNet () {
         if [ "$isAdmin" = true ] || [ "$attemptSudoWithoutAdminRights" = true ]; then
             if [ "$os" = "linux" ]; then
 
+                # Disabled this due to it not proving reliable
                 if [ "$os_name" = "debian-SKIP" ]; then
 
                     wget https://packages.microsoft.com/config/debian/${os_vers}/packages-microsoft-prod.deb -O packages-microsoft-prod.deb >/dev/null
@@ -767,7 +768,29 @@ function setupDotNet () {
                         sudo apt-get update && sudo apt-get install -y aspnetcore-runtime-$requestedNetMajorMinorVersion >/dev/null
                     fi
 
+                # .NET 9 is almost good to go
+                elif [ "$os_name" == "ubuntu" ] && [ "$requestedNetMajorVersion" == "9" ]; then
+
+                    # TODO: Change this to a " >= 24.10"
+                    if [ "$os_vers" == "24.10" ]; then 
+                        if [ "$requestedType" = "sdk" ]; then
+                            sudo apt-get update && sudo apt-get install -y dotnet-sdk-$requestedNetMajorMinorVersion >/dev/null
+                        else
+                            sudo apt-get update && sudo apt-get install -y aspnetcore-runtime-$requestedNetMajorMinorVersion >/dev/null
+                        fi
+                    else
+                        # .NET 9 is still not fully released. But we know a guy who knows a guy...
+                        # TODO: This also works for NET 6 & 7, Ubuntu 24.04, and .NET 9,  Ubuntu 22.04 & 24.04
+                        sudo add-apt-repository ppa:dotnet/backports -y
+                        sudo apt install "dotnet${requestedNetMajorVersion}" -y
+                    fi
+
+                # For everyone else, use The Script
                 else
+
+                    # Needed if we're installing .NET without an installer to help us
+                    installAptPackages "ca-certificates libc6 libgcc-s1 libicu74 liblttng-ust1 libssl3 libstdc++6 libunwind8 zlib1g"
+
                     if [ "$architecture" = 'arm64' ]; then
                         # installs in /opt/dotnet
                         if [ $verbosity = "quiet" ]; then
@@ -785,7 +808,13 @@ function setupDotNet () {
                         fi
                     fi
                 fi
+
             else
+                # macOS
+                
+                # Needed if we're installing .NET without an installer to help us
+                # installAptPackages "ca-certificates libc6 libgcc-s1 libicu74 liblttng-ust1 libssl3 libstdc++6 libunwind8 zlib1g"
+
                 if [ $verbosity = "quiet" ]; then
                     sudo bash "${installScriptsDirPath}/dotnet-install.sh" --install-dir "${dotnet_path}" --channel "$requestedNetMajorMinorVersion" --runtime "$requestedType" "--quiet"
                 elif [ $verbosity = "loud" ]; then
@@ -852,7 +881,7 @@ function setupDotNet () {
             echo "sudo rm /etc/apt/sources.list.d/microsoft-prod.list"
             echo "sudo apt-get update"
             echo "# Install .NET SDK"
-            echo "sudo apt-get install dotnet-sdk-${requestedNetVersion}"
+            echo "sudo apt-get install dotnet-sdk-${requestedNetMajorMinorVersion}"
         else
             writeLine ".NET was not installed correctly. You may need to install .NET manually"       $color_error
             writeLine "See https://learn.microsoft.com/en-us/dotnet/core/install/macos for downloads" $color_error