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
fbc8ea47
Unverified
Commit
fbc8ea47
authored
Mar 21, 2022
by
Nikita Shulga
Committed by
GitHub
Mar 21, 2022
Browse files
Prefer nvidia channel for conda builds (#5648)
To mitigate missing `libcupti.so` dependency
parent
90dace8d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
.circleci/unittest/linux/scripts/install.sh
.circleci/unittest/linux/scripts/install.sh
+2
-2
packaging/build_cmake.sh
packaging/build_cmake.sh
+1
-1
packaging/build_conda.sh
packaging/build_conda.sh
+1
-1
No files found.
.circleci/unittest/linux/scripts/install.sh
View file @
fbc8ea47
...
...
@@ -21,7 +21,7 @@ else
fi
echo
"Using CUDA
$CUDA_VERSION
as determined by CU_VERSION"
version
=
"
$(
python
-c
"print('.'.join(
\"
${
CUDA_VERSION
}
\"
.split('.')[:2]))"
)
"
cudatoolkit
=
"cudatoolkit=
${
version
}
"
cudatoolkit
=
"
nvidia::
cudatoolkit=
${
version
}
"
fi
case
"
$(
uname
-s
)
"
in
...
...
@@ -33,7 +33,7 @@ printf "Installing PyTorch with %s\n" "${cudatoolkit}"
if
[
"
${
os
}
"
==
"MacOSX"
]
;
then
conda
install
-y
-c
"pytorch-
${
UPLOAD_CHANNEL
}
"
"pytorch-
${
UPLOAD_CHANNEL
}
"
::pytorch
"
${
cudatoolkit
}
"
pytest
else
conda
install
-y
-c
"pytorch-
${
UPLOAD_CHANNEL
}
"
"pytorch-
${
UPLOAD_CHANNEL
}
"
::pytorch[build
=
"*
${
version
}
*"
]
"
${
cudatoolkit
}
"
pytest
conda
install
-y
-c
"pytorch-
${
UPLOAD_CHANNEL
}
"
-c
nvidia
"pytorch-
${
UPLOAD_CHANNEL
}
"
::pytorch[build
=
"*
${
version
}
*"
]
"
${
cudatoolkit
}
"
pytest
fi
printf
"* Installing torchvision
\n
"
...
...
packaging/build_cmake.sh
View file @
fbc8ea47
...
...
@@ -42,7 +42,7 @@ else
PYTORCH_MUTEX_CONSTRAINT
=
''
fi
conda
install
-yq
\p
ytorch
=
$PYTORCH_VERSION
$CONDA_CUDATOOLKIT_CONSTRAINT
$PYTORCH_MUTEX_CONSTRAINT
$MKL_CONSTRAINT
numpy
-c
"pytorch-
${
UPLOAD_CHANNEL
}
"
conda
install
-yq
\p
ytorch
=
$PYTORCH_VERSION
$CONDA_CUDATOOLKIT_CONSTRAINT
$PYTORCH_MUTEX_CONSTRAINT
$MKL_CONSTRAINT
numpy
-c
nvidia
-c
"pytorch-
${
UPLOAD_CHANNEL
}
"
TORCH_PATH
=
$(
dirname
$(
python
-c
"import torch; print(torch.__file__)"
))
if
[[
"
$(
uname
)
"
==
Darwin
||
"
$OSTYPE
"
==
"msys"
]]
;
then
...
...
packaging/build_conda.sh
View file @
fbc8ea47
...
...
@@ -18,4 +18,4 @@ if [[ "$CU_VERSION" == cu115 ]]; then
export
CUDATOOLKIT_CHANNEL
=
"conda-forge"
fi
conda build
-c
defaults
-c
$CUDATOOLKIT_CHANNEL
$CONDA_CHANNEL_FLAGS
--no-anaconda-upload
--python
"
$PYTHON_VERSION
"
packaging/torchvision
conda build
-c
$CUDATOOLKIT_CHANNEL
-c
defaults
$CONDA_CHANNEL_FLAGS
--no-anaconda-upload
--python
"
$PYTHON_VERSION
"
packaging/torchvision
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