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
651b97e2
"vscode:/vscode.git/clone" did not exist on "baae8fb90db1d04b4e4ce9d00a50696d5efbe060"
Unverified
Commit
651b97e2
authored
May 09, 2022
by
Andrey Talman
Committed by
GitHub
May 09, 2022
Browse files
Cleanup removing old cu115 code (#5978)
parent
1ae38297
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
42 deletions
+1
-42
packaging/build_conda.sh
packaging/build_conda.sh
+1
-1
packaging/pkg_helpers.bash
packaging/pkg_helpers.bash
+0
-14
packaging/windows/internal/cuda_install.bat
packaging/windows/internal/cuda_install.bat
+0
-27
No files found.
packaging/build_conda.sh
View file @
651b97e2
...
@@ -14,7 +14,7 @@ setup_junit_results_folder
...
@@ -14,7 +14,7 @@ setup_junit_results_folder
# nvidia channel included for cudatoolkit >= 11 however for 11.5 and 11.6 we use conda-forge
# nvidia channel included for cudatoolkit >= 11 however for 11.5 and 11.6 we use conda-forge
export
CUDATOOLKIT_CHANNEL
=
"nvidia"
export
CUDATOOLKIT_CHANNEL
=
"nvidia"
if
[[
"
$CU_VERSION
"
==
cu115
||
"
$CU_VERSION
"
==
cu116
]]
;
then
if
[[
"
$CU_VERSION
"
==
cu116
]]
;
then
export
CUDATOOLKIT_CHANNEL
=
"conda-forge"
export
CUDATOOLKIT_CHANNEL
=
"conda-forge"
fi
fi
...
...
packaging/pkg_helpers.bash
View file @
651b97e2
...
@@ -54,14 +54,6 @@ setup_cuda() {
...
@@ -54,14 +54,6 @@ 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"
;;
;;
cu115
)
if
[[
"
$OSTYPE
"
==
"msys"
]]
;
then
export
CUDA_HOME
=
"C:
\\
Program Files
\\
NVIDIA GPU Computing Toolkit
\\
CUDA
\\
v11.5"
else
export
CUDA_HOME
=
/usr/local/cuda-11.5/
fi
export
TORCH_CUDA_ARCH_LIST
=
"3.5;5.0+PTX;6.0;7.0;7.5;8.0;8.6"
;;
cu113
)
cu113
)
if
[[
"
$OSTYPE
"
==
"msys"
]]
;
then
if
[[
"
$OSTYPE
"
==
"msys"
]]
;
then
export
CUDA_HOME
=
"C:
\\
Program Files
\\
NVIDIA GPU Computing Toolkit
\\
CUDA
\\
v11.3"
export
CUDA_HOME
=
"C:
\\
Program Files
\\
NVIDIA GPU Computing Toolkit
\\
CUDA
\\
v11.3"
...
@@ -252,9 +244,6 @@ setup_conda_cudatoolkit_constraint() {
...
@@ -252,9 +244,6 @@ setup_conda_cudatoolkit_constraint() {
cu116
)
cu116
)
export
CONDA_CUDATOOLKIT_CONSTRAINT
=
"- cudatoolkit >=11.6,<11.7 # [not osx]"
export
CONDA_CUDATOOLKIT_CONSTRAINT
=
"- cudatoolkit >=11.6,<11.7 # [not osx]"
;;
;;
cu115
)
export
CONDA_CUDATOOLKIT_CONSTRAINT
=
"- cudatoolkit >=11.5,<11.6 # [not osx]"
;;
cu113
)
cu113
)
export
CONDA_CUDATOOLKIT_CONSTRAINT
=
"- cudatoolkit >=11.3,<11.4 # [not osx]"
export
CONDA_CUDATOOLKIT_CONSTRAINT
=
"- cudatoolkit >=11.3,<11.4 # [not osx]"
;;
;;
...
@@ -284,9 +273,6 @@ setup_conda_cudatoolkit_plain_constraint() {
...
@@ -284,9 +273,6 @@ setup_conda_cudatoolkit_plain_constraint() {
cu116
)
cu116
)
export
CONDA_CUDATOOLKIT_CONSTRAINT
=
"cudatoolkit=11.6"
export
CONDA_CUDATOOLKIT_CONSTRAINT
=
"cudatoolkit=11.6"
;;
;;
cu115
)
export
CONDA_CUDATOOLKIT_CONSTRAINT
=
"cudatoolkit=11.5"
;;
cu113
)
cu113
)
export
CONDA_CUDATOOLKIT_CONSTRAINT
=
"cudatoolkit=11.3"
export
CONDA_CUDATOOLKIT_CONSTRAINT
=
"cudatoolkit=11.3"
;;
;;
...
...
packaging/windows/internal/cuda_install.bat
View file @
651b97e2
...
@@ -25,7 +25,6 @@ set CUDNN_LIB_FOLDER="lib\x64"
...
@@ -25,7 +25,6 @@ set CUDNN_LIB_FOLDER="lib\x64"
if
%CUDA_VER%
EQU
102
goto
cuda102
if
%CUDA_VER%
EQU
102
goto
cuda102
if
%CUDA_VER%
EQU
113
goto
cuda113
if
%CUDA_VER%
EQU
113
goto
cuda113
if
%CUDA_VER%
EQU
115
goto
cuda115
if
%CUDA_VER%
EQU
116
goto
cuda116
if
%CUDA_VER%
EQU
116
goto
cuda116
echo
CUDA
%CUDA_VERSION_STR%
is
not
supported
echo
CUDA
%CUDA_VERSION_STR%
is
not
supported
...
@@ -84,32 +83,6 @@ if not exist "%SRC_DIR%\temp_build\%CUDNN_INSTALL_ZIP%" (
...
@@ -84,32 +83,6 @@ if not exist "%SRC_DIR%\temp_build\%CUDNN_INSTALL_ZIP%" (
goto
cuda_common
goto
cuda_common
:cuda
115
set
CUDA_INSTALL_EXE
=
cuda_11
.5.0_496.13_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.5 nvcc_11.5 cuobjdump_11.5 nvprune_11.5 nvprof_11.5 cupti_11.5 cublas_11.5 cublas_dev_11.5 cudart_11.5 cufft_11.5 cufft_dev_11.5 curand_11.5 curand_dev_11.5 cusolver_11.5 cusolver_dev_11.5 cusparse_11.5 cusparse_dev_11.5 npp_11.5 npp_dev_11.5 nvrtc_11.5 nvrtc_dev_11.5 nvml_dev_11.5"
)
set
CUDNN_INSTALL_ZIP
=
cudnn
-windows-x
86
_64
-
8
.3.2.44_cuda11.5
-archive
.zip
set
CUDNN_FOLDER
=
cudnn
-windows-x
86
_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"
7
z
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
116
:cuda
116
set
CUDA_INSTALL_EXE
=
cuda_11
.6.0_511.23_windows.exe
set
CUDA_INSTALL_EXE
=
cuda_11
.6.0_511.23_windows.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