Skip to content

Commit 2e1c91f

Browse files
NicolasHugNicolasHug
committed
Release 0.2.1
1 parent 374d950 commit 2e1c91f

File tree

8 files changed

+40
-35
lines changed

8 files changed

+40
-35
lines changed

‎.github/workflows/cpp_tests.yaml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ 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
24-
ffmpeg-version-for-tests: ['4.4.2', '5.1.2', '7.0.1']
22+
ffmpeg-version-for-tests: ['4.4.2', '5.1.2', '6.1.1', '7.0.1']
2523
steps:
2624
- name: Check out repo
2725
uses: actions/checkout@v3
@@ -36,7 +34,7 @@ jobs:
3634
run: python -m pip install --upgrade pip
3735
- name: Install dependencies
3836
run: |
39-
python -m pip install --pre torch --index-url https://download.pytorch.org/whl/nightly/cpu
37+
python -m pip install torch --index-url https://download.pytorch.org/whl/cpu
4038
- name: Install ffmpeg and pkg-config
4139
run: |
4240
conda install "ffmpeg=${{ matrix.ffmpeg-version-for-tests }}" pkg-config -c conda-forge

‎.github/workflows/docs.yaml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ defaults:
1515

1616
jobs:
1717
generate-matrix:
18-
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
18+
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.6-torchcodec
1919
with:
2020
package-type: wheel
2121
os: linux
2222
test-infra-repository: pytorch/test-infra
23-
test-infra-ref: main
23+
test-infra-ref: release/2.6-torchcodec
2424
with-cpu: disable
2525
with-xpu: disable
2626
with-rocm: disable
@@ -31,12 +31,12 @@ jobs:
3131
strategy:
3232
fail-fast: false
3333
name: Build and Upload wheel
34-
uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@main
34+
uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@release/2.6-torchcodec
3535
with:
3636
repository: pytorch/torchcodec
3737
ref: ""
3838
test-infra-repository: pytorch/test-infra
39-
test-infra-ref: main
39+
test-infra-ref: release/2.6-torchcodec
4040
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
4141
post-script: packaging/post_build_script.sh
4242
smoke-test-script: packaging/fake_smoke_test.py
@@ -75,6 +75,9 @@ jobs:
7575
uses: pytorch/test-infra/.github/actions/setup-miniconda@main
7676
with:
7777
python-version: ${{ matrix.python-version }}
78+
#
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.
7881
# We install conda packages at the start because otherwise conda may have conflicts with dependencies.
7982
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 }}"
8083
- name: Check env
@@ -90,7 +93,7 @@ jobs:
9093
run: ${CONDA_RUN} python -m pip install --upgrade pip
9194
- name: Install PyTorch
9295
run: |
93-
${CONDA_RUN} python -m pip install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/cu${{ env.cuda_version_without_periods }}
96+
${CONDA_RUN} python -m pip install torch torchvision --index-url https://download.pytorch.org/whl/cu${{ env.cuda_version_without_periods }}
9497
${CONDA_RUN} python -c 'import torch; print(f"{torch.__version__}"); print(f"{torch.__file__}"); print(f"{torch.cuda.is_available()=}")'
9598
- name: Install torchcodec from the wheel
9699
run: |

‎.github/workflows/lint.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
run: python -m pip install --upgrade pip
6363
- name: Install dependencies and FFmpeg
6464
run: |
65-
python -m pip install --pre torch --index-url https://download.pytorch.org/whl/nightly/cpu
65+
python -m pip install torch --index-url https://download.pytorch.org/whl/cpu
6666
conda install "ffmpeg=7.0.1" pkg-config -c conda-forge
6767
ffmpeg -version
6868
- name: Build and install torchcodec

‎.github/workflows/linux_cuda_wheel.yaml‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ defaults:
2525

