From 635e615d5f8979e1f0e1cc6642fafc5060d5c5ae Mon Sep 17 00:00:00 2001 From: Sebastian Messmer Date: Tue, 16 Jun 2020 11:59:34 -0700 Subject: [PATCH 1/4] [wip] Upgrade msvc to 14.13 Differential Revision: [D22072830](https://our.internmc.facebook.com/intern/diff/D22072830/) [ghstack-poisoned] --- .circleci/config.yml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 65aaf525b120..681fa9db86b4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -262,7 +262,7 @@ pytorch_windows_params: &pytorch_windows_params default: "3.6" vc_version: type: string - default: "14.11" + default: "14.13" vc_year: type: string default: "2017" @@ -577,7 +577,7 @@ jobs: default: "3.6" vc_version: type: string - default: "14.11" + default: "14.13" vc_year: type: string default: "2017" @@ -648,7 +648,7 @@ jobs: default: "3.6" vc_version: type: string - default: "14.11" + default: "14.13" vc_year: type: string default: "2017" @@ -7671,11 +7671,11 @@ workflows: - master - /ci-all\/.*/ - /release\/.*/ - name: pytorch_windows_vs2017_14.11_py36_cuda10.1_build + name: pytorch_windows_vs2017_14.13_py36_cuda10.1_build python_version: "3.6" use_cuda: "1" vc_product: BuildTools - vc_version: "14.11" + vc_version: "14.13" vc_year: "2017" - pytorch_windows_test: build_environment: pytorch-win-vs2017-14-11-cuda10-cudnn7-py3 @@ -7687,14 +7687,14 @@ workflows: - master - /ci-all\/.*/ - /release\/.*/ - name: pytorch_windows_vs2017_14.11_py36_cuda10.1_test1 + name: pytorch_windows_vs2017_14.13_py36_cuda10.1_test1 python_version: "3.6" requires: - - pytorch_windows_vs2017_14.11_py36_cuda10.1_build + - pytorch_windows_vs2017_14.13_py36_cuda10.1_build test_name: pytorch-windows-test1 use_cuda: "1" vc_product: BuildTools - vc_version: "14.11" + vc_version: "14.13" vc_year: "2017" - pytorch_windows_test: build_environment: pytorch-win-vs2017-14-11-cuda10-cudnn7-py3 @@ -7706,14 +7706,14 @@ workflows: - master - /ci-all\/.*/ - /release\/.*/ - name: pytorch_windows_vs2017_14.11_py36_cuda10.1_test2 + name: pytorch_windows_vs2017_14.13_py36_cuda10.1_test2 python_version: "3.6" requires: - - pytorch_windows_vs2017_14.11_py36_cuda10.1_build + - pytorch_windows_vs2017_14.13_py36_cuda10.1_build test_name: pytorch-windows-test2 use_cuda: "1" vc_product: BuildTools - vc_version: "14.11" + vc_version: "14.13" vc_year: "2017" - pytorch_windows_build: build_environment: pytorch-win-vs2017-14-16-cuda10-cudnn7-py3 @@ -7812,11 +7812,11 @@ workflows: - master - /ci-all\/.*/ - /release\/.*/ - name: pytorch_windows_vs2017_14.11_py36_cpu_build + name: pytorch_windows_vs2017_14.13_py36_cpu_build python_version: "3.6" use_cuda: "0" vc_product: BuildTools - vc_version: "14.11" + vc_version: "14.13" vc_year: "2017" - pytorch_windows_test: build_environment: pytorch-win-vs2017-14-11-cpu-py3 @@ -7827,14 +7827,14 @@ workflows: - master - /ci-all\/.*/ - /release\/.*/ - name: pytorch_windows_vs2017_14.11_py36_cpu_test1 + name: pytorch_windows_vs2017_14.13_py36_cpu_test1 python_version: "3.6" requires: - - pytorch_windows_vs2017_14.11_py36_cpu_build + - pytorch_windows_vs2017_14.13_py36_cpu_build test_name: pytorch-windows-test1 use_cuda: "0" vc_product: BuildTools - vc_version: "14.11" + vc_version: "14.13" vc_year: "2017" - pytorch_windows_test: build_environment: pytorch-win-vs2017-14-11-cpu-py3 @@ -7845,14 +7845,14 @@ workflows: - master - /ci-all\/.*/ - /release\/.*/ - name: pytorch_windows_vs2017_14.11_py36_cpu_test2 + name: pytorch_windows_vs2017_14.13_py36_cpu_test2 python_version: "3.6" requires: - - pytorch_windows_vs2017_14.11_py36_cpu_build + - pytorch_windows_vs2017_14.13_py36_cpu_build test_name: pytorch-windows-test2 use_cuda: "0" vc_product: BuildTools - vc_version: "14.11" + vc_version: "14.13" vc_year: "2017" - pytorch_windows_build: build_environment: pytorch-win-vs2017-14-16-cpu-py3 From 807d064fb0f7fba9c3725a621d2d8d84db7703de Mon Sep 17 00:00:00 2001 From: Sebastian Messmer Date: Fri, 19 Jun 2020 11:52:13 -0700 Subject: [PATCH 2/4] Update on "[wip] Upgrade msvc to 14.13" Differential Revision: [D22072830](https://our.internmc.facebook.com/intern/diff/D22072830/) [ghstack-poisoned] --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 284b68c3aa3d..30d14c94c50d 100644 --- a/README.md +++ b/README.md @@ -210,12 +210,12 @@ Each CUDA version only supports one particular XCode version. The following comb On Windows -At least Visual Studio 2017 Update 3 (version 15.3.3 with the toolset 14.11) and [NVTX](https://docs.nvidia.com/gameworks/content/gameworkslibrary/nvtx/nvidia_tools_extension_library_nvtx.htm) are needed. +At least Visual Studio 2017 version 15.6 with the toolset 14.13 and [NVTX](https://docs.nvidia.com/gameworks/content/gameworkslibrary/nvtx/nvidia_tools_extension_library_nvtx.htm) are needed. -If the version of Visual Studio 2017 is higher than 15.4.5, installing of "VC++ 2017 version 15.4 v14.11 toolset" is strongly recommended. -
If the version of Visual Studio 2017 is lesser than 15.3.3, please update Visual Studio 2017 to the latest version along with installing "VC++ 2017 version 15.4 v14.11 toolset". -
There is no guarantee of the correct building with VC++ 2017 toolsets, others than version 15.4 v14.11. -
"VC++ 2017 version 15.4 v14.11 toolset" might be installed onto already installed Visual Studio 2017 by running its installation once again and checking the corresponding checkbox under "Individual components"/"Compilers, build tools, and runtimes". +If the version of Visual Studio 2017 is higher than 15.6, installing of "VC++ 2017 version 15.6 v14.13 toolset" is strongly recommended. +
If the version of Visual Studio 2017 is lesser than 15.6, please update Visual Studio 2017 to the latest version along with installing "VC++ 2017 version 15.6 v14.13 toolset". +
There is no guarantee of the correct building with VC++ 2017 toolsets, others than version 15.6 v14.13. +
"VC++ 2017 version 15.6 v14.13 toolset" might be installed onto already installed Visual Studio 2017 by running its installation once again and checking the corresponding checkbox under "Individual components"/"Compilers, build tools, and runtimes". NVTX is a part of CUDA distributive, where it is called "Nsight Compute". To install it onto already installed CUDA run CUDA installation once again and check the corresponding checkbox. Be sure that CUDA with Nsight Compute is installed after Visual Studio 2017. From 5d6655b1f925857856283b884630a6e5ba38b293 Mon Sep 17 00:00:00 2001 From: Sebastian Messmer Date: Fri, 19 Jun 2020 14:55:39 -0700 Subject: [PATCH 3/4] Update on "[wip] Upgrade msvc to 14.13" Differential Revision: [D22072830](https://our.internmc.facebook.com/intern/diff/D22072830/) [ghstack-poisoned] --- .../cimodel/data/windows_build_definitions.py | 12 ++++++------ .circleci/config.yml | 18 +++++++++--------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.circleci/cimodel/data/windows_build_definitions.py b/.circleci/cimodel/data/windows_build_definitions.py index 54f39e3cec91..05af38b13c8a 100644 --- a/.circleci/cimodel/data/windows_build_definitions.py +++ b/.circleci/cimodel/data/windows_build_definitions.py @@ -115,18 +115,18 @@ def render(self): WORKFLOW_DATA = [ - WindowsJob(None, VcSpec(2017, ["14", "11"]), CudaVersion(10, 1)), - WindowsJob(1, VcSpec(2017, ["14", "11"]), CudaVersion(10, 1)), - WindowsJob(2, VcSpec(2017, ["14", "11"]), CudaVersion(10, 1)), + WindowsJob(None, VcSpec(2017, ["14", "13"]), CudaVersion(10, 1)), + WindowsJob(1, VcSpec(2017, ["14", "13"]), CudaVersion(10, 1)), + WindowsJob(2, VcSpec(2017, ["14", "13"]), CudaVersion(10, 1)), WindowsJob(None, VcSpec(2017, ["14", "16"]), CudaVersion(10, 1)), WindowsJob(1, VcSpec(2017, ["14", "16"]), CudaVersion(10, 1)), WindowsJob(2, VcSpec(2017, ["14", "16"]), CudaVersion(10, 1)), WindowsJob(None, VcSpec(2019), CudaVersion(10, 1)), WindowsJob(1, VcSpec(2019), CudaVersion(10, 1)), WindowsJob(2, VcSpec(2019), CudaVersion(10, 1)), - WindowsJob(None, VcSpec(2017, ["14", "11"]), None), - WindowsJob(1, VcSpec(2017, ["14", "11"]), None), - WindowsJob(2, VcSpec(2017, ["14", "11"]), None), + WindowsJob(None, VcSpec(2017, ["14", "13"]), None), + WindowsJob(1, VcSpec(2017, ["14", "13"]), None), + WindowsJob(2, VcSpec(2017, ["14", "13"]), None), WindowsJob(None, VcSpec(2017, ["14", "16"]), None), WindowsJob(1, VcSpec(2017, ["14", "16"]), None), WindowsJob(2, VcSpec(2017, ["14", "16"]), None), diff --git a/.circleci/config.yml b/.circleci/config.yml index 681fa9db86b4..677286ab0a8d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -262,7 +262,7 @@ pytorch_windows_params: &pytorch_windows_params default: "3.6" vc_version: type: string - default: "14.13" + default: "14.11" vc_year: type: string default: "2017" @@ -577,7 +577,7 @@ jobs: default: "3.6" vc_version: type: string - default: "14.13" + default: "14.11" vc_year: type: string default: "2017" @@ -648,7 +648,7 @@ jobs: default: "3.6" vc_version: type: string - default: "14.13" + default: "14.11" vc_year: type: string default: "2017" @@ -7663,7 +7663,7 @@ workflows: requires: - nightly_pytorch_linux_xenial_py3_clang5_android_ndk_r19c_android_gradle_build - pytorch_windows_build: - build_environment: pytorch-win-vs2017-14-11-cuda10-cudnn7-py3 + build_environment: pytorch-win-vs2017-14-13-cuda10-cudnn7-py3 cuda_version: "10" filters: branches: @@ -7678,7 +7678,7 @@ workflows: vc_version: "14.13" vc_year: "2017" - pytorch_windows_test: - build_environment: pytorch-win-vs2017-14-11-cuda10-cudnn7-py3 + build_environment: pytorch-win-vs2017-14-13-cuda10-cudnn7-py3 cuda_version: "10" executor: windows-with-nvidia-gpu filters: @@ -7697,7 +7697,7 @@ workflows: vc_version: "14.13" vc_year: "2017" - pytorch_windows_test: - build_environment: pytorch-win-vs2017-14-11-cuda10-cudnn7-py3 + build_environment: pytorch-win-vs2017-14-13-cuda10-cudnn7-py3 cuda_version: "10" executor: windows-with-nvidia-gpu filters: @@ -7804,7 +7804,7 @@ workflows: vc_version: "" vc_year: "2019" - pytorch_windows_build: - build_environment: pytorch-win-vs2017-14-11-cpu-py3 + build_environment: pytorch-win-vs2017-14-13-cpu-py3 cuda_version: cpu filters: branches: @@ -7819,7 +7819,7 @@ workflows: vc_version: "14.13" vc_year: "2017" - pytorch_windows_test: - build_environment: pytorch-win-vs2017-14-11-cpu-py3 + build_environment: pytorch-win-vs2017-14-13-cpu-py3 cuda_version: cpu filters: branches: @@ -7837,7 +7837,7 @@ workflows: vc_version: "14.13" vc_year: "2017" - pytorch_windows_test: - build_environment: pytorch-win-vs2017-14-11-cpu-py3 + build_environment: pytorch-win-vs2017-14-13-cpu-py3 cuda_version: cpu filters: branches: From 6a85d47c69c31f7134edb8f4fe18b08284652d77 Mon Sep 17 00:00:00 2001 From: Sebastian Messmer Date: Fri, 19 Jun 2020 14:59:11 -0700 Subject: [PATCH 4/4] Update on "[wip] Upgrade msvc to 14.13" Differential Revision: [D22072830](https://our.internmc.facebook.com/intern/diff/D22072830/) [ghstack-poisoned] --- .circleci/config.yml | 6 +++--- .circleci/scripts/vs_install.ps1 | 2 +- .../build-parameters/pytorch-build-params.yml | 2 +- .circleci/verbatim-sources/job-specs/pytorch-job-specs.yml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 677286ab0a8d..c0bec17da00f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -262,7 +262,7 @@ pytorch_windows_params: &pytorch_windows_params default: "3.6" vc_version: type: string - default: "14.11" + default: "14.13" vc_year: type: string default: "2017" @@ -577,7 +577,7 @@ jobs: default: "3.6" vc_version: type: string - default: "14.11" + default: "14.13" vc_year: type: string default: "2017" @@ -648,7 +648,7 @@ jobs: default: "3.6" vc_version: type: string - default: "14.11" + default: "14.13" vc_year: type: string default: "2017" diff --git a/.circleci/scripts/vs_install.ps1 b/.circleci/scripts/vs_install.ps1 index 02db823bd926..25ab90b2ecca 100644 --- a/.circleci/scripts/vs_install.ps1 +++ b/.circleci/scripts/vs_install.ps1 @@ -1,7 +1,7 @@ $VS_DOWNLOAD_LINK = "https://aka.ms/vs/15/release/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.11", + "--add Microsoft.VisualStudio.Component.VC.Tools.14.13", "--add Microsoft.Component.MSBuild", "--add Microsoft.VisualStudio.Component.Roslyn.Compiler", "--add Microsoft.VisualStudio.Component.TextTemplating", diff --git a/.circleci/verbatim-sources/build-parameters/pytorch-build-params.yml b/.circleci/verbatim-sources/build-parameters/pytorch-build-params.yml index f89f2d57e964..9e51d9073d61 100644 --- a/.circleci/verbatim-sources/build-parameters/pytorch-build-params.yml +++ b/.circleci/verbatim-sources/build-parameters/pytorch-build-params.yml @@ -61,7 +61,7 @@ pytorch_windows_params: &pytorch_windows_params default: "3.6" vc_version: type: string - default: "14.11" + default: "14.13" vc_year: type: string default: "2017" diff --git a/.circleci/verbatim-sources/job-specs/pytorch-job-specs.yml b/.circleci/verbatim-sources/job-specs/pytorch-job-specs.yml index a1c08199bacc..cea4fd115fdb 100644 --- a/.circleci/verbatim-sources/job-specs/pytorch-job-specs.yml +++ b/.circleci/verbatim-sources/job-specs/pytorch-job-specs.yml @@ -181,7 +181,7 @@ jobs: default: "3.6" vc_version: type: string - default: "14.11" + default: "14.13" vc_year: type: string default: "2017" @@ -252,7 +252,7 @@ jobs: default: "3.6" vc_version: type: string - default: "14.11" + default: "14.13" vc_year: type: string default: "2017"