Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
vision
Commits
0e32a12c
Unverified
Commit
0e32a12c
authored
Feb 22, 2021
by
Eli Uriegas
Committed by
GitHub
Feb 22, 2021
Browse files
.circleci: Downgrade CUDA 11.2 -> 11.1 (#3418)
parent
433283eb
Changes
6
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
214 additions
and
175 deletions
+214
-175
.circleci/config.yml
.circleci/config.yml
+169
-168
.circleci/config.yml.in
.circleci/config.yml.in
+1
-0
.circleci/regenerate.py
.circleci/regenerate.py
+3
-3
packaging/pkg_helpers.bash
packaging/pkg_helpers.bash
+17
-0
packaging/torchvision/meta.yaml
packaging/torchvision/meta.yaml
+2
-4
packaging/windows/internal/cuda_install.bat
packaging/windows/internal/cuda_install.bat
+22
-0
No files found.
.circleci/config.yml
View file @
0e32a12c
This diff is collapsed.
Click to expand it.
.circleci/config.yml.in
View file @
0e32a12c
...
...
@@ -216,6 +216,7 @@ jobs:
- designate_upload_channel
- run:
name: Build conda packages
no_output_timeout: 20m
command: |
set -ex
source packaging/windows/internal/vc_install_helper.sh
...
...
.circleci/regenerate.py
View file @
0e32a12c
...
...
@@ -20,7 +20,6 @@ import os.path
PYTHON_VERSIONS
=
[
"3.6"
,
"3.7"
,
"3.8"
,
"3.9"
]
CUDA_VERSION
=
[
"10.1"
,
"10.2"
,
"11.2"
]
RC_PATTERN
=
r
"/v[0-9]+(\.[0-9]+)*-rc[0-9]+/"
...
...
@@ -30,8 +29,8 @@ def build_workflows(prefix='', filter_branch=None, upload=False, indentation=6,
for
btype
in
[
"wheel"
,
"conda"
]:
for
os_type
in
[
"linux"
,
"macos"
,
"win"
]:
python_versions
=
PYTHON_VERSIONS
cu_versions_dict
=
{
"linux"
:
[
"cpu"
,
"cu101"
,
"cu102"
,
"cu11
2
"
],
"win"
:
[
"cpu"
,
"cu101"
,
"cu102"
,
"cu11
2
"
],
cu_versions_dict
=
{
"linux"
:
[
"cpu"
,
"cu101"
,
"cu102"
,
"cu11
1
"
],
"win"
:
[
"cpu"
,
"cu101"
,
"cu102"
,
"cu11
1
"
],
"macos"
:
[
"cpu"
]}
cu_versions
=
cu_versions_dict
[
os_type
]
for
python_version
in
python_versions
:
...
...
@@ -103,6 +102,7 @@ manylinux_images = {
"cu101"
:
"pytorch/manylinux-cuda101"
,
"cu102"
:
"pytorch/manylinux-cuda102"
,
"cu110"
:
"pytorch/manylinux-cuda110"
,
"cu111"
:
"pytorch/manylinux-cuda111"
,
"cu112"
:
"pytorch/manylinux-cuda112"
,
}
...
...
packaging/pkg_helpers.bash
View file @
0e32a12c
...
...
@@ -60,6 +60,17 @@ setup_cuda() {
# https://github.com/pytorch/pytorch/pull/23408 lands
export
NVCC_FLAGS
=
"-gencode=arch=compute_35,code=sm_35 -gencode=arch=compute_50,code=sm_50 -gencode=arch=compute_60,code=sm_60 -gencode=arch=compute_70,code=sm_70 -gencode=arch=compute_75,code=sm_75 -gencode=arch=compute_80,code=sm_80 -gencode=arch=compute_86,code=sm_86 -gencode=arch=compute_50,code=compute_50"
;;
cu111
)
if
[[
"
$OSTYPE
"
==
"msys"
]]
;
then
export
CUDA_HOME
=
"C:
\\
Program Files
\\
NVIDIA GPU Computing Toolkit
\\
CUDA
\\
v11.1"
else
export
CUDA_HOME
=
/usr/local/cuda-11.1/
fi
export
FORCE_CUDA
=
1
# Hard-coding gencode flags is temporary situation until
# https://github.com/pytorch/pytorch/pull/23408 lands
export
NVCC_FLAGS
=
"-gencode=arch=compute_35,code=sm_35 -gencode=arch=compute_50,code=sm_50 -gencode=arch=compute_60,code=sm_60 -gencode=arch=compute_70,code=sm_70 -gencode=arch=compute_75,code=sm_75 -gencode=arch=compute_80,code=sm_80 -gencode=arch=compute_86,code=sm_86 -gencode=arch=compute_50,code=compute_50"
;;
cu110
)
if
[[
"
$OSTYPE
"
==
"msys"
]]
;
then
export
CUDA_HOME
=
"C:
\\
Program Files
\\
NVIDIA GPU Computing Toolkit
\\
CUDA
\\
v11.0"
...
...
@@ -293,6 +304,9 @@ setup_conda_cudatoolkit_constraint() {
cu112
)
export
CONDA_CUDATOOLKIT_CONSTRAINT
=
"- cudatoolkit >=11.2,<11.3 # [not osx]"
;;
cu111
)
export
CONDA_CUDATOOLKIT_CONSTRAINT
=
"- cudatoolkit >=11.1,<11.2 # [not osx]"
;;
cu110
)
export
CONDA_CUDATOOLKIT_CONSTRAINT
=
"- cudatoolkit >=11.0,<11.1 # [not osx]"
;;
...
...
@@ -331,6 +345,9 @@ setup_conda_cudatoolkit_plain_constraint() {
cu112
)
export
CONDA_CUDATOOLKIT_CONSTRAINT
=
"cudatoolkit=11.2"
;;
cu111
)
export
CONDA_CUDATOOLKIT_CONSTRAINT
=
"cudatoolkit=11.1"
;;
cu102
)
export
CONDA_CUDATOOLKIT_CONSTRAINT
=
"cudatoolkit=10.2"
;;
...
...
packaging/torchvision/meta.yaml
View file @
0e32a12c
...
...
@@ -16,8 +16,7 @@ requirements:
host
:
-
python
-
setuptools
-
numpy >=1.20
# [py>=39]
-
numpy >=1.11
# [py!=39]
-
defaults::numpy >=1.11
{{
environ.get('CONDA_PYTORCH_BUILD_CONSTRAINT')
}}
{{
environ.get('CONDA_CUDATOOLKIT_CONSTRAINT')
}}
{{
environ.get('CONDA_CPUONLY_FEATURE')
}}
...
...
@@ -28,8 +27,7 @@ requirements:
-
ffmpeg >=4.2
# [not win]
-
jpeg <=9b
-
pillow >=4.1.1
-
numpy >=1.20
# [py>=39]
-
numpy >=1.11
# [py!=39]
-
defaults::numpy >=1.11
{{
environ.get('CONDA_PYTORCH_CONSTRAINT')
}}
{{
environ.get('CONDA_CUDATOOLKIT_CONSTRAINT')
}}
...
...
packaging/windows/internal/cuda_install.bat
View file @
0e32a12c
...
...
@@ -19,6 +19,7 @@ if %CUDA_VER% EQU 100 goto cuda100
if
%CUDA_VER%
EQU
101
goto
cuda101
if
%CUDA_VER%
EQU
102
goto
cuda102
if
%CUDA_VER%
EQU
110
goto
cuda110
if
%CUDA_VER%
EQU
111
goto
cuda111
if
%CUDA_VER%
EQU
112
goto
cuda112
echo
CUDA
%CUDA_VERSION_STR%
is
not
supported
...
...
@@ -108,6 +109,27 @@ if not exist "%SRC_DIR%\temp_build\cudnn-11.0-windows-x64-v8.0.4.30.zip" (
goto
cuda_common
:cuda
111
if
not
exist
"
%SRC_DIR%
\temp_build\cuda_11.1.0_456.43_win10.exe"
(
curl
-k -L
https
://ossci
-windows
.s3.amazonaws.com/cuda_11.1.0_456.43_win10.exe
--output
"
%SRC_DIR%
\temp_build\cuda_11.1.0_456.43_win10.exe"
if
errorlevel
1
exit
/b
1
set
"CUDA_SETUP_FILE=
%SRC_DIR%
\temp_build\cuda_11.1.0_456.43_win10.exe"
set
"ARGS=nvcc_11.1 cuobjdump_11.1 nvprune_11.1 nvprof_11.1 cupti_11.1 cublas_11.1 cublas_dev_11.1 cudart_11.1 cufft_11.1 cufft_dev_11.1 curand_11.1 curand_dev_11.1 cusolver_11.1 cusolver_dev_11.1 cusparse_11.1 cusparse_dev_11.1 npp_11.1 npp_dev_11.1 nvrtc_11.1 nvrtc_dev_11.1 nvml_dev_11.1"
)
@REM There is no downloadable driver for Tesla on CUDA 11.1 yet. We will use
@REM the driver inside CUDA
if
"
%JOB_EXECUTOR%
"
==
"windows-with-nvidia-gpu"
set
"ARGS=
%ARGS%
Display.Driver"
if
not
exist
"
%SRC_DIR%
\temp_build\cudnn-11.1-windows-x64-v8.0.5.39.zip"
(
curl
-k -L
https
://ossci
-windows
.s3.amazonaws.com/cudnn
-
11
.1
-windows-x
64
-v
8
.0.5.39.zip
--output
"
%SRC_DIR%
\temp_build\cudnn-11.1-windows-x64-v8.0.5.39.zip"
if
errorlevel
1
exit
/b
1
set
"CUDNN_SETUP_FILE=
%SRC_DIR%
\temp_build\cudnn-11.1-windows-x64-v8.0.5.39.zip"
)
goto
cuda_common
:cuda
112
if
not
exist
"
%SRC_DIR%
\temp_build\cuda_11.2.0_460.89_win10.exe"
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment