frozenleaves/pytorch
1
0
Fork 0
mirror of https://github.com/pytorch/pytorch.git synced 2025-10-20 21:14:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert D22072830: [wip] Upgrade msvc to 14.13

Browse Source 
Test Plan: revert-hammer

Differential Revision:
D22072830

Original commit changeset: 6fa03725f3fe

fbshipit-source-id: 901de185e607810cb3871c2e4d23816848c97f4b
This commit is contained in:
Sebastian Messmer
2020-06-23 16:01:03 -07:00
committed by Facebook GitHub Bot
parent 581ad48806
commit d8ec19bc03
6 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.circleci/cimodel/data/windows_build_definitions.py
View File

@ -120,8 +120,8 @@ def TruePred(_):
WORKFLOW_DATA = [
# VS2017 CUDA-10.1
WindowsJob(None, VcSpec(2017, ["14", "13"]), CudaVersion(10, 1), master_only_pred=FalsePred),
WindowsJob(1, VcSpec(2017, ["14", "13"]), CudaVersion(10, 1)),
WindowsJob(None, VcSpec(2017, ["14", "11"]), CudaVersion(10, 1), master_only_pred=FalsePred),
WindowsJob(1, VcSpec(2017, ["14", "11"]), CudaVersion(10, 1)),
# VS2017 no-CUDA (builds only)
WindowsJob(None, VcSpec(2017, ["14", "16"]), CudaVersion(10, 1)),
WindowsJob(None, VcSpec(2017, ["14", "16"]), None),

20
.circleci/config.yml
View File

@ -281,7 +281,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"
@ -596,7 +596,7 @@ jobs:
default: "3.6"
vc_version:
type: string
default: "14.13"
default: "14.11"
vc_year:
type: string
default: "2017"
@ -667,7 +667,7 @@ jobs:
default: "3.6"
vc_version:
type: string
default: "14.13"
default: "14.11"
vc_year:
type: string
default: "2017"
@ -7776,16 +7776,16 @@ workflows:
requires:
- nightly_pytorch_linux_xenial_py3_clang5_android_ndk_r19c_android_gradle_build
- pytorch_windows_build:
build_environment: pytorch-win-vs2017-14-13-cuda10-cudnn7-py3
build_environment: pytorch-win-vs2017-14-11-cuda10-cudnn7-py3
cuda_version: "10"
name: pytorch_windows_vs2017_14.13_py36_cuda10.1_build
name: pytorch_windows_vs2017_14.11_py36_cuda10.1_build
python_version: "3.6"
use_cuda: "1"
vc_product: BuildTools
vc_version: "14.13"
vc_version: "14.11"
vc_year: "2017"
- pytorch_windows_test:
build_environment: pytorch-win-vs2017-14-13-cuda10-cudnn7-py3
build_environment: pytorch-win-vs2017-14-11-cuda10-cudnn7-py3
cuda_version: "10"
executor: windows-with-nvidia-gpu
filters:
@ -7794,14 +7794,14 @@ workflows:
- master
- /ci-all\/.*/
- /release\/.*/
name: pytorch_windows_vs2017_14.13_py36_cuda10.1_test1
name: pytorch_windows_vs2017_14.11_py36_cuda10.1_test1
python_version: "3.6"
requires:
- pytorch_windows_vs2017_14.13_py36_cuda10.1_build
- pytorch_windows_vs2017_14.11_py36_cuda10.1_build
test_name: pytorch-windows-test1
use_cuda: "1"
vc_product: BuildTools
vc_version: "14.13"
vc_version: "14.11"
vc_year: "2017"
- pytorch_windows_build:
build_environment: pytorch-win-vs2017-14-16-cuda10-cudnn7-py3

2
.circleci/scripts/vs_install.ps1
View File

@ -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.13",
"--add Microsoft.VisualStudio.Component.VC.Tools.14.11",
"--add Microsoft.Component.MSBuild",
"--add Microsoft.VisualStudio.Component.Roslyn.Compiler",
"--add Microsoft.VisualStudio.Component.TextTemplating",

2
.circleci/verbatim-sources/build-parameters/pytorch-build-params.yml
View File

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

4
.circleci/verbatim-sources/job-specs/pytorch-job-specs.yml
View File

@ -181,7 +181,7 @@ jobs:
default: "3.6"
vc_version:
type: string
default: "14.13"
default: "14.11"
vc_year:
type: string
default: "2017"
@ -252,7 +252,7 @@ jobs:
default: "3.6"
vc_version:
type: string
default: "14.13"
default: "14.11"
vc_year:
type: string
default: "2017"

10
README.md
View File

@ -210,12 +210,12 @@ Each CUDA version only supports one particular XCode version. The following comb
On Windows
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.
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.
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.
<br/> 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".
<br/> There is no guarantee of the correct building with VC++ 2017 toolsets, others than version 15.6 v14.13.
<br/> "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".
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.
<br/> 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".
<br/> There is no guarantee of the correct building with VC++ 2017 toolsets, others than version 15.4 v14.11.
<br/> "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".
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.