From 0856b9773d646fe22651270986e0aafd6d6738b1 Mon Sep 17 00:00:00 2001 From: Vasilis Vryniotis Date: Thu, 11 Nov 2021 21:07:20 +0000 Subject: [PATCH 1/7] Bump cuda version for windows cmake. --- .circleci/config.yml | 2 ++ .circleci/config.yml.in | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3a58071fabf..95a9d433b6d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -917,6 +917,8 @@ jobs: <<: *binary_common executor: name: windows-gpu + environment: + cu_version: "cu111" steps: - checkout_merge - designate_upload_channel diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index c800d8a0ac9..2b5f9877040 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -917,6 +917,8 @@ jobs: <<: *binary_common executor: name: windows-gpu + environment: + cu_version: "cu111" steps: - checkout_merge - designate_upload_channel From e857f79f2ddb5ac2eb54ae32cd8df93a85d1a73a Mon Sep 17 00:00:00 2001 From: Vasilis Vryniotis Date: Thu, 11 Nov 2021 21:22:59 +0000 Subject: [PATCH 2/7] defining both vars. --- .circleci/config.yml | 3 ++- .circleci/config.yml.in | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 95a9d433b6d..6c77513f93c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -918,7 +918,8 @@ jobs: executor: name: windows-gpu environment: - cu_version: "cu111" + CU_VERSION: "cu111" + CUDA_VERSION: "11.1" steps: - checkout_merge - designate_upload_channel diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index 2b5f9877040..a16e339ec1b 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -918,7 +918,8 @@ jobs: executor: name: windows-gpu environment: - cu_version: "cu111" + CU_VERSION: "cu111" + CUDA_VERSION: "11.1" steps: - checkout_merge - designate_upload_channel From 21fc6fc2f3cc433ef1c35113ec2209b1b4f0968b Mon Sep 17 00:00:00 2001 From: Vasilis Vryniotis Date: Thu, 11 Nov 2021 21:39:45 +0000 Subject: [PATCH 3/7] Changing to cu111. --- .circleci/config.yml | 7 ++----- .circleci/config.yml.in | 3 --- .circleci/regenerate.py | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6c77513f93c..fd59e336e55 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -917,9 +917,6 @@ jobs: <<: *binary_common executor: name: windows-gpu - environment: - CU_VERSION: "cu111" - CUDA_VERSION: "11.1" steps: - checkout_merge - designate_upload_channel @@ -1645,7 +1642,7 @@ workflows: name: cmake_linux_cpu python_version: '3.8' - cmake_linux_gpu: - cu_version: cu102 + cu_version: cu111 name: cmake_linux_gpu python_version: '3.8' wheel_docker_image: pytorch/manylinux-cuda102 @@ -1654,7 +1651,7 @@ workflows: name: cmake_windows_cpu python_version: '3.8' - cmake_windows_gpu: - cu_version: cu102 + cu_version: cu111 name: cmake_windows_gpu python_version: '3.8' - cmake_macos_cpu: diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in index a16e339ec1b..c800d8a0ac9 100644 --- a/.circleci/config.yml.in +++ b/.circleci/config.yml.in @@ -917,9 +917,6 @@ jobs: <<: *binary_common executor: name: windows-gpu - environment: - CU_VERSION: "cu111" - CUDA_VERSION: "11.1" steps: - checkout_merge - designate_upload_channel diff --git a/.circleci/regenerate.py b/.circleci/regenerate.py index ac903fd0f71..7abd40e4db0 100755 --- a/.circleci/regenerate.py +++ b/.circleci/regenerate.py @@ -268,7 +268,7 @@ def cmake_workflows(indentation=6): for device in device_types: job = {"name": f"cmake_{os_type}_{device}", "python_version": python_version} - job["cu_version"] = "cu102" if device == "gpu" else "cpu" + job["cu_version"] = "cu111" if device == "gpu" else "cpu" if device == "gpu" and os_type == "linux": job["wheel_docker_image"] = "pytorch/manylinux-cuda102" jobs.append({f"cmake_{os_type}_{device}": job}) From b536b8127fd7099168ad42353db8f5e459c72de8 Mon Sep 17 00:00:00 2001 From: Vasilis Vryniotis Date: Thu, 11 Nov 2021 21:47:57 +0000 Subject: [PATCH 4/7] Changing to cu113. --- .circleci/regenerate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/regenerate.py b/.circleci/regenerate.py index 7abd40e4db0..13ab1aede6f 100755 --- a/.circleci/regenerate.py +++ b/.circleci/regenerate.py @@ -268,7 +268,7 @@ def cmake_workflows(indentation=6): for device in device_types: job = {"name": f"cmake_{os_type}_{device}", "python_version": python_version} - job["cu_version"] = "cu111" if device == "gpu" else "cpu" + job["cu_version"] = "cu113" if device == "gpu" else "cpu" if device == "gpu" and os_type == "linux": job["wheel_docker_image"] = "pytorch/manylinux-cuda102" jobs.append({f"cmake_{os_type}_{device}": job}) From 8f5522d24192dbb34f4466a3ac7ff69ab8909541 Mon Sep 17 00:00:00 2001 From: Vasilis Vryniotis Date: Thu, 11 Nov 2021 21:52:24 +0000 Subject: [PATCH 5/7] Fixing consistency --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fd59e336e55..5ebcf06c1c2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1642,7 +1642,7 @@ workflows: name: cmake_linux_cpu python_version: '3.8' - cmake_linux_gpu: - cu_version: cu111 + cu_version: cu113 name: cmake_linux_gpu python_version: '3.8' wheel_docker_image: pytorch/manylinux-cuda102 @@ -1651,7 +1651,7 @@ workflows: name: cmake_windows_cpu python_version: '3.8' - cmake_windows_gpu: - cu_version: cu111 + cu_version: cu113 name: cmake_windows_gpu python_version: '3.8' - cmake_macos_cpu: From 4b74557cf12e36123df0727610c6cb02de29accf Mon Sep 17 00:00:00 2001 From: Vasilis Vryniotis Date: Thu, 11 Nov 2021 22:13:48 +0000 Subject: [PATCH 6/7] Install nvjpeg_11.3 --- packaging/windows/internal/cuda_install.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/windows/internal/cuda_install.bat b/packaging/windows/internal/cuda_install.bat index db181c62321..0b42a2cbba3 100644 --- a/packaging/windows/internal/cuda_install.bat +++ b/packaging/windows/internal/cuda_install.bat @@ -167,7 +167,7 @@ if not exist "%SRC_DIR%\temp_build\%CUDA_INSTALL_EXE%" ( curl -k -L "https://ossci-windows.s3.amazonaws.com/%CUDA_INSTALL_EXE%" --output "%SRC_DIR%\temp_build\%CUDA_INSTALL_EXE%" if errorlevel 1 exit /b 1 set "CUDA_SETUP_FILE=%SRC_DIR%\temp_build\%CUDA_INSTALL_EXE%" - set "ARGS=thrust_11.3 nvcc_11.3 cuobjdump_11.3 nvprune_11.3 nvprof_11.3 cupti_11.3 cublas_11.3 cublas_dev_11.3 cudart_11.3 cufft_11.3 cufft_dev_11.3 curand_11.3 curand_dev_11.3 cusolver_11.3 cusolver_dev_11.3 cusparse_11.3 cusparse_dev_11.3 npp_11.3 npp_dev_11.3 nvrtc_11.3 nvrtc_dev_11.3 nvml_dev_11.3" + set "ARGS=thrust_11.3 nvcc_11.3 cuobjdump_11.3 nvprune_11.3 nvprof_11.3 cupti_11.3 cublas_11.3 cublas_dev_11.3 cudart_11.3 cufft_11.3 cufft_dev_11.3 curand_11.3 curand_dev_11.3 cusolver_11.3 cusolver_dev_11.3 cusparse_11.3 cusparse_dev_11.3 npp_11.3 npp_dev_11.3 nvjpeg_11.3 nvjpeg_dev_11.3 nvrtc_11.3 nvrtc_dev_11.3 nvml_dev_11.3" ) From aa7322bbd6e40d760a5306893acc98688df500d6 Mon Sep 17 00:00:00 2001 From: Vasilis Vryniotis Date: Thu, 11 Nov 2021 22:24:36 +0000 Subject: [PATCH 7/7] Change manylinux-cuda113 --- .circleci/config.yml | 2 +- .circleci/regenerate.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5ebcf06c1c2..27b2fff2efe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1645,7 +1645,7 @@ workflows: cu_version: cu113 name: cmake_linux_gpu python_version: '3.8' - wheel_docker_image: pytorch/manylinux-cuda102 + wheel_docker_image: pytorch/manylinux-cuda113 - cmake_windows_cpu: cu_version: cpu name: cmake_windows_cpu diff --git a/.circleci/regenerate.py b/.circleci/regenerate.py index 13ab1aede6f..2413e4adbac 100755 --- a/.circleci/regenerate.py +++ b/.circleci/regenerate.py @@ -270,7 +270,7 @@ def cmake_workflows(indentation=6): job["cu_version"] = "cu113" if device == "gpu" else "cpu" if device == "gpu" and os_type == "linux": - job["wheel_docker_image"] = "pytorch/manylinux-cuda102" + job["wheel_docker_image"] = "pytorch/manylinux-cuda113" jobs.append({f"cmake_{os_type}_{device}": job}) return indent(indentation, jobs)