Skip to content

Commit 8e0ef0e

Browse files
committed
.
1 parent aae6aaf commit 8e0ef0e

File tree

2 files changed

+13
-14
lines changed

2 files changed

+13
-14
lines changed

.github/workflows/linux_cuda_wheel.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@ jobs:
6060
strategy:
6161
fail-fast: false
6262
matrix:
63+
# 3.9 corresponds to the minimum python version for which we build
64+
# the wheel unless the label cliflow/binaries/all is present in the
65+
# PR.
66+
# For the actual release we should add that label and change this to
67+
# include more python versions.
6368
python-version: ['3.9']
6469
cuda-version: ['12.4']
6570
ffmpeg-version-for-tests: ['5', '6', '7']
@@ -75,8 +80,6 @@ jobs:
7580
echo cuda_version_without_periods=${cuda_version_without_periods} >> $GITHUB_ENV
7681
- uses: actions/download-artifact@v3
7782
with:
78-
# We use 3.9 because it's the minimum version we build.
79-
# We test version 3.9 against all other python versions in the matrix.
8083
name: pytorch_torchcodec__3.9_cu${{ env.cuda_version_without_periods }}_x86_64
8184
path: pytorch/torchcodec/dist/
8285
- name: Setup miniconda using test-infra
@@ -133,4 +136,4 @@ jobs:
133136
- name: Run Python tests
134137
run: |
135138
${CONDA_RUN} FAIL_WITHOUT_CUDA=1 pytest test -vvv
136-
${CONDA_RUN} python benchmarks/decoders/gpu_benchmark.py --devices=cuda:0,cpu --resize_devices=none
139+
${CONDA_RUN} time python benchmarks/decoders/gpu_benchmark.py --devices=cuda:0,cpu --resize_devices=none

src/torchcodec/decoders/_core/CMakeLists.txt

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,13 @@ if(DEFINED ENV{BUILD_AGAINST_ALL_FFMPEG_FROM_S3})
7777
)
7878

7979

80-
if(ENABLE_CUDA)
81-
# TODO: Enable more ffmpeg versions for cuda.
82-
make_torchcodec_library(libtorchcodec7 ffmpeg7)
83-
make_torchcodec_library(libtorchcodec6 ffmpeg6)
84-
make_torchcodec_library(libtorchcodec5 ffmpeg5)
85-
else()
86-
make_torchcodec_library(libtorchcodec7 ffmpeg7)
87-
make_torchcodec_library(libtorchcodec6 ffmpeg6)
88-
make_torchcodec_library(libtorchcodec5 ffmpeg5)
89-
make_torchcodec_library(libtorchcodec4 ffmpeg4)
90-
endif()
80+
if(NOT ENABLE_CUDA)
81+
# TODO: Enable more ffmpeg versions for cuda.
82+
make_torchcodec_library(libtorchcodec4 ffmpeg4)
83+
endif()
84+
make_torchcodec_library(libtorchcodec7 ffmpeg7)
85+
make_torchcodec_library(libtorchcodec6 ffmpeg6)
86+
make_torchcodec_library(libtorchcodec5 ffmpeg5)
9187

9288
else()
9389
message(

0 commit comments

Comments
 (0)