Skip to content

GitLab

Unverified Commit 2fb9c49c authored by Andrey Talman's avatar Andrey Talman Committed by GitHub
Browse files

Update to cuda 118 (#7058) 

add to python script

Add cuda118

Add cuda 11.8 constrain
parent 46b7e271
Hide whitespace changes
Inline Side-by-side
Showing with 289 additions and 2 deletions
.circleci/config.yml
View file @ 2fb9c49c
......@@ -1120,6 +1120,12 @@ workflows:
name: binary_linux_wheel_py3.7_cu117
python_version: '3.7'
wheel_docker_image: pytorch/manylinux-cuda117
- binary_linux_wheel:
conda_docker_image: pytorch/conda-builder:cuda118
cu_version: cu118
name: binary_linux_wheel_py3.7_cu118
python_version: '3.7'
wheel_docker_image: pytorch/manylinux-cuda118
- binary_linux_wheel:
cu_version: rocm5.2
name: binary_linux_wheel_py3.7_rocm5.2
......@@ -1157,6 +1163,15 @@ workflows:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_wheel_py3.7_cu117
python_version: '3.7'
- binary_win_wheel:
cu_version: cu118
filters:
branches:
only: main
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_wheel_py3.7_cu118
python_version: '3.7'
- binary_win_wheel:
cu_version: cpu
filters:
......@@ -1184,6 +1199,15 @@ workflows:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_wheel_py3.8_cu117
python_version: '3.8'
- binary_win_wheel:
cu_version: cu118
filters:
branches:
only: main
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_wheel_py3.8_cu118
python_version: '3.8'
- binary_win_wheel:
cu_version: cpu
filters:
......@@ -1211,6 +1235,15 @@ workflows:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_wheel_py3.9_cu117
python_version: '3.9'
- binary_win_wheel:
cu_version: cu118
filters:
branches:
only: main
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_wheel_py3.9_cu118
python_version: '3.9'
- binary_win_wheel:
cu_version: cpu
name: binary_win_wheel_py3.10_cpu
......@@ -1226,8 +1259,17 @@ workflows:
python_version: '3.10'
- binary_win_wheel:
cu_version: cu117
filters:
branches:
only: main
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_wheel_py3.10_cu117
python_version: '3.10'
- binary_win_wheel:
cu_version: cu118
name: binary_win_wheel_py3.10_cu118
python_version: '3.10'
- binary_win_conda:
cu_version: cpu
filters:
......@@ -1255,6 +1297,15 @@ workflows:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_conda_py3.7_cu117
python_version: '3.7'
- binary_win_conda:
cu_version: cu118
filters:
branches:
only: main
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_conda_py3.7_cu118
python_version: '3.7'
- binary_win_conda:
cu_version: cpu
filters:
......@@ -1282,6 +1333,15 @@ workflows:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_conda_py3.8_cu117
python_version: '3.8'
- binary_win_conda:
cu_version: cu118
filters:
branches:
only: main
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_conda_py3.8_cu118
python_version: '3.8'
- binary_win_conda:
cu_version: cpu
filters:
......@@ -1309,6 +1369,15 @@ workflows:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_conda_py3.9_cu117
python_version: '3.9'
- binary_win_conda:
cu_version: cu118
filters:
branches:
only: main
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_conda_py3.9_cu118
python_version: '3.9'
- binary_win_conda:
cu_version: cpu
name: binary_win_conda_py3.10_cpu
......@@ -1324,8 +1393,17 @@ workflows:
python_version: '3.10'
- binary_win_conda:
cu_version: cu117
filters:
branches:
only: main
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: binary_win_conda_py3.10_cu117
python_version: '3.10'
- binary_win_conda:
cu_version: cu118
name: binary_win_conda_py3.10_cu118
python_version: '3.10'
- build_docs:
filters:
branches:
......@@ -1558,6 +1636,17 @@ workflows:
name: nightly_binary_linux_wheel_py3.7_cu117
python_version: '3.7'
wheel_docker_image: pytorch/manylinux-cuda117
- binary_linux_wheel:
conda_docker_image: pytorch/conda-builder:cuda118
cu_version: cu118
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_linux_wheel_py3.7_cu118
python_version: '3.7'
wheel_docker_image: pytorch/manylinux-cuda118
- binary_linux_wheel:
cu_version: rocm5.2
filters:
......@@ -1638,6 +1727,26 @@ workflows:
requires:
- nightly_binary_win_wheel_py3.7_cu117
subfolder: cu117/
- binary_win_wheel:
cu_version: cu118
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_win_wheel_py3.7_cu118
python_version: '3.7'
- binary_wheel_upload:
context: org-member
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_win_wheel_py3.7_cu118_upload
requires:
- nightly_binary_win_wheel_py3.7_cu118
subfolder: cu118/
- binary_win_wheel:
cu_version: cpu
filters:
......@@ -1698,6 +1807,26 @@ workflows:
requires:
- nightly_binary_win_wheel_py3.8_cu117
subfolder: cu117/
- binary_win_wheel:
cu_version: cu118
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_win_wheel_py3.8_cu118
python_version: '3.8'
- binary_wheel_upload:
context: org-member
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_win_wheel_py3.8_cu118_upload
requires:
- nightly_binary_win_wheel_py3.8_cu118
subfolder: cu118/
- binary_win_wheel:
cu_version: cpu
filters:
......@@ -1758,6 +1887,26 @@ workflows:
requires:
- nightly_binary_win_wheel_py3.9_cu117
subfolder: cu117/
- binary_win_wheel:
cu_version: cu118
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_win_wheel_py3.9_cu118
python_version: '3.9'
- binary_wheel_upload:
context: org-member
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_win_wheel_py3.9_cu118_upload
requires:
- nightly_binary_win_wheel_py3.9_cu118
subfolder: cu118/
- binary_win_wheel:
cu_version: cpu
filters:
......@@ -1818,6 +1967,26 @@ workflows:
requires:
- nightly_binary_win_wheel_py3.10_cu117
subfolder: cu117/
- binary_win_wheel:
cu_version: cu118
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_win_wheel_py3.10_cu118
python_version: '3.10'
- binary_wheel_upload:
context: org-member
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_win_wheel_py3.10_cu118_upload
requires:
- nightly_binary_win_wheel_py3.10_cu118
subfolder: cu118/
- binary_win_conda:
cu_version: cpu
filters:
......@@ -1875,6 +2044,25 @@ workflows:
name: nightly_binary_win_conda_py3.7_cu117_upload
requires:
- nightly_binary_win_conda_py3.7_cu117
- binary_win_conda:
cu_version: cu118
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_win_conda_py3.7_cu118
python_version: '3.7'
- binary_conda_upload:
context: org-member
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_win_conda_py3.7_cu118_upload
requires:
- nightly_binary_win_conda_py3.7_cu118
- binary_win_conda:
cu_version: cpu
filters:
......@@ -1932,6 +2120,25 @@ workflows:
name: nightly_binary_win_conda_py3.8_cu117_upload
requires:
- nightly_binary_win_conda_py3.8_cu117
- binary_win_conda:
cu_version: cu118
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_win_conda_py3.8_cu118
python_version: '3.8'
- binary_conda_upload:
context: org-member
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_win_conda_py3.8_cu118_upload
requires:
- nightly_binary_win_conda_py3.8_cu118
- binary_win_conda:
cu_version: cpu
filters:
......@@ -1989,6 +2196,25 @@ workflows:
name: nightly_binary_win_conda_py3.9_cu117_upload
requires:
- nightly_binary_win_conda_py3.9_cu117
- binary_win_conda:
cu_version: cu118
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_win_conda_py3.9_cu118
python_version: '3.9'
- binary_conda_upload:
context: org-member
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_win_conda_py3.9_cu118_upload
requires:
- nightly_binary_win_conda_py3.9_cu118
- binary_win_conda:
cu_version: cpu
filters:
......@@ -2046,6 +2272,25 @@ workflows:
name: nightly_binary_win_conda_py3.10_cu117_upload
requires:
- nightly_binary_win_conda_py3.10_cu117
- binary_win_conda:
cu_version: cu118
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_win_conda_py3.10_cu118
python_version: '3.10'
- binary_conda_upload:
context: org-member
filters:
branches:
only: nightly
tags:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: nightly_binary_win_conda_py3.10_cu118_upload
requires:
- nightly_binary_win_conda_py3.10_cu118
docker_build:
triggers:
- schedule:
......
.circleci/regenerate.py
View file @ 2fb9c49c
......@@ -32,8 +32,8 @@ def build_workflows(prefix="", filter_branch=None, upload=False, indentation=6,
for os_type in ["linux", "macos", "win"]:
python_versions = PYTHON_VERSIONS
cu_versions_dict = {
"linux": ["cpu", "cu116", "cu117", "rocm5.2", "rocm5.3"],
"win": ["cpu", "cu116", "cu117"],
"linux": ["cpu", "cu116", "cu117", "cu118", "rocm5.2", "rocm5.3"],
"win": ["cpu", "cu116", "cu117", "cu118"],
"macos": ["cpu"],
}
cu_versions = cu_versions_dict[os_type]
......@@ -145,6 +145,7 @@ def upload_doc_job(filter_branch):
manylinux_images = {
"cu116": "pytorch/manylinux-cuda116",
"cu117": "pytorch/manylinux-cuda117",
"cu118": "pytorch/manylinux-cuda118",
}
......
packaging/pkg_helpers.bash
View file @ 2fb9c49c
......@@ -46,6 +46,14 @@ setup_cuda() {
# Now work out the CUDA settings
case "$CU_VERSION" in
cu118)
if [[ "$OSTYPE" == "msys" ]]; then
export CUDA_HOME="C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v11.8"
else
export CUDA_HOME=/usr/local/cuda-11.8/
fi
export TORCH_CUDA_ARCH_LIST="3.5;5.0+PTX;6.0;7.0;7.5;8.0;8.6"
;;
cu117)
if [[ "$OSTYPE" == "msys" ]]; then
export CUDA_HOME="C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v11.7"
......@@ -253,6 +261,9 @@ setup_conda_cudatoolkit_constraint() {
export CONDA_BUILD_VARIANT="cpu"
else
case "$CU_VERSION" in
cu118)
export CONDA_CUDATOOLKIT_CONSTRAINT="- pytorch-cuda=11.8 # [not osx]"
;;
cu117)
export CONDA_CUDATOOLKIT_CONSTRAINT="- pytorch-cuda=11.7 # [not osx]"
;;
......@@ -279,6 +290,9 @@ setup_conda_cudatoolkit_plain_constraint() {
export CMAKE_USE_CUDA=0
else
case "$CU_VERSION" in
cu118)
export CONDA_CUDATOOLKIT_CONSTRAINT="pytorch-cuda=11.8"
;;
cu117)
export CONDA_CUDATOOLKIT_CONSTRAINT="pytorch-cuda=11.7"
;;
......
packaging/windows/internal/cuda_install.bat
View file @ 2fb9c49c
......@@ -25,6 +25,7 @@ set CUDNN_LIB_FOLDER="lib\x64"
if %CUDA_VER% EQU 116 goto cuda116
if %CUDA_VER% EQU 117 goto cuda117
if %CUDA_VER% EQU 118 goto cuda118
echo CUDA %CUDA_VERSION_STR% is not supported
exit /b 1
......@@ -81,6 +82,32 @@ if not exist "%SRC_DIR%\temp_build\%CUDNN_INSTALL_ZIP%" (
goto cuda_common
:cuda118
set CUDA_INSTALL_EXE=cuda_11.8.0_522.06_windows.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=cuda_profiler_api_11.8 thrust_11.8 nvcc_11.8 cuobjdump_11.8 nvprune_11.8 nvprof_11.8 cupti_11.8 cublas_11.8 cublas_dev_11.8 cudart_11.8 cufft_11.8 cufft_dev_11.8 curand_11.8 curand_dev_11.8 cusolver_11.8 cusolver_dev_11.8 cusparse_11.8 cusparse_dev_11.8 npp_11.8 npp_dev_11.8 nvrtc_11.8 nvrtc_dev_11.8 nvml_dev_11.8"
)
set CUDNN_INSTALL_ZIP=cudnn-windows-x86_64-8.5.0.96_cuda11-archive.zip
set CUDNN_FOLDER=cudnn-windows-x86_64-8.5.0.96_cuda11-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
:cuda_common
if not exist "%SRC_DIR%\temp_build\NvToolsExt.7z" (
......
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