[test] vc toolchain modification (#54589)

Summary:
Fixes https://github.com/pytorch/pytorch/issues/54502
Needs to be merged after https://github.com/pytorch/builder/pull/684

Pull Request resolved: https://github.com/pytorch/pytorch/pull/54589

Reviewed By: walterddr

Differential Revision: D27402066

Pulled By: seemethere

fbshipit-source-id: 68f92485d89edf2c3315de8c57447f180679c77d

.circleci/cimodel/data/windows_build_definitions.py

@@ -108,7 +108,7 @@ class VcSpec:
         return [self.prefixed_year()] + self.version_elements
 
     def get_product(self):
-        return "Community" if self.year == 2019 else "BuildTools"
+        return "BuildTools"
 
     def dotted_version(self):
         return ".".join(self.version_elements)
@@ -125,7 +125,7 @@ def FalsePred(_):
 def TruePred(_):
     return True
 
-_VC2019 = VcSpec(2019)
+_VC2019 = VcSpec(2019, ["14", "28", "29333"], hide_version=True)
 
 WORKFLOW_DATA = [
     # VS2019 CUDA-10.1

.circleci/config.yml

@@ -698,10 +698,10 @@ jobs:
     steps:
       - checkout
       - run:
-          name: _HACK_ Install CUDA compatible cmath
-          no_output_timeout: 1m
+          name: Install VS2019 toolchain
+          no_output_timeout: 10m
           command: |
-              powershell .circleci/scripts/vs_install_cmath.ps1
+              powershell .circleci/scripts/vs_install.ps1
       - run:
           name: Install Cuda
           no_output_timeout: 30m
@@ -766,6 +766,11 @@ jobs:
       - checkout
       - attach_workspace:
           at: c:/users/circleci/workspace
+      - run:
+          name: Install VS2019 toolchain
+          no_output_timeout: 10m
+          command: |
+              powershell .circleci/scripts/vs_install.ps1
       - run:
           name: Install Cuda
           no_output_timeout: 30m
@@ -1108,11 +1113,6 @@ jobs:
     steps:
     # See Note [Workspace for CircleCI scripts] in job-specs-setup.yml
     - checkout
-    - run:
-        name: _HACK_ Install CUDA compatible cmath
-        no_output_timeout: 1m
-        command: |
-            powershell .circleci/scripts/vs_install_cmath.ps1
     - run:
         <<: *binary_checkout
     - run:
@@ -7598,8 +7598,8 @@ workflows:
           name: pytorch_windows_vs2019_py36_cuda10.1_build
           python_version: "3.6"
           use_cuda: "1"
-          vc_product: Community
-          vc_version: ""
+          vc_product: BuildTools
+          vc_version: "14.28.29333"
           vc_year: "2019"
       - pytorch_windows_test:
           build_environment: pytorch-win-vs2019-cuda10-cudnn7-py3
@@ -7611,8 +7611,8 @@ workflows:
             - pytorch_windows_vs2019_py36_cuda10.1_build
           test_name: pytorch-windows-test1
           use_cuda: "1"
-          vc_product: Community
-          vc_version: ""
+          vc_product: BuildTools
+          vc_version: "14.28.29333"
           vc_year: "2019"
       - pytorch_windows_test:
           build_environment: pytorch-win-vs2019-cuda10-cudnn7-py3
@@ -7624,8 +7624,8 @@ workflows:
             - pytorch_windows_vs2019_py36_cuda10.1_build
           test_name: pytorch-windows-test2
           use_cuda: "1"
-          vc_product: Community
-          vc_version: ""
+          vc_product: BuildTools
+          vc_version: "14.28.29333"
           vc_year: "2019"
       - pytorch_windows_build:
           build_environment: pytorch-win-vs2019-cuda11-cudnn8-py3
@@ -7633,8 +7633,8 @@ workflows:
           name: pytorch_windows_vs2019_py36_cuda11.1_build
           python_version: "3.6"
           use_cuda: "1"
-          vc_product: Community
-          vc_version: ""
+          vc_product: BuildTools
+          vc_version: "14.28.29333"
           vc_year: "2019"
       - pytorch_windows_test:
           build_environment: pytorch-win-vs2019-cuda11-cudnn8-py3
@@ -7652,8 +7652,8 @@ workflows:
             - pytorch_windows_vs2019_py36_cuda11.1_build
           test_name: pytorch-windows-test1
           use_cuda: "1"
-          vc_product: Community
-          vc_version: ""
+          vc_product: BuildTools
+          vc_version: "14.28.29333"
           vc_year: "2019"
       - pytorch_windows_test:
           build_environment: pytorch-win-vs2019-cuda11-cudnn8-py3
@@ -7671,8 +7671,8 @@ workflows:
             - pytorch_windows_vs2019_py36_cuda11.1_build
           test_name: pytorch-windows-test2
           use_cuda: "1"
-          vc_product: Community
-          vc_version: ""
+          vc_product: BuildTools
+          vc_version: "14.28.29333"
           vc_year: "2019"
       - pytorch_windows_build:
           build_environment: pytorch-win-vs2019-cpu-py3
@@ -7680,8 +7680,8 @@ workflows:
           name: pytorch_windows_vs2019_py36_cpu_build
           python_version: "3.6"
           use_cuda: "0"
-          vc_product: Community
-          vc_version: ""
+          vc_product: BuildTools
+          vc_version: "14.28.29333"
           vc_year: "2019"
       - pytorch_windows_test:
           build_environment: pytorch-win-vs2019-cpu-py3
@@ -7698,8 +7698,8 @@ workflows:
             - pytorch_windows_vs2019_py36_cpu_build
           test_name: pytorch-windows-test1
           use_cuda: "0"
-          vc_product: Community
-          vc_version: ""
+          vc_product: BuildTools
+          vc_version: "14.28.29333"
           vc_year: "2019"
       - pytorch_windows_test:
           build_environment: pytorch-win-vs2019-cpu-py3
@@ -7716,8 +7716,8 @@ workflows:
             - pytorch_windows_vs2019_py36_cpu_build
           test_name: pytorch-windows-test2
           use_cuda: "0"
-          vc_product: Community
-          vc_version: ""
+          vc_product: BuildTools
+          vc_version: "14.28.29333"
           vc_year: "2019"
       - pytorch_windows_test:
           build_environment: pytorch-win-vs2019-cuda10-cudnn7-py3
@@ -7734,8 +7734,8 @@ workflows:
             - pytorch_windows_vs2019_py36_cuda10.1_build
           test_name: pytorch-windows-test1
           use_cuda: "0"
-          vc_product: Community
-          vc_version: ""
+          vc_product: BuildTools
+          vc_version: "14.28.29333"
           vc_year: "2019"
       - update_s3_htmls:
           context: org-member
@@ -9201,8 +9201,8 @@ workflows:
           name: pytorch_windows_vs2019_py36_cuda11.2_build
           python_version: "3.6"
           use_cuda: "1"
-          vc_product: Community
-          vc_version: ""
+          vc_product: BuildTools
+          vc_version: "14.28.29333"
           vc_year: "2019"
           filters:
             branches:

.circleci/scripts/vs_install.ps1

@@ -1,7 +1,10 @@
-$VS_DOWNLOAD_LINK = "https://aka.ms/vs/15/release/vs_buildtools.exe"
+# https://developercommunity.visualstudio.com/t/install-specific-version-of-vs-component/1142479
+# https://docs.microsoft.com/en-us/visualstudio/releases/2019/history#release-dates-and-build-numbers
+
+# 16.8.5 BuildTools
+$VS_DOWNLOAD_LINK = "https://download.visualstudio.microsoft.com/download/pr/20130c62-1bc8-43d6-b4f0-c20bb7c79113/145a319d79a83376915d8f855605e152ef5f6fa2b2f1d2dca411fb03722eea72/vs_BuildTools.exe"
 $COLLECT_DOWNLOAD_LINK = "https://aka.ms/vscollect.exe"
 $VS_INSTALL_ARGS = @("--nocache","--quiet","--wait", "--add Microsoft.VisualStudio.Workload.VCTools",
-                                                     "--add Microsoft.VisualStudio.Component.VC.Tools.14.13",
                                                      "--add Microsoft.Component.MSBuild",
                                                      "--add Microsoft.VisualStudio.Component.Roslyn.Compiler",
                                                      "--add Microsoft.VisualStudio.Component.TextTemplating",
@@ -13,10 +16,25 @@ $VS_INSTALL_ARGS = @("--nocache","--quiet","--wait", "--add Microsoft.VisualStud
 
 curl.exe --retry 3 -kL $VS_DOWNLOAD_LINK --output vs_installer.exe
 if ($LASTEXITCODE -ne 0) {
-    echo "Download of the VS 2017 installer failed"
+    echo "Download of the VS 2019 Version 16.8.5 installer failed"
     exit 1
 }
 
+if (Test-Path "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe") {
+    $existingPath = & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -products "Microsoft.VisualStudio.Product.BuildTools" -version "[16, 17)" -property installationPath
+    if ($existingPath -ne $null) {
+        echo "Found existing BuildTools installation in $existingPath"
+        $VS_UNINSTALL_ARGS = @("uninstall", "--installPath", "`"$existingPath`"", "--quiet","--wait")
+        $process = Start-Process "${PWD}\vs_installer.exe" -ArgumentList $VS_UNINSTALL_ARGS -NoNewWindow -Wait -PassThru
+        $exitCode = $process.ExitCode
+        if (($exitCode -ne 0) -and ($exitCode -ne 3010)) {
+            echo "Original BuildTools uninstall failed with code $exitCode"
+            exit 1
+        }
+        echo "Original BuildTools uninstalled"
+    }
+}
+
 $process = Start-Process "${PWD}\vs_installer.exe" -ArgumentList $VS_INSTALL_ARGS -NoNewWindow -Wait -PassThru
 Remove-Item -Path vs_installer.exe -Force
 $exitCode = $process.ExitCode

.circleci/verbatim-sources/job-specs/binary-job-specs.yml

@@ -293,11 +293,6 @@
     steps:
     # See Note [Workspace for CircleCI scripts] in job-specs-setup.yml
     - checkout
-    - run:
-        name: _HACK_ Install CUDA compatible cmath
-        no_output_timeout: 1m
-        command: |
-            powershell .circleci/scripts/vs_install_cmath.ps1
     - run:
         <<: *binary_checkout
     - run:

.circleci/verbatim-sources/job-specs/pytorch-job-specs.yml

@@ -260,10 +260,10 @@ jobs:
     steps:
       - checkout
       - run:
-          name: _HACK_ Install CUDA compatible cmath
-          no_output_timeout: 1m
+          name: Install VS2019 toolchain
+          no_output_timeout: 10m
           command: |
-              powershell .circleci/scripts/vs_install_cmath.ps1
+              powershell .circleci/scripts/vs_install.ps1
       - run:
           name: Install Cuda
           no_output_timeout: 30m
@@ -328,6 +328,11 @@ jobs:
       - checkout
       - attach_workspace:
           at: c:/users/circleci/workspace
+      - run:
+          name: Install VS2019 toolchain
+          no_output_timeout: 10m
+          command: |
+              powershell .circleci/scripts/vs_install.ps1
       - run:
           name: Install Cuda
           no_output_timeout: 30m

.circleci/verbatim-sources/workflows/workflows-scheduled-ci.yml

@@ -119,8 +119,8 @@
           name: pytorch_windows_vs2019_py36_cuda11.2_build
           python_version: "3.6"
           use_cuda: "1"
-          vc_product: Community
-          vc_version: ""
+          vc_product: BuildTools
+          vc_version: "14.28.29333"
           vc_year: "2019"
           filters:
             branches: