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
d391a0e9
You need to sign in or sign up before continuing.
Unverified
Commit
d391a0e9
authored
Jun 21, 2021
by
Eli Uriegas
Committed by
GitHub
Jun 21, 2021
Browse files
ci: Remove mentions of conda-forge (#4082)
parent
11480973
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
18 additions
and
38 deletions
+18
-38
.circleci/config.yml
.circleci/config.yml
+5
-10
.circleci/config.yml.in
.circleci/config.yml.in
+5
-10
.circleci/unittest/linux/scripts/environment.yml
.circleci/unittest/linux/scripts/environment.yml
+0
-2
.circleci/unittest/linux/scripts/install.sh
.circleci/unittest/linux/scripts/install.sh
+1
-1
.circleci/unittest/windows/scripts/environment.yml
.circleci/unittest/windows/scripts/environment.yml
+0
-2
.circleci/unittest/windows/scripts/install.sh
.circleci/unittest/windows/scripts/install.sh
+1
-1
CONTRIBUTING.md
CONTRIBUTING.md
+1
-1
packaging/build_conda.sh
packaging/build_conda.sh
+2
-1
packaging/pkg_helpers.bash
packaging/pkg_helpers.bash
+3
-9
packaging/torchvision/meta.yaml
packaging/torchvision/meta.yaml
+0
-1
No files found.
.circleci/config.yml
View file @
d391a0e9
...
@@ -311,6 +311,10 @@ jobs:
...
@@ -311,6 +311,10 @@ jobs:
eval "$('/C/tools/miniconda3/Scripts/conda.exe' 'shell.bash' 'hook')"
eval "$('/C/tools/miniconda3/Scripts/conda.exe' 'shell.bash' 'hook')"
conda activate base
conda activate base
conda install -yq conda-build "conda-package-handling!=1.5.0"
conda install -yq conda-build "conda-package-handling!=1.5.0"
# cudatoolkit >= 11 isn't available for windows in the nvidia channel
if [[ "${CU_VERSION}" =~ cu11.* ]]; then
export CONDA_CHANNEL_FLAGS="-c conda-forge"
fi
packaging/build_conda.sh
packaging/build_conda.sh
rm /C/tools/miniconda3/conda-bld/win-64/vs${VC_YEAR}*.tar.bz2
rm /C/tools/miniconda3/conda-bld/win-64/vs${VC_YEAR}*.tar.bz2
-
store_artifacts
:
-
store_artifacts
:
...
@@ -577,11 +581,7 @@ jobs:
...
@@ -577,11 +581,7 @@ jobs:
set -x
set -x
eval "$('/C/tools/miniconda3/Scripts/conda.exe' 'shell.bash' 'hook')"
eval "$('/C/tools/miniconda3/Scripts/conda.exe' 'shell.bash' 'hook')"
conda env remove -n python${PYTHON_VERSION} || true
conda env remove -n python${PYTHON_VERSION} || true
CONDA_CHANNEL_FLAGS=""
conda create -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
if [[ "${PYTHON_VERSION}" = 3.9 ]]; then
CONDA_CHANNEL_FLAGS="-c=conda-forge"
fi
conda create ${CONDA_CHANNEL_FLAGS} -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
conda activate python${PYTHON_VERSION}
conda activate python${PYTHON_VERSION}
conda install Pillow>=5.3.0
conda install Pillow>=5.3.0
conda install -v -y -c pytorch-nightly pytorch
conda install -v -y -c pytorch-nightly pytorch
...
@@ -606,11 +606,6 @@ jobs:
...
@@ -606,11 +606,6 @@ jobs:
command
:
|
command
:
|
set -x
set -x
eval "$('/C/tools/miniconda3/Scripts/conda.exe' 'shell.bash' 'hook')"
eval "$('/C/tools/miniconda3/Scripts/conda.exe' 'shell.bash' 'hook')"
CONDA_CHANNEL_FLAGS=""
if [[ "${PYTHON_VERSION}" = 3.9 ]]; then
CONDA_CHANNEL_FLAGS="-c=conda-forge"
fi
conda create ${CONDA_CHANNEL_FLAGS} -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
conda create -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
conda create -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
conda activate python${PYTHON_VERSION}
conda activate python${PYTHON_VERSION}
pip install $(ls ~/workspace/torchvision*.whl) --pre -f https://download.pytorch.org/whl/nightly/torch_nightly.html
pip install $(ls ~/workspace/torchvision*.whl) --pre -f https://download.pytorch.org/whl/nightly/torch_nightly.html
...
...
.circleci/config.yml.in
View file @
d391a0e9
...
@@ -311,6 +311,10 @@ jobs:
...
@@ -311,6 +311,10 @@ jobs:
eval "$('/C/tools/miniconda3/Scripts/conda.exe' 'shell.bash' 'hook')"
eval "$('/C/tools/miniconda3/Scripts/conda.exe' 'shell.bash' 'hook')"
conda activate base
conda activate base
conda install -yq conda-build "conda-package-handling!=1.5.0"
conda install -yq conda-build "conda-package-handling!=1.5.0"
# cudatoolkit >= 11 isn't available for windows in the nvidia channel
if [[ "${CU_VERSION}" =~ cu11.* ]]; then
export CONDA_CHANNEL_FLAGS="-c conda-forge"
fi
packaging/build_conda.sh
packaging/build_conda.sh
rm /C/tools/miniconda3/conda-bld/win-64/vs${VC_YEAR}*.tar.bz2
rm /C/tools/miniconda3/conda-bld/win-64/vs${VC_YEAR}*.tar.bz2
- store_artifacts:
- store_artifacts:
...
@@ -577,11 +581,7 @@ jobs:
...
@@ -577,11 +581,7 @@ jobs:
set -x
set -x
eval "$('/C/tools/miniconda3/Scripts/conda.exe' 'shell.bash' 'hook')"
eval "$('/C/tools/miniconda3/Scripts/conda.exe' 'shell.bash' 'hook')"
conda env remove -n python${PYTHON_VERSION} || true
conda env remove -n python${PYTHON_VERSION} || true
CONDA_CHANNEL_FLAGS=""
conda create -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
if [[ "${PYTHON_VERSION}" = 3.9 ]]; then
CONDA_CHANNEL_FLAGS="-c=conda-forge"
fi
conda create ${CONDA_CHANNEL_FLAGS} -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
conda activate python${PYTHON_VERSION}
conda activate python${PYTHON_VERSION}
conda install Pillow>=5.3.0
conda install Pillow>=5.3.0
conda install -v -y -c pytorch-nightly pytorch
conda install -v -y -c pytorch-nightly pytorch
...
@@ -606,11 +606,6 @@ jobs:
...
@@ -606,11 +606,6 @@ jobs:
command: |
command: |
set -x
set -x
eval "$('/C/tools/miniconda3/Scripts/conda.exe' 'shell.bash' 'hook')"
eval "$('/C/tools/miniconda3/Scripts/conda.exe' 'shell.bash' 'hook')"
CONDA_CHANNEL_FLAGS=""
if [[ "${PYTHON_VERSION}" = 3.9 ]]; then
CONDA_CHANNEL_FLAGS="-c=conda-forge"
fi
conda create ${CONDA_CHANNEL_FLAGS} -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
conda create -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
conda create -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
conda activate python${PYTHON_VERSION}
conda activate python${PYTHON_VERSION}
pip install $(ls ~/workspace/torchvision*.whl) --pre -f https://download.pytorch.org/whl/nightly/torch_nightly.html
pip install $(ls ~/workspace/torchvision*.whl) --pre -f https://download.pytorch.org/whl/nightly/torch_nightly.html
...
...
.circleci/unittest/linux/scripts/environment.yml
View file @
d391a0e9
channels
:
channels
:
-
pytorch
-
pytorch
-
defaults
-
defaults
# using conda-forge for python v3.9
-
conda-forge
dependencies
:
dependencies
:
-
pytest
-
pytest
-
pytest-cov
-
pytest-cov
...
...
.circleci/unittest/linux/scripts/install.sh
View file @
d391a0e9
...
@@ -24,7 +24,7 @@ else
...
@@ -24,7 +24,7 @@ else
fi
fi
printf
"Installing PyTorch with %s
\n
"
"
${
cudatoolkit
}
"
printf
"Installing PyTorch with %s
\n
"
"
${
cudatoolkit
}
"
conda
install
-y
-c
"pytorch-
${
UPLOAD_CHANNEL
}
"
-c
conda-forge
"pytorch-
${
UPLOAD_CHANNEL
}
"
::pytorch
"
${
cudatoolkit
}
"
pytest
conda
install
-y
-c
"pytorch-
${
UPLOAD_CHANNEL
}
"
"pytorch-
${
UPLOAD_CHANNEL
}
"
::pytorch
"
${
cudatoolkit
}
"
pytest
if
[
$PYTHON_VERSION
==
"3.6"
]
;
then
if
[
$PYTHON_VERSION
==
"3.6"
]
;
then
printf
"Installing minimal PILLOW version
\n
"
printf
"Installing minimal PILLOW version
\n
"
...
...
.circleci/unittest/windows/scripts/environment.yml
View file @
d391a0e9
channels
:
channels
:
-
pytorch
-
pytorch
-
defaults
-
defaults
# use conda-forge for python v3.9+
-
conda-forge
dependencies
:
dependencies
:
-
pytest
-
pytest
-
pytest-cov
-
pytest-cov
...
...
.circleci/unittest/windows/scripts/install.sh
View file @
d391a0e9
...
@@ -26,7 +26,7 @@ else
...
@@ -26,7 +26,7 @@ else
fi
fi
printf
"Installing PyTorch with %s
\n
"
"
${
cudatoolkit
}
"
printf
"Installing PyTorch with %s
\n
"
"
${
cudatoolkit
}
"
conda
install
-y
-c
"pytorch-
${
UPLOAD_CHANNEL
}
"
-c
conda-forge
"pytorch-
${
UPLOAD_CHANNEL
}
"
::pytorch
"
${
cudatoolkit
}
"
pytest
conda
install
-y
-c
"pytorch-
${
UPLOAD_CHANNEL
}
"
"pytorch-
${
UPLOAD_CHANNEL
}
"
::pytorch
"
${
cudatoolkit
}
"
pytest
if
[
$PYTHON_VERSION
==
"3.6"
]
;
then
if
[
$PYTHON_VERSION
==
"3.6"
]
;
then
printf
"Installing minimal PILLOW version
\n
"
printf
"Installing minimal PILLOW version
\n
"
...
...
CONTRIBUTING.md
View file @
d391a0e9
...
@@ -33,7 +33,7 @@ clear and has sufficient instructions to be able to reproduce the issue.
...
@@ -33,7 +33,7 @@ clear and has sufficient instructions to be able to reproduce the issue.
### Install PyTorch Nightly
### Install PyTorch Nightly
```
bash
```
bash
conda
install
pytorch
-c
pytorch-nightly
-c
conda-forge
conda
install
pytorch
-c
pytorch-nightly
# or with pip (see https://pytorch.org/get-started/locally/)
# or with pip (see https://pytorch.org/get-started/locally/)
# pip install numpy
# pip install numpy
# pip install --pre torch -f https://download.pytorch.org/whl/nightly/cu102/torch_nightly.html
# pip install --pre torch -f https://download.pytorch.org/whl/nightly/cu102/torch_nightly.html
...
...
packaging/build_conda.sh
View file @
d391a0e9
...
@@ -11,4 +11,5 @@ setup_conda_pytorch_constraint
...
@@ -11,4 +11,5 @@ setup_conda_pytorch_constraint
setup_conda_cudatoolkit_constraint
setup_conda_cudatoolkit_constraint
setup_visual_studio_constraint
setup_visual_studio_constraint
setup_junit_results_folder
setup_junit_results_folder
conda build
$CONDA_CHANNEL_FLAGS
-c
defaults
-c
conda-forge
--no-anaconda-upload
--python
"
$PYTHON_VERSION
"
packaging/torchvision
# nvidia channel included for cudatoolkit >= 11
conda build
-c
defaults
-c
nvidia
$CONDA_CHANNEL_FLAGS
--no-anaconda-upload
--python
"
$PYTHON_VERSION
"
packaging/torchvision
packaging/pkg_helpers.bash
View file @
d391a0e9
...
@@ -180,13 +180,10 @@ setup_wheel_python() {
...
@@ -180,13 +180,10 @@ setup_wheel_python() {
if
[[
"
$(
uname
)
"
==
Darwin
||
"
$OSTYPE
"
==
"msys"
]]
;
then
if
[[
"
$(
uname
)
"
==
Darwin
||
"
$OSTYPE
"
==
"msys"
]]
;
then
eval
"
$(
conda shell.bash hook
)
"
eval
"
$(
conda shell.bash hook
)
"
conda
env
remove
-n
"env
$PYTHON_VERSION
"
||
true
conda
env
remove
-n
"env
$PYTHON_VERSION
"
||
true
if
[[
"
$PYTHON_VERSION
"
==
3.9
]]
;
then
export
CONDA_CHANNEL_FLAGS
=
"
${
CONDA_CHANNEL_FLAGS
}
-c=conda-forge"
fi
conda create
${
CONDA_CHANNEL_FLAGS
}
-yn
"env
$PYTHON_VERSION
"
python
=
"
$PYTHON_VERSION
"
conda create
${
CONDA_CHANNEL_FLAGS
}
-yn
"env
$PYTHON_VERSION
"
python
=
"
$PYTHON_VERSION
"
conda activate
"env
$PYTHON_VERSION
"
conda activate
"env
$PYTHON_VERSION
"
# Install libpng from Anaconda (defaults)
# Install libpng from Anaconda (defaults)
conda
install
${
CONDA_CHANNEL_FLAGS
}
-c
conda-forge
libpng
"jpeg<=9b"
-y
conda
install
${
CONDA_CHANNEL_FLAGS
}
libpng
"jpeg<=9b"
-y
else
else
# Install native CentOS libJPEG, LAME, freetype and GnuTLS
# Install native CentOS libJPEG, LAME, freetype and GnuTLS
yum
install
-y
libjpeg-turbo-devel lame freetype gnutls
yum
install
-y
libjpeg-turbo-devel lame freetype gnutls
...
@@ -250,7 +247,7 @@ setup_pip_pytorch_version() {
...
@@ -250,7 +247,7 @@ setup_pip_pytorch_version() {
# You MUST have populated PYTORCH_VERSION_SUFFIX before hand.
# You MUST have populated PYTORCH_VERSION_SUFFIX before hand.
setup_conda_pytorch_constraint
()
{
setup_conda_pytorch_constraint
()
{
if
[[
-z
"
$PYTORCH_VERSION
"
]]
;
then
if
[[
-z
"
$PYTORCH_VERSION
"
]]
;
then
export
CONDA_CHANNEL_FLAGS
=
"-c pytorch-nightly -c pytorch"
export
CONDA_CHANNEL_FLAGS
=
"
${
CONDA_CHANNEL_FLAGS
}
-c pytorch-nightly -c pytorch"
export
PYTORCH_VERSION
=
"
$(
conda search
--json
'pytorch[channel=pytorch-nightly]'
|
\
export
PYTORCH_VERSION
=
"
$(
conda search
--json
'pytorch[channel=pytorch-nightly]'
|
\
python
-c
"import os, sys, json, re; cuver = os.environ.get('CU_VERSION');
\
python
-c
"import os, sys, json, re; cuver = os.environ.get('CU_VERSION');
\
cuver_1 = cuver.replace('cu', 'cuda') if cuver != 'cpu' else cuver;
\
cuver_1 = cuver.replace('cu', 'cuda') if cuver != 'cpu' else cuver;
\
...
@@ -265,7 +262,7 @@ setup_conda_pytorch_constraint() {
...
@@ -265,7 +262,7 @@ setup_conda_pytorch_constraint() {
exit
1
exit
1
fi
fi
else
else
export
CONDA_CHANNEL_FLAGS
=
"-c pytorch -c pytorch-
${
UPLOAD_CHANNEL
}
"
export
CONDA_CHANNEL_FLAGS
=
"
${
CONDA_CHANNEL_FLAGS
}
-c pytorch -c pytorch-
${
UPLOAD_CHANNEL
}
"
fi
fi
if
[[
"
$CU_VERSION
"
==
cpu
]]
;
then
if
[[
"
$CU_VERSION
"
==
cpu
]]
;
then
export
CONDA_PYTORCH_BUILD_CONSTRAINT
=
"- pytorch==
$PYTORCH_VERSION
${
PYTORCH_VERSION_SUFFIX
}
"
export
CONDA_PYTORCH_BUILD_CONSTRAINT
=
"- pytorch==
$PYTORCH_VERSION
${
PYTORCH_VERSION_SUFFIX
}
"
...
@@ -277,9 +274,6 @@ setup_conda_pytorch_constraint() {
...
@@ -277,9 +274,6 @@ setup_conda_pytorch_constraint() {
if
[[
"
$OSTYPE
"
==
msys
&&
"
$CU_VERSION
"
==
cu92
]]
;
then
if
[[
"
$OSTYPE
"
==
msys
&&
"
$CU_VERSION
"
==
cu92
]]
;
then
export
CONDA_CHANNEL_FLAGS
=
"
${
CONDA_CHANNEL_FLAGS
}
-c defaults -c numba/label/dev"
export
CONDA_CHANNEL_FLAGS
=
"
${
CONDA_CHANNEL_FLAGS
}
-c defaults -c numba/label/dev"
fi
fi
if
[[
"
$PYTHON_VERSION
"
==
3.9
]]
;
then
export
CONDA_CHANNEL_FLAGS
=
"
${
CONDA_CHANNEL_FLAGS
}
-c=conda-forge"
fi
}
}
# Translate CUDA_VERSION into CUDA_CUDATOOLKIT_CONSTRAINT
# Translate CUDA_VERSION into CUDA_CUDATOOLKIT_CONSTRAINT
...
...
packaging/torchvision/meta.yaml
View file @
d391a0e9
...
@@ -52,7 +52,6 @@ test:
...
@@ -52,7 +52,6 @@ test:
requires
:
requires
:
-
pytest
-
pytest
-
scipy
-
scipy
-
av
# NOTE: Pinned to fix issues with size_t on Windows
# NOTE: Pinned to fix issues with size_t on Windows
-
jpeg <=9b
-
jpeg <=9b
-
ca-certificates
-
ca-certificates
...
...
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