Skip to content

Testing pyav #2745

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.

Sign up for GitHub

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

Closed
wants to merge 25 commits into from
Closed

Testing pyav #2745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
a33b5a4
Testing pyav
fmassa Oct 2, 2020
1a6c9b2
Fix to 8.0.0
fmassa Oct 2, 2020
6701c76
Try 6.2.0
fmassa Oct 2, 2020
e9feda2
See what happens with av from pip
fmassa Oct 2, 2020
f983d10
What is going on?
fmassa Oct 2, 2020
e4f8974
More tests
fmassa Oct 2, 2020
77822d1
Forgot something
fmassa Oct 2, 2020
8aaa906
Check if cache is messing up with things
fmassa Oct 3, 2020
7e2d0ea
Now try with different ffmpeg
fmassa Oct 3, 2020
ffa47b9
Now try with different ffmpeg
fmassa Oct 3, 2020
d47c589
Testing pyav
fmassa Oct 2, 2020
5ee2fc1
Fix to 8.0.0
fmassa Oct 2, 2020
1f6a3a3
Try 6.2.0
fmassa Oct 2, 2020
ce2b071
See what happens with av from pip
fmassa Oct 2, 2020
d17408f
What is going on?
fmassa Oct 2, 2020
b9f7dd6
More tests
fmassa Oct 2, 2020
df91c8d
Forgot something
fmassa Oct 2, 2020
95d8677
Check if cache is messing up with things
fmassa Oct 3, 2020
8b2f637
Now try with different ffmpeg
fmassa Oct 3, 2020
37122bc
Now try with different ffmpeg
fmassa Oct 3, 2020
b09ba66
Merge branch 'test-av' of github.com:fmassa/vision-1 into test-av
andfoy Oct 5, 2020
5885f28
Do not install av
andfoy Oct 5, 2020
94832b2
Merge branch 'master' into test-av
andfoy Oct 5, 2020
10095e1
Test with ffmpeg 4.2
andfoy Oct 5, 2020
30232de
Merge branch 'test-av' of github.com:fmassa/vision-1 into test-av
andfoy Oct 5, 2020
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
24 changes: 12 additions & 12 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,21 +408,21 @@ jobs:
name: Generate cache key
# This will refresh cache on Sundays, nightly build should generate new cache.
command: echo "$(date +"%Y-%U")" > .circleci-weekly
- restore_cache:

keys:
- env-v2-linux-{{ arch }}-py<< parameters.python_version >>-{{ checksum ".circleci/unittest/linux/scripts/environment.yml" }}-{{ checksum ".circleci-weekly" }}

#- restore_cache:
#
#keys:
# - env-v2-linux-{{ arch }}-py<< parameters.python_version >>-{{ checksum ".circleci/unittest/linux/scripts/environment.yml" }}-{{ checksum ".circleci-weekly" }}
#
- run:
name: Setup
command: .circleci/unittest/linux/scripts/setup_env.sh
- save_cache:

key: env-v2-linux-{{ arch }}-py<< parameters.python_version >>-{{ checksum ".circleci/unittest/linux/scripts/environment.yml" }}-{{ checksum ".circleci-weekly" }}

paths:
- conda
- env
#- save_cache:
#
#key: env-v2-linux-{{ arch }}-py<< parameters.python_version >>-{{ checksum ".circleci/unittest/linux/scripts/environment.yml" }}-{{ checksum ".circleci-weekly" }}
#
#paths:
# - conda
# - env
- run:
name: Install torchvision
command: .circleci/unittest/linux/scripts/install.sh
Expand Down
24 changes: 12 additions & 12 deletions .circleci/config.yml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,21 +408,21 @@ jobs:
name: Generate cache key
# This will refresh cache on Sundays, nightly build should generate new cache.
command: echo "$(date +"%Y-%U")" > .circleci-weekly
- restore_cache:
{% raw %}
keys:
- env-v2-linux-{{ arch }}-py<< parameters.python_version >>-{{ checksum ".circleci/unittest/linux/scripts/environment.yml" }}-{{ checksum ".circleci-weekly" }}
{% endraw %}
#- restore_cache:
#{% raw %}
#keys:
# - env-v2-linux-{{ arch }}-py<< parameters.python_version >>-{{ checksum ".circleci/unittest/linux/scripts/environment.yml" }}-{{ checksum ".circleci-weekly" }}
#{% endraw %}
- run:
name: Setup
command: .circleci/unittest/linux/scripts/setup_env.sh
- save_cache:
{% raw %}
key: env-v2-linux-{{ arch }}-py<< parameters.python_version >>-{{ checksum ".circleci/unittest/linux/scripts/environment.yml" }}-{{ checksum ".circleci-weekly" }}
{% endraw %}
paths:
- conda
- env
#- save_cache:
#{% raw %}
#key: env-v2-linux-{{ arch }}-py<< parameters.python_version >>-{{ checksum ".circleci/unittest/linux/scripts/environment.yml" }}-{{ checksum ".circleci-weekly" }}
#{% endraw %}
#paths:
# - conda
# - env
- run:
name: Install torchvision
command: .circleci/unittest/linux/scripts/install.sh
Expand Down
1 change: 0 additions & 1 deletion .circleci/unittest/linux/scripts/environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,3 @@ dependencies:
- future
- pillow>=4.1.1
- scipy
- av
7 changes: 7 additions & 0 deletions .circleci/unittest/linux/scripts/setup_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,13 @@ if [ ! -d "${env_dir}" ]; then
fi
conda activate "${env_dir}"

conda list
# 3. Install Conda dependencies
printf "* Installing dependencies (except PyTorch)\n"
conda env update --file "${this_dir}/environment.yml" --prune

conda list
#conda install av=6.2.0 -c conda-forge -y
# conda install av ffmpeg=4.0.2 -c conda-forge -y
conda install ffmpeg=4.2 -c conda-forge -y
conda list