From 1d6a9557376dbecef7cc490620e5d704509ccda9 Mon Sep 17 00:00:00 2001 From: Nicolas Hug Date: Mon, 15 Jan 2024 14:15:48 +0000 Subject: [PATCH 1/4] Try build and tests on ffmpeg6 --- .github/scripts/setup-env.sh | 4 ++-- .github/scripts/unittest.sh | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/scripts/setup-env.sh b/.github/scripts/setup-env.sh index a4f113c367f..08d6dc062ef 100755 --- a/.github/scripts/setup-env.sh +++ b/.github/scripts/setup-env.sh @@ -40,10 +40,10 @@ conda create \ --quiet --yes \ python="${PYTHON_VERSION}" pip \ ninja cmake \ - libpng \ - 'ffmpeg<4.3' + libpng conda activate ci conda install --quiet --yes libjpeg-turbo -c pytorch +conda install --quiet --yes "ffmpeg>=6.0" -c conda-forge pip install --progress-bar=off --upgrade setuptools # See https://github.com/pytorch/vision/issues/6790 diff --git a/.github/scripts/unittest.sh b/.github/scripts/unittest.sh index 8f0ad92218c..4a8681289e2 100755 --- a/.github/scripts/unittest.sh +++ b/.github/scripts/unittest.sh @@ -13,5 +13,4 @@ echo '::endgroup::' python test/smoke_test.py -# We explicitly ignore the video tests until we resolve https://github.com/pytorch/vision/issues/8162 -pytest --ignore-glob="*test_video*" --junit-xml="${RUNNER_TEST_RESULTS_DIR}/test-results.xml" -v --durations=25 +pytest --junit-xml="${RUNNER_TEST_RESULTS_DIR}/test-results.xml" -v --durations=25 From a0ff08beaddfc6ad05301195a27dfa47ce45104a Mon Sep 17 00:00:00 2001 From: Nicolas Hug Date: Mon, 15 Jan 2024 15:13:08 +0000 Subject: [PATCH 2/4] Bypass dataset tests --- .github/scripts/unittest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/unittest.sh b/.github/scripts/unittest.sh index 4a8681289e2..46c513dd81e 100755 --- a/.github/scripts/unittest.sh +++ b/.github/scripts/unittest.sh @@ -13,4 +13,4 @@ echo '::endgroup::' python test/smoke_test.py -pytest --junit-xml="${RUNNER_TEST_RESULTS_DIR}/test-results.xml" -v --durations=25 +pytest --ignore-glob="*test_dataset*" --junit-xml="${RUNNER_TEST_RESULTS_DIR}/test-results.xml" -v --durations=25 From bdea6ef238e23fc96c5819d4a859dd39b32ece8b Mon Sep 17 00:00:00 2001 From: Nicolas Hug Date: Mon, 15 Jan 2024 15:54:30 +0000 Subject: [PATCH 3/4] Only run video tests --- .github/scripts/unittest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/unittest.sh b/.github/scripts/unittest.sh index 46c513dd81e..261d8b2802a 100755 --- a/.github/scripts/unittest.sh +++ b/.github/scripts/unittest.sh @@ -13,4 +13,4 @@ echo '::endgroup::' python test/smoke_test.py -pytest --ignore-glob="*test_dataset*" --junit-xml="${RUNNER_TEST_RESULTS_DIR}/test-results.xml" -v --durations=25 +pytest --ignore-glob="*test_dataset*" --junit-xml="${RUNNER_TEST_RESULTS_DIR}/test-results.xml" -v --durations=25 test/test_video* From b33e843c31a1e1cf9ff22bcde7489e3b4023d550 Mon Sep 17 00:00:00 2001 From: Nicolas Hug Date: Wed, 17 Jan 2024 11:01:43 +0000 Subject: [PATCH 4/4] empty