Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Relocate image and video_reader extensions' dependencies on conda #2818

Open
wants to merge 52 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
5bd6fdc
Include FFmpeg as a dependency on Windows
andfoy Oct 14, 2020
b2b58fe
Merge branch 'master' into ffmpeg_win
fmassa Oct 15, 2020
da3ff1e
Merge branch 'master' into ffmpeg_win
andfoy Oct 26, 2020
96701c7
Try to redefine build_ext
andfoy Oct 26, 2020
f27538d
Try to relocate Linux so
andfoy Oct 26, 2020
3b2b7f6
Fix command cwd
andfoy Oct 26, 2020
5652f85
Do not overwrite output library dir
andfoy Oct 26, 2020
cfb5d56
Do not delete torchvision
andfoy Oct 26, 2020
6e9a62a
Minor error correction
andfoy Oct 26, 2020
78fad76
Install auditwheel on Linux
andfoy Oct 26, 2020
71b2a44
Minor error correction
andfoy Oct 26, 2020
889baf1
Try to build on conda
andfoy Oct 26, 2020
b98cddc
Try to install auditwheel in build.sh
andfoy Oct 26, 2020
aac5598
Try to install auditwheel manually
andfoy Oct 26, 2020
3c2df7f
Add pbr as dependency
andfoy Oct 26, 2020
3a564b1
Install patchelf dependencies only on linux
andfoy Oct 26, 2020
fff9902
Debug if build.sh causes some errors
andfoy Oct 26, 2020
6edfadc
Debug if build.sh causes some errors
andfoy Oct 26, 2020
6ca59e8
Restore meta.yaml
andfoy Oct 26, 2020
f0c1ea5
Try to install again the extra dependencies
andfoy Oct 26, 2020
d1a33bc
Check if wheel introduces conflicts
andfoy Oct 26, 2020
418ad50
Debug if patchelf causes errors
andfoy Oct 26, 2020
7d2701f
See if wheel causes errors
andfoy Oct 26, 2020
60aa67a
Try to install pyelftools solely
andfoy Oct 26, 2020
6839724
Call lddtree locally
andfoy Oct 26, 2020
8781317
Set valid true
andfoy Oct 26, 2020
3a08cd1
Install pyelftools on type checking CI
andfoy Oct 27, 2020
0931e1b
Update LD_LIBRARY_PATH
andfoy Oct 27, 2020
5756273
Do not require libpng, libjpeg nor ffmpeg at runtime
andfoy Oct 27, 2020
88f2956
Regenerate circleci file
andfoy Oct 27, 2020
4fc20c1
Relocate Mac dylibs
andfoy Oct 27, 2020
d9c645b
Minor error correction
andfoy Oct 27, 2020
7f83ffd
Pass dyld_library_path
andfoy Oct 27, 2020
70b9122
Omit pytorch libs
andfoy Oct 27, 2020
d7df5f8
Prevent library overwriting
andfoy Oct 27, 2020
95af2b2
Fix regression on Linux
andfoy Oct 27, 2020
4f589a8
Fix downstream libraries
andfoy Oct 27, 2020
178ba85
Relocate correctly
andfoy Oct 27, 2020
a81955f
Relocate main library correctly
andfoy Oct 27, 2020
ce5e2c6
Handle conda-build differently
andfoy Oct 28, 2020
40f04ff
Debug wheels
andfoy Oct 28, 2020
e11b2e5
Invoke bld.bat on Windows
andfoy Oct 28, 2020
f633b35
Remove actual conda instruction+
andfoy Oct 28, 2020
0ef55c9
Fix relocate on conda-build
andfoy Oct 28, 2020
803c9e4
Disable wheel relocation
andfoy Oct 28, 2020
549d90a
Install machomachomangler on Wheel
andfoy Oct 28, 2020
47d0c90
Use machomachomangler on unittest
andfoy Oct 28, 2020
57d512d
Merge branch 'master' into ffmpeg_win
andfoy Oct 30, 2020
2cce2e0
Merge branch 'master' into ffmpeg_win
andfoy Nov 2, 2020
7fda65d
Merge branch 'master' into ffmpeg_win
andfoy Nov 11, 2020
c277824
Merge branch 'master' into ffmpeg_win
andfoy Nov 23, 2020
e1380cb
Merge branch 'master' into ffmpeg_win
andfoy Feb 1, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
command: |
sudo apt-get update -y
sudo apt install -y libturbojpeg-dev
pip install --user --progress-bar off numpy mypy
pip install --user --progress-bar off numpy mypy pyelftools
pip install --user --progress-bar off --pre torch -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html
pip install --user --progress-bar off --editable .
mypy --config-file mypy.ini
Expand Down
2 changes: 1 addition & 1 deletion .circleci/config.yml.in
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
command: |
sudo apt-get update -y
sudo apt install -y libturbojpeg-dev
pip install --user --progress-bar off numpy mypy
pip install --user --progress-bar off numpy mypy pyelftools
pip install --user --progress-bar off --pre torch -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html
pip install --user --progress-bar off --editable .
mypy --config-file mypy.ini
Expand Down
1 change: 1 addition & 0 deletions .circleci/unittest/linux/scripts/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ dependencies:
- ffmpeg=4.2
- ca-certificates
- pip:
- auditwheel
- future
- pillow>=4.1.1
- scipy
Expand Down
2 changes: 2 additions & 0 deletions .circleci/unittest/windows/scripts/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ dependencies:
- libpng
- jpeg
- ca-certificates
- ffmpeg=4.2
- pip:
- future
- pillow>=4.1.1
- scipy
- av
- dataclasses
- machomachomangler
1 change: 1 addition & 0 deletions .circleci/unittest/windows/scripts/run_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ set -e
eval "$(./conda/Scripts/conda.exe 'shell.bash' 'hook')"
conda activate ./env

conda remove -y ffmpeg
export PYTORCH_TEST_WITH_SLOW='1'
python -m torch.utils.collect_env
pytest --cov=torchvision --junitxml=test-results/junit.xml -v --durations 20 test --ignore=test/test_datasets_download.py
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@ docs/build
.coverage
htmlcov
.*.swp
*.dll
*.so*
*.dylib*
*/*.so*
*/*.dylib*
*/*.dll
*.swp
*.swo
gen.yml
Expand Down
Loading