From 7563aba767b394dd131b03f2324bbcdb5c672796 Mon Sep 17 00:00:00 2001
From: Fangjun Kuang <csukuangfj@gmail.com>
Date: Fri, 3 Jun 2022 20:49:11 +0800
Subject: [PATCH] Typo fixes.

---
 .../workflows/nightly-tests-windows-pip-cuda.yml  | 15 +++++++++++----
 .github/workflows/run-tests-windows-cuda.yml      | 14 +++++++++++---
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/nightly-tests-windows-pip-cuda.yml b/.github/workflows/nightly-tests-windows-pip-cuda.yml
index cc342f7..d3241a6 100644
--- a/.github/workflows/nightly-tests-windows-pip-cuda.yml
+++ b/.github/workflows/nightly-tests-windows-pip-cuda.yml
@@ -44,8 +44,8 @@ jobs:
         id: set-matrix
         run: |
           # outputting for debugging purposes
-          python scripts/github_actions/generate_build_matrix.py --enable-cuda --for-windows --test-only-latest-torch
-          MATRIX=$(python scripts/github_actions/generate_build_matrix.py --enable-cuda --for-windows --test-only-latest-torch)
+          python scripts/github_actions/generate_build_matrix.py --enable-cuda --for-windows
+          MATRIX=$(python scripts/github_actions/generate_build_matrix.py --enable-cuda --for-windows)
           echo "::set-output name=matrix::${MATRIX}"
 
   run_nightly_tests_windows_pip_cuda:
@@ -86,6 +86,11 @@ jobs:
           echo "Cuda install location: ${{steps.cuda-toolkit.outputs.CUDA_PATH}}"
           nvcc --version
 
+      - name: Remove CUDA installation package
+        shell: bash
+        run: |
+          rm "C:/hostedtoolcache/windows/cuda_installer-windows/${{ matrix.cuda }}/x64/cuda_installer_${{ matrix.cuda }}.exe"
+
       - name: Download cuDNN
         shell: bash
         run: |
@@ -93,9 +98,9 @@ jobs:
           cd cudnn-for-windows
           git lfs pull --include="cudnn-windows-x86_64-8.4.1.50_cuda11.6-archive.zip"
           unzip cudnn-windows-x86_64-8.4.1.50_cuda11.6-archive.zip
+          rm cudnn-windows-x86_64-8.4.1.50_cuda11.6-archive.zip
           ls -lh *
           ls -lh */*
-          cudnn-windows-x86_64-8.4.1.50_cuda11.6-archive
 
           echo "PWD: $PWD"
 
@@ -105,11 +110,13 @@ jobs:
           version=${{ matrix.cuda }}
           major=${version:0:2}
           minor=${version:3:1}
+          v=${major}${minor}
+          if [ ${v} -eq 102 ]; then v=""; else v="+cu${v}"; fi
 
           python3 -m pip install -qq --upgrade pip
           python3 -m pip install -qq wheel twine numpy typing_extensions
           python3 -m pip install -qq dataclasses soundfile numpy
-          python3 -m pip install -qq torch==${{ matrix.torch }}+cu${major}${minor} -f https://download.pytorch.org/whl/torch_stable.html numpy
+          python3 -m pip install -qq torch==${{ matrix.torch }}${v} -f https://download.pytorch.org/whl/torch_stable.html numpy
 
           python3 -c "import torch; print('torch version:', torch.__version__)"
 
diff --git a/.github/workflows/run-tests-windows-cuda.yml b/.github/workflows/run-tests-windows-cuda.yml
index 027a69c..cbb98de 100644
--- a/.github/workflows/run-tests-windows-cuda.yml
+++ b/.github/workflows/run-tests-windows-cuda.yml
@@ -41,8 +41,8 @@ jobs:
         id: set-matrix
         run: |
           # outputting for debugging purposes
-          python scripts/github_actions/generate_build_matrix.py --enable-cuda --for-windows --test-only-latest-torch
-          MATRIX=$(python scripts/github_actions/generate_build_matrix.py --enable-cuda --for-windows --test-only-latest-torch)
+          python scripts/github_actions/generate_build_matrix.py --enable-cuda --for-windows
+          MATRIX=$(python scripts/github_actions/generate_build_matrix.py --enable-cuda --for-windows)
           echo "::set-output name=matrix::${MATRIX}"
 
   run_tests_windows_cuda:
@@ -84,6 +84,11 @@ jobs:
           echo "Cuda install location: ${{steps.cuda-toolkit.outputs.CUDA_PATH}}"
           nvcc --version
 
+      - name: Remove CUDA installation package
+        shell: bash
+        run: |
+          rm "C:/hostedtoolcache/windows/cuda_installer-windows/${{ matrix.cuda }}/x64/cuda_installer_${{ matrix.cuda }}.exe"
+
       - name: Download cuDNN
         shell: bash
         run: |
@@ -91,6 +96,7 @@ jobs:
           cd cudnn-for-windows
           git lfs pull --include="cudnn-windows-x86_64-8.4.1.50_cuda11.6-archive.zip"
           unzip cudnn-windows-x86_64-8.4.1.50_cuda11.6-archive.zip
+          rm cudnn-windows-x86_64-8.4.1.50_cuda11.6-archive.zip
           ls -lh *
           ls -lh */*
 
@@ -102,11 +108,13 @@ jobs:
           version=${{ matrix.cuda }}
           major=${version:0:2}
           minor=${version:3:1}
+          v=${major}${minor}
+          if [ ${v} -eq 102 ]; then v=""; else v="+cu${v}"; fi
 
           python3 -m pip install -qq --upgrade pip
           python3 -m pip install -qq wheel twine numpy typing_extensions
           python3 -m pip install -qq dataclasses soundfile numpy
-          python3 -m pip install -qq torch==${{ matrix.torch }}+cu${major}${minor} -f https://download.pytorch.org/whl/torch_stable.html numpy
+          python3 -m pip install -qq torch==${{ matrix.torch }}${v} -f https://download.pytorch.org/whl/torch_stable.html numpy
 
           python3 -c "import torch; print('torch version:', torch.__version__)"