Commit 4625408a authored by atalman's avatar atalman Committed by Facebook GitHub Bot
Browse files

Revert "Removing cuda102 (#2715)" (#2723)

Summary:
Revert this fot now untill docker is updated

Pull Request resolved: https://github.com/pytorch/audio/pull/2723

Reviewed By: nateanl

Differential Revision: D39900382

Pulled By: atalman

fbshipit-source-id: f8701e359bc11e8f9f3a29144f7e7da336a470da
parent f52d4fb1
...@@ -76,11 +76,11 @@ binary_common: &binary_common ...@@ -76,11 +76,11 @@ binary_common: &binary_common
wheel_docker_image: wheel_docker_image:
description: "Wheel only: what docker image to use" description: "Wheel only: what docker image to use"
type: string type: string
default: "pytorch/manylinux-cuda116" default: "pytorch/manylinux-cuda102"
conda_docker_image: conda_docker_image:
description: "Conda only: what docker image to use" description: "Conda only: what docker image to use"
type: string type: string
default: "pytorch/conda-builder:cuda116" default: "pytorch/conda-builder:cuda102"
environment: &environment environment: &environment
PYTHON_VERSION: << parameters.python_version >> PYTHON_VERSION: << parameters.python_version >>
BUILD_VERSION: << parameters.build_version >> BUILD_VERSION: << parameters.build_version >>
...@@ -1429,6 +1429,19 @@ workflows: ...@@ -1429,6 +1429,19 @@ workflows:
python_version: '3.7' python_version: '3.7'
requires: requires:
- binary_linux_conda_py3.7_cpu - binary_linux_conda_py3.7_cpu
- binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cuda102
cuda_version: cu102
name: binary_linux_conda_py3.7_cu102
python_version: '3.7'
requires:
- build_ffmpeg_linux
- smoke_test_linux_conda_gpu:
cuda_version: cu102
name: binary_linux_conda_py3.7_cu102_smoke_test_conda
python_version: '3.7'
requires:
- binary_linux_conda_py3.7_cu102
- binary_linux_conda: - binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cuda116 conda_docker_image: pytorch/conda-builder:cuda116
cuda_version: cu116 cuda_version: cu116
...@@ -1468,6 +1481,19 @@ workflows: ...@@ -1468,6 +1481,19 @@ workflows:
python_version: '3.8' python_version: '3.8'
requires: requires:
- binary_linux_conda_py3.8_cpu - binary_linux_conda_py3.8_cpu
- binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cuda102
cuda_version: cu102
name: binary_linux_conda_py3.8_cu102
python_version: '3.8'
requires:
- build_ffmpeg_linux
- smoke_test_linux_conda_gpu:
cuda_version: cu102
name: binary_linux_conda_py3.8_cu102_smoke_test_conda
python_version: '3.8'
requires:
- binary_linux_conda_py3.8_cu102
- binary_linux_conda: - binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cuda116 conda_docker_image: pytorch/conda-builder:cuda116
cuda_version: cu116 cuda_version: cu116
...@@ -1507,6 +1533,19 @@ workflows: ...@@ -1507,6 +1533,19 @@ workflows:
python_version: '3.9' python_version: '3.9'
requires: requires:
- binary_linux_conda_py3.9_cpu - binary_linux_conda_py3.9_cpu
- binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cuda102
cuda_version: cu102
name: binary_linux_conda_py3.9_cu102
python_version: '3.9'
requires:
- build_ffmpeg_linux
- smoke_test_linux_conda_gpu:
cuda_version: cu102
name: binary_linux_conda_py3.9_cu102_smoke_test_conda
python_version: '3.9'
requires:
- binary_linux_conda_py3.9_cu102
- binary_linux_conda: - binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cuda116 conda_docker_image: pytorch/conda-builder:cuda116
cuda_version: cu116 cuda_version: cu116
...@@ -1546,6 +1585,19 @@ workflows: ...@@ -1546,6 +1585,19 @@ workflows:
python_version: '3.10' python_version: '3.10'
requires: requires:
- binary_linux_conda_py3.10_cpu - binary_linux_conda_py3.10_cpu
- binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cuda102
cuda_version: cu102
name: binary_linux_conda_py3.10_cu102
python_version: '3.10'
requires:
- build_ffmpeg_linux
- smoke_test_linux_conda_gpu:
cuda_version: cu102
name: binary_linux_conda_py3.10_cu102_smoke_test_conda
python_version: '3.10'
requires:
- binary_linux_conda_py3.10_cu102
- binary_linux_conda: - binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cuda116 conda_docker_image: pytorch/conda-builder:cuda116
cuda_version: cu116 cuda_version: cu116
...@@ -3362,6 +3414,42 @@ workflows: ...@@ -3362,6 +3414,42 @@ workflows:
python_version: '3.7' python_version: '3.7'
requires: requires:
- nightly_binary_linux_conda_py3.7_cpu - nightly_binary_linux_conda_py3.7_cpu
- binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cuda102
cuda_version: cu102
filters:
branches:
only:
- nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_conda_py3.7_cu102
python_version: '3.7'
requires:
- build_ffmpeg_linux
- binary_conda_upload:
context: org-member
filters:
branches:
only:
- nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_conda_py3.7_cu102_upload
requires:
- nightly_binary_linux_conda_py3.7_cu102
- smoke_test_linux_conda_gpu:
cuda_version: cu102
filters:
branches:
only:
- nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_conda_py3.7_cu102_smoke_test_conda
python_version: '3.7'
requires:
- nightly_binary_linux_conda_py3.7_cu102
- binary_linux_conda: - binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cuda116 conda_docker_image: pytorch/conda-builder:cuda116
cuda_version: cu116 cuda_version: cu116
...@@ -3470,6 +3558,42 @@ workflows: ...@@ -3470,6 +3558,42 @@ workflows:
python_version: '3.8' python_version: '3.8'
requires: requires:
- nightly_binary_linux_conda_py3.8_cpu - nightly_binary_linux_conda_py3.8_cpu
- binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cuda102
cuda_version: cu102
filters:
branches:
only:
- nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_conda_py3.8_cu102
python_version: '3.8'
requires:
- build_ffmpeg_linux
- binary_conda_upload:
context: org-member
filters:
branches:
only:
- nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_conda_py3.8_cu102_upload
requires:
- nightly_binary_linux_conda_py3.8_cu102
- smoke_test_linux_conda_gpu:
cuda_version: cu102
filters:
branches:
only:
- nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_conda_py3.8_cu102_smoke_test_conda
python_version: '3.8'
requires:
- nightly_binary_linux_conda_py3.8_cu102
- binary_linux_conda: - binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cuda116 conda_docker_image: pytorch/conda-builder:cuda116
cuda_version: cu116 cuda_version: cu116
...@@ -3578,6 +3702,42 @@ workflows: ...@@ -3578,6 +3702,42 @@ workflows:
python_version: '3.9' python_version: '3.9'
requires: requires:
- nightly_binary_linux_conda_py3.9_cpu - nightly_binary_linux_conda_py3.9_cpu
- binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cuda102
cuda_version: cu102
filters:
branches:
only:
- nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_conda_py3.9_cu102
python_version: '3.9'
requires:
- build_ffmpeg_linux
- binary_conda_upload:
context: org-member
filters:
branches:
only:
- nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_conda_py3.9_cu102_upload
requires:
- nightly_binary_linux_conda_py3.9_cu102
- smoke_test_linux_conda_gpu:
cuda_version: cu102
filters:
branches:
only:
- nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_conda_py3.9_cu102_smoke_test_conda
python_version: '3.9'
requires:
- nightly_binary_linux_conda_py3.9_cu102
- binary_linux_conda: - binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cuda116 conda_docker_image: pytorch/conda-builder:cuda116
cuda_version: cu116 cuda_version: cu116
...@@ -3686,6 +3846,42 @@ workflows: ...@@ -3686,6 +3846,42 @@ workflows:
python_version: '3.10' python_version: '3.10'
requires: requires:
- nightly_binary_linux_conda_py3.10_cpu - nightly_binary_linux_conda_py3.10_cpu
- binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cuda102
cuda_version: cu102
filters:
branches:
only:
- nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_conda_py3.10_cu102
python_version: '3.10'
requires:
- build_ffmpeg_linux
- binary_conda_upload:
context: org-member
filters:
branches:
only:
- nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_conda_py3.10_cu102_upload
requires:
- nightly_binary_linux_conda_py3.10_cu102
- smoke_test_linux_conda_gpu:
cuda_version: cu102
filters:
branches:
only:
- nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_conda_py3.10_cu102_smoke_test_conda
python_version: '3.10'
requires:
- nightly_binary_linux_conda_py3.10_cu102
- binary_linux_conda: - binary_linux_conda:
conda_docker_image: pytorch/conda-builder:cuda116 conda_docker_image: pytorch/conda-builder:cuda116
cuda_version: cu116 cuda_version: cu116
......
...@@ -76,11 +76,11 @@ binary_common: &binary_common ...@@ -76,11 +76,11 @@ binary_common: &binary_common
wheel_docker_image: wheel_docker_image:
description: "Wheel only: what docker image to use" description: "Wheel only: what docker image to use"
type: string type: string
default: "pytorch/manylinux-cuda116" default: "pytorch/manylinux-cuda102"
conda_docker_image: conda_docker_image:
description: "Conda only: what docker image to use" description: "Conda only: what docker image to use"
type: string type: string
default: "pytorch/conda-builder:cuda116" default: "pytorch/conda-builder:cuda102"
environment: &environment environment: &environment
PYTHON_VERSION: << parameters.python_version >> PYTHON_VERSION: << parameters.python_version >>
BUILD_VERSION: << parameters.build_version >> BUILD_VERSION: << parameters.build_version >>
......
...@@ -23,7 +23,7 @@ from jinja2 import select_autoescape ...@@ -23,7 +23,7 @@ from jinja2 import select_autoescape
PYTHON_VERSIONS = ["3.7", "3.8", "3.9", "3.10"] PYTHON_VERSIONS = ["3.7", "3.8", "3.9", "3.10"]
CU_VERSIONS_DICT = { CU_VERSIONS_DICT = {
"linux": ["cpu", "cu116", "cu117", "rocm5.1.1", "rocm5.2"], "linux": ["cpu", "cu102", "cu116", "cu117", "rocm5.1.1", "rocm5.2"],
"windows": ["cpu", "cu116", "cu117"], "windows": ["cpu", "cu116", "cu117"],
"macos": ["cpu"], "macos": ["cpu"],
} }
......
...@@ -62,6 +62,14 @@ setup_cuda() { ...@@ -62,6 +62,14 @@ setup_cuda() {
fi fi
export TORCH_CUDA_ARCH_LIST="3.5;5.0+PTX;6.0;7.0;7.5;8.0;8.6" export TORCH_CUDA_ARCH_LIST="3.5;5.0+PTX;6.0;7.0;7.5;8.0;8.6"
;; ;;
cu102)
if [[ "$OSTYPE" == "msys" ]]; then
export CUDA_HOME="C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v10.2"
else
export CUDA_HOME=/usr/local/cuda-10.2/
fi
export TORCH_CUDA_ARCH_LIST="3.5;5.0+PTX;6.0;7.0;7.5"
;;
rocm*) rocm*)
export USE_ROCM=1 export USE_ROCM=1
;; ;;
...@@ -245,6 +253,9 @@ setup_conda_cudatoolkit_constraint() { ...@@ -245,6 +253,9 @@ setup_conda_cudatoolkit_constraint() {
cu116) cu116)
export CONDA_CUDATOOLKIT_CONSTRAINT="- pytorch-cuda=11.6 # [not osx]" export CONDA_CUDATOOLKIT_CONSTRAINT="- pytorch-cuda=11.6 # [not osx]"
;; ;;
cu102)
export CONDA_CUDATOOLKIT_CONSTRAINT="- cudatoolkit >=10.2,<10.3 # [not osx]"
;;
cpu) cpu)
export CONDA_CUDATOOLKIT_CONSTRAINT="" export CONDA_CUDATOOLKIT_CONSTRAINT=""
export CONDA_BUILD_VARIANT="cpu" export CONDA_BUILD_VARIANT="cpu"
......
...@@ -23,12 +23,66 @@ set CUDA_VERSION_STR=%CUDA_VER_MAJOR%.%CUDA_VER_MINOR% ...@@ -23,12 +23,66 @@ set CUDA_VERSION_STR=%CUDA_VER_MAJOR%.%CUDA_VER_MINOR%
set CUDNN_FOLDER="cuda" set CUDNN_FOLDER="cuda"
set CUDNN_LIB_FOLDER="lib\x64" set CUDNN_LIB_FOLDER="lib\x64"
if %CUDA_VER% EQU 102 goto cuda102
if %CUDA_VER% EQU 113 goto cuda113
if %CUDA_VER% EQU 116 goto cuda116 if %CUDA_VER% EQU 116 goto cuda116
if %CUDA_VER% EQU 117 goto cuda117 if %CUDA_VER% EQU 117 goto cuda117
echo CUDA %CUDA_VERSION_STR% is not supported echo CUDA %CUDA_VERSION_STR% is not supported
exit /b 1 exit /b 1
:cuda102
if not exist "%SRC_DIR%\temp_build\cuda_10.2.89_441.22_win10.exe" (
curl -k -L https://ossci-windows.s3.amazonaws.com/cuda_10.2.89_441.22_win10.exe --output "%SRC_DIR%\temp_build\cuda_10.2.89_441.22_win10.exe"
if errorlevel 1 exit /b 1
set "CUDA_SETUP_FILE=%SRC_DIR%\temp_build\cuda_10.2.89_441.22_win10.exe"
set "ARGS=nvcc_10.2 cuobjdump_10.2 nvprune_10.2 cupti_10.2 cublas_10.2 cublas_dev_10.2 cudart_10.2 cufft_10.2 cufft_dev_10.2 curand_10.2 curand_dev_10.2 cusolver_10.2 cusolver_dev_10.2 cusparse_10.2 cusparse_dev_10.2 nvgraph_10.2 nvgraph_dev_10.2 npp_10.2 npp_dev_10.2 nvrtc_10.2 nvrtc_dev_10.2 nvml_dev_10.2"
)
if not exist "%SRC_DIR%\temp_build\cudnn-10.2-windows10-x64-v7.6.5.32.zip" (
curl -k -L https://ossci-windows.s3.amazonaws.com/cudnn-10.2-windows10-x64-v7.6.5.32.zip --output "%SRC_DIR%\temp_build\cudnn-10.2-windows10-x64-v7.6.5.32.zip"
if errorlevel 1 exit /b 1
set "CUDNN_SETUP_FILE=%SRC_DIR%\temp_build\cudnn-10.2-windows10-x64-v7.6.5.32.zip"
)
if not exist "%SRC_DIR%\temp_build\gpu_driver_dlls.7z" (
curl -k -L "https://drive.google.com/u/0/uc?id=1injUyo3lnarMgWyRcXqKg4UGnN0ysmuq&export=download" --output "%SRC_DIR%\temp_build\gpu_driver_dlls.zip"
if errorlevel 1 exit /b 1
)
echo Installing GPU driver DLLs
7z x %SRC_DIR%\temp_build\gpu_driver_dlls.zip -aoa -o"C:\Windows\System32"
goto cuda_common
:cuda113
set CUDA_INSTALL_EXE=cuda_11.3.0_465.89_win10.exe
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 CUDNN_INSTALL_ZIP=cudnn-windows-x86_64-8.3.2.44_cuda11.5-archive.zip
set CUDNN_FOLDER=cudnn-windows-x86_64-8.3.2.44_cuda11.5-archive
set CUDNN_LIB_FOLDER="lib"
if not exist "%SRC_DIR%\temp_build\%CUDNN_INSTALL_ZIP%" (
curl -k -L "http://s3.amazonaws.com/ossci-windows/%CUDNN_INSTALL_ZIP%" --output "%SRC_DIR%\temp_build\%CUDNN_INSTALL_ZIP%"
if errorlevel 1 exit /b 1
set "CUDNN_SETUP_FILE=%SRC_DIR%\temp_build\%CUDNN_INSTALL_ZIP%"
rem Make sure windows path contains zlib dll
curl -k -L "http://s3.amazonaws.com/ossci-windows/zlib123dllx64.zip" --output "%SRC_DIR%\temp_build\zlib123dllx64.zip"
7z x "%SRC_DIR%\temp_build\zlib123dllx64.zip" -o"%SRC_DIR%\temp_build\zlib"
xcopy /Y "%SRC_DIR%\temp_build\zlib\dll_x64\*.dll" "C:\Windows\System32"
)
goto cuda_common
:cuda116 :cuda116
set CUDA_INSTALL_EXE=cuda_11.6.0_511.23_windows.exe set CUDA_INSTALL_EXE=cuda_11.6.0_511.23_windows.exe
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment