Skip to content

Commit ea2bddc

Browse files
committed
Reduce diff
1 parent 8c891fb commit ea2bddc

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

.github/workflows/cpp_tests.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22+
# TODO put back 6.1.1. See
23+
# https://github.com/pytorch/torchcodec/issues/518
2224
ffmpeg-version-for-tests: ['4.4.2', '5.1.2', '7.0.1']
2325
steps:
2426
- name: Check out repo

.github/workflows/docs.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,6 @@ jobs:
7676
with:
7777
python-version: ${{ matrix.python-version }}
7878
#
79-
# For some reason nvidia::libnpp=12.4 doesn't install but nvidia/label/cuda-12.4.0::libnpp does.
80-
# So we use the latter convention for libnpp.
81-
# We install conda packages at the start because otherwise conda may have conflicts with dependencies.
8279
default-packages: "nvidia/label/cuda-${{ matrix.cuda-version }}.0::libnpp nvidia::cuda-nvrtc=${{ matrix.cuda-version }} nvidia::cuda-toolkit=${{ matrix.cuda-version }} nvidia::cuda-cudart=${{ matrix.cuda-version }} nvidia::cuda-driver-dev=${{ matrix.cuda-version }} conda-forge::ffmpeg=${{ matrix.ffmpeg-version-for-tests }}"
8380
- name: Check env
8481
run: |

.github/workflows/linux_cuda_wheel.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,6 @@ jobs:
9090
uses: pytorch/test-infra/.github/actions/setup-miniconda@main
9191
with:
9292
python-version: ${{ matrix.python-version }}
93-
#
94-
# For some reason nvidia::libnpp=12.4 doesn't install but nvidia/label/cuda-12.4.0::libnpp does.
95-
# So we use the latter convention for libnpp.
96-
# We install conda packages at the start because otherwise conda may have conflicts with dependencies.
9793
default-packages: "nvidia/label/cuda-${{ matrix.cuda-version }}.0::libnpp nvidia::cuda-nvrtc=${{ matrix.cuda-version }} nvidia::cuda-toolkit=${{ matrix.cuda-version }} nvidia::cuda-cudart=${{ matrix.cuda-version }} nvidia::cuda-driver-dev=${{ matrix.cuda-version }} conda-forge::ffmpeg=${{ matrix.ffmpeg-version-for-tests }}"
9894
- name: Check env
9995
run: |
@@ -143,7 +139,7 @@ jobs:
143139
${CONDA_RUN} python test/decoders/manual_smoke_test.py
144140
- name: Run Python tests
145141
run: |
146-
${CONDA_RUN} FAIL_WITHOUT_CUDA=1 pytest test -vvv
142+
${CONDA_RUN} FAIL_WITHOUT_CUDA=1 pytest test -v --tb=short
147143
- name: Run Python benchmark
148144
run: |
149145
${CONDA_RUN} time python benchmarks/decoders/gpu_benchmark.py --devices=cuda:0,cpu --resize_devices=none

0 commit comments

Comments
 (0)