2626
jobs:
2727
generate-matrix:
28-
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
28+
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.6-torchcodec
2929
with:
3030
package-type: wheel
3131
os: linux
3232
test-infra-repository: pytorch/test-infra
33-
test-infra-ref: main
33+
test-infra-ref: release/2.6-torchcodec
3434
with-cpu: disable
3535
with-xpu: disable
3636
with-rocm: disable
@@ -41,12 +41,12 @@ jobs:
4141
strategy:
4242
fail-fast: false
4343
name: Build and Upload wheel
44-
uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@main
44+
uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@release/2.6-torchcodec
4545
with:
4646
repository: pytorch/torchcodec
4747
ref: ""
4848
test-infra-repository: pytorch/test-infra
49-
test-infra-ref: main
49+
test-infra-ref: release/2.6-torchcodec
5050
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
5151
post-script: packaging/post_build_script.sh
5252
smoke-test-script: packaging/fake_smoke_test.py
@@ -65,11 +65,10 @@ jobs:
6565
# PR.
6666
# For the actual release we should add that label and change this to
6767
# include more python versions.
68-
python-version: ['3.9']
69-
cuda-version: ['11.8', '12.6', '12.8']
68+
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
69+
cuda-version: ['11.8', '12.4', '12.6']
7070
# TODO: put back ffmpeg 5 https://github.com/pytorch/torchcodec/issues/325
71-
ffmpeg-version-for-tests: ['4.4.2', '6', '7']
72-
71+
ffmpeg-version-for-tests: ['5', '6', '7']
7372
container:
7473
image: "pytorch/manylinux2_28-builder:cuda${{ matrix.cuda-version }}"
7574
options: "--gpus all -e NVIDIA_DRIVER_CAPABILITIES=video,compute,utility"
@@ -89,6 +88,9 @@ jobs:
8988
uses: pytorch/test-infra/.github/actions/setup-miniconda@main
9089
with:
9190
python-version: ${{ matrix.python-version }}
91+
#
92+
# For some reason nvidia::libnpp=12.4 doesn't install but nvidia/label/cuda-12.4.0::libnpp does.
93+
# So we use the latter convention for libnpp.
9294
# We install conda packages at the start because otherwise conda may have conflicts with dependencies.
9395
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 }}"
9496
- name: Check env
@@ -104,7 +106,7 @@ jobs:
104106
run: ${CONDA_RUN} python -m pip install --upgrade pip
105107
- name: Install PyTorch
106108
run: |
107-
${CONDA_RUN} python -m pip install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/cu${{ env.cuda_version_without_periods }}
109+
${CONDA_RUN} python -m pip install torch torchvision --index-url https://download.pytorch.org/whl/cu${{ env.cuda_version_without_periods }}
108110
${CONDA_RUN} python -c 'import torch; print(f"{torch.__version__}"); print(f"{torch.__file__}"); print(f"{torch.cuda.is_available()=}")'
109111
- name: Install torchcodec from the wheel
110112
run: |
@@ -139,7 +141,7 @@ jobs:
139141
${CONDA_RUN} python test/decoders/manual_smoke_test.py
140142
- name: Run Python tests
141143
run: |
142-
${CONDA_RUN} FAIL_WITHOUT_CUDA=1 pytest test -v --tb=short
144+
${CONDA_RUN} FAIL_WITHOUT_CUDA=1 pytest test -vvv
143145
- name: Run Python benchmark
144146
run: |
145147
${CONDA_RUN} time python benchmarks/decoders/gpu_benchmark.py --devices=cuda:0,cpu --resize_devices=none

‎.github/workflows/linux_wheel.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ defaults:
2626
jobs:
2727

2828
generate-matrix:
29-
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
29+
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.6-torchcodec
3030
with:
3131
package-type: wheel
3232
os: linux
3333
test-infra-repository: pytorch/test-infra
34-
test-infra-ref: main
34+
test-infra-ref: release/2.6-torchcodec
3535
with-xpu: disable
3636
with-rocm: disable
3737
with-cuda: disable
@@ -42,12 +42,12 @@ jobs:
4242
strategy:
4343
fail-fast: false
4444
name: Build and Upload Linux wheel
45-
uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@main
45+
uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@release/2.6-torchcodec
4646
with:
4747
repository: pytorch/torchcodec
4848
ref: ""
4949
test-infra-repository: pytorch/test-infra
50-
test-infra-ref: main
50+
test-infra-ref: release/2.6-torchcodec
5151
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
5252
post-script: packaging/post_build_script.sh
5353
smoke-test-script: packaging/fake_smoke_test.py
@@ -61,7 +61,7 @@ jobs:
6161
strategy:
6262
fail-fast: false
6363
matrix:
64-
python-version: ['3.9']
64+
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
6565
ffmpeg-version-for-tests: ['4.4.2', '5.1.2', '6.1.1', '7.0.1']
6666
needs: build
6767
steps:
@@ -80,7 +80,7 @@ jobs:
8080
run: python -m pip install --upgrade pip
8181
- name: Install PyTorch
8282
run: |
83-
python -m pip install --pre torch --index-url https://download.pytorch.org/whl/nightly/cpu
83+
python -m pip install torch --index-url https://download.pytorch.org/whl/cpu
8484
- name: Install torchcodec from the wheel
8585
run: |
8686
wheel_path=`find pytorch/torchcodec/dist -type f -name "*.whl"`
@@ -103,7 +103,7 @@ jobs:
103103
104104
- name: Install test dependencies
105105
run: |
106-
python -m pip install --pre torchvision --index-url https://download.pytorch.org/whl/nightly/cpu
106+
python -m pip install torchvision --index-url https://download.pytorch.org/whl/cpu
107107
# Ideally we would find a way to get those dependencies from pyproject.toml
108108
python -m pip install numpy pytest pillow
109109

‎.github/workflows/macos_wheel.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ defaults:
2626
jobs:
2727

2828
generate-matrix:
29-
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
29+
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.6-torchcodec
3030
with:
3131
package-type: wheel
3232
os: macos-arm64
3333
test-infra-repository: pytorch/test-infra
34-
test-infra-ref: main
34+
test-infra-ref: release/2.6-torchcodec
3535
with-xpu: disable
3636
with-rocm: disable
3737
with-cuda: disable
@@ -42,12 +42,12 @@ jobs:
4242
strategy:
4343
fail-fast: false
4444
name: Build and Upload Mac wheel
45-
uses: pytorch/test-infra/.github/workflows/build_wheels_macos.yml@main
45+
uses: pytorch/test-infra/.github/workflows/build_wheels_macos.yml@release/2.6-torchcodec
4646
with:
4747
repository: pytorch/torchcodec
4848
ref: ""
4949
test-infra-repository: pytorch/test-infra
50-
test-infra-ref: main
50+
test-infra-ref: release/2.6-torchcodec
5151
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
5252
post-script: packaging/post_build_script.sh
5353
smoke-test-script: packaging/fake_smoke_test.py
@@ -62,7 +62,7 @@ jobs:
6262
strategy:
6363
fail-fast: false
6464
matrix:
65-
python-version: ['3.9']
65+
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
6666
ffmpeg-version-for-tests: ['4.4.2', '5.1.2', '6.1.1', '7.0.1']
6767
needs: build
6868
steps:
@@ -84,7 +84,7 @@ jobs:
8484

8585
- name: Install PyTorch
8686
run: |
87-
python -m pip install --pre torch --index-url https://download.pytorch.org/whl/nightly/cpu
87+
python -m pip install torch --index-url https://download.pytorch.org/whl/cpu
8888
8989
- name: Install torchcodec from the wheel
9090
run: |
@@ -102,7 +102,7 @@ jobs:
102102
103103
- name: Install test dependencies
104104
run: |
105-
python -m pip install --pre torchvision --index-url https://download.pytorch.org/whl/nightly/cpu
105+
python -m pip install torchvision --index-url https://download.pytorch.org/whl/cpu
106106
python -m pip install numpy pytest pillow
107107
108108
- name: Delete the src/ folder just for fun

‎setup.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,12 +178,14 @@ def _write_version_files():
178178
# the content of `version.txt` plus some suffix like "+cpu" or "+cu112".
179179
# See
180180
# https://github.com/pytorch/test-infra/blob/61e6da7a6557152eb9879e461a26ad667c15f0fd/tools/pkg-helpers/pytorch_pkg_helpers/version.py#L113
181+
version = version.replace("+cpu", "")
181182
with open(_ROOT_DIR / "version.txt", "w") as f:
182183
f.write(f"{version}")
183184
else:
184185
with open(_ROOT_DIR / "version.txt") as f:
185186
version = f.readline().strip()
186187
try:
188+
version = version.replace("+cpu", "")
187189
sha = (
188190
subprocess.check_output(
189191
["git", "rev-parse", "HEAD"], cwd=str(_ROOT_DIR)

‎version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.3.0a0
1+
0.2.0

0 commit comments

Comments
 (0)