From 608f99e4ea768c9aa418359bb2db2c47dc50e26a Mon Sep 17 00:00:00 2001 From: Xiang Gao Date: Thu, 6 Aug 2020 09:34:33 -0700 Subject: [PATCH] Fix cudnn version on build_environment of Windows CI (#42615) Summary: Pull Request resolved: https://github.com/pytorch/pytorch/pull/42615 Reviewed By: mrshenli Differential Revision: D22958660 Pulled By: malfet fbshipit-source-id: 97a6a0e769143bd161667d0ee081ea0751995775 --- .circleci/cimodel/data/windows_build_definitions.py | 5 ++++- .circleci/config.yml | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.circleci/cimodel/data/windows_build_definitions.py b/.circleci/cimodel/data/windows_build_definitions.py index 8e5efdc0cb33d..ee0af41e0f835 100644 --- a/.circleci/cimodel/data/windows_build_definitions.py +++ b/.circleci/cimodel/data/windows_build_definitions.py @@ -43,8 +43,11 @@ def gen_tree(self): if base_phase == "test": prerequisite_jobs.append("_".join(base_name_parts + ["build"])) + if self.cuda_version: + self.cudnn_version = 8 if self.cuda_version.major == 11 else 7 + arch_env_elements = ( - ["cuda" + str(self.cuda_version.major), "cudnn7"] + ["cuda" + str(self.cuda_version.major), "cudnn" + str(self.cudnn_version)] if self.cuda_version else ["cpu"] ) diff --git a/.circleci/config.yml b/.circleci/config.yml index c4057d927a36b..de3fe5daeceee 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6364,7 +6364,7 @@ workflows: vc_version: "" vc_year: "2019" - pytorch_windows_build: - build_environment: pytorch-win-vs2019-cuda11-cudnn7-py3 + build_environment: pytorch-win-vs2019-cuda11-cudnn8-py3 cuda_version: "11" name: pytorch_windows_vs2019_py36_cuda11.0_build python_version: "3.6" @@ -6373,7 +6373,7 @@ workflows: vc_version: "" vc_year: "2019" - pytorch_windows_test: - build_environment: pytorch-win-vs2019-cuda11-cudnn7-py3 + build_environment: pytorch-win-vs2019-cuda11-cudnn8-py3 cuda_version: "11" executor: windows-with-nvidia-gpu name: pytorch_windows_vs2019_py36_cuda11.0_test1 @@ -6386,7 +6386,7 @@ workflows: vc_version: "" vc_year: "2019" - pytorch_windows_test: - build_environment: pytorch-win-vs2019-cuda11-cudnn7-py3 + build_environment: pytorch-win-vs2019-cuda11-cudnn8-py3 cuda_version: "11" executor: windows-with-nvidia-gpu name: pytorch_windows_vs2019_py36_cuda11.0_test2 @@ -6399,7 +6399,7 @@ workflows: vc_version: "" vc_year: "2019" - pytorch_windows_test: - build_environment: pytorch-win-vs2019-cuda11-cudnn7-py3 + build_environment: pytorch-win-vs2019-cuda11-cudnn8-py3 cuda_version: "11" executor: windows-with-nvidia-gpu name: pytorch_windows_vs2019_py36_cuda11.0_test-jit-profiling-tests