Release 0.2.1 (#546)

Author: NicolasHug

.github/workflows/cpp_tests.yaml

@@ -36,7 +36,7 @@ jobs:
         run: python -m pip install --upgrade pip
       - name: Install dependencies
         run: |
-          python -m pip install --pre torch --index-url https://download.pytorch.org/whl/nightly/cpu
+          python -m pip install torch --index-url https://download.pytorch.org/whl/cpu
       - name: Install ffmpeg and pkg-config
         run: |
           conda install "ffmpeg=${{ matrix.ffmpeg-version-for-tests }}" pkg-config -c conda-forge

.github/workflows/docs.yaml

@@ -15,12 +15,12 @@ defaults:
 
 jobs:
   generate-matrix:
-    uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
+    uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.6-torchcodec
     with:
       package-type: wheel
       os: linux
       test-infra-repository: pytorch/test-infra
-      test-infra-ref: main
+      test-infra-ref: release/2.6-torchcodec
       with-cpu: disable
       with-xpu: disable
       with-rocm: disable
@@ -31,12 +31,12 @@ jobs:
     strategy:
       fail-fast: false
     name: Build and Upload wheel
-    uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@main
+    uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@release/2.6-torchcodec
     with:
       repository: pytorch/torchcodec
       ref: ""
       test-infra-repository: pytorch/test-infra
-      test-infra-ref: main
+      test-infra-ref: release/2.6-torchcodec
       build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
       post-script: packaging/post_build_script.sh
       smoke-test-script: packaging/fake_smoke_test.py
@@ -75,7 +75,7 @@ jobs:
         uses: pytorch/test-infra/.github/actions/setup-miniconda@main
         with:
           python-version: ${{ matrix.python-version }}
-          # We install conda packages at the start because otherwise conda may have conflicts with dependencies.
+          #
           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 }}"
       - name: Check env
         run: |
@@ -90,7 +90,7 @@ jobs:
         run: ${CONDA_RUN} python -m pip install --upgrade pip
       - name: Install PyTorch
         run: |
-          ${CONDA_RUN} python -m pip install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/cu${{ env.cuda_version_without_periods }}
+          ${CONDA_RUN} python -m pip install torch torchvision --index-url https://download.pytorch.org/whl/cu${{ env.cuda_version_without_periods }}
           ${CONDA_RUN} python -c 'import torch; print(f"{torch.__version__}"); print(f"{torch.__file__}"); print(f"{torch.cuda.is_available()=}")'
       - name: Install torchcodec from the wheel
         run: |

.github/workflows/lint.yaml

@@ -62,7 +62,7 @@ jobs:
         run: python -m pip install --upgrade pip
       - name: Install dependencies and FFmpeg
         run: |
-          python -m pip install --pre torch --index-url https://download.pytorch.org/whl/nightly/cpu
+          python -m pip install torch --index-url https://download.pytorch.org/whl/cpu
           conda install "ffmpeg=7.0.1" pkg-config -c conda-forge
           ffmpeg -version
       - name: Build and install torchcodec

.github/workflows/linux_cuda_wheel.yaml

@@ -25,12 +25,12 @@ defaults:
 
 jobs:
   generate-matrix:
-    uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
+    uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.6-torchcodec
     with:
       package-type: wheel
       os: linux
       test-infra-repository: pytorch/test-infra
-      test-infra-ref: main
+      test-infra-ref: release/2.6-torchcodec
       with-cpu: disable
       with-xpu: disable
       with-rocm: disable
@@ -41,12 +41,12 @@ jobs:
     strategy:
       fail-fast: false
     name: Build and Upload wheel
-    uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@main
+    uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@release/2.6-torchcodec
     with:
       repository: pytorch/torchcodec
       ref: ""
       test-infra-repository: pytorch/test-infra
-      test-infra-ref: main
+      test-infra-ref: release/2.6-torchcodec
       build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
       post-script: packaging/post_build_script.sh
       smoke-test-script: packaging/fake_smoke_test.py
@@ -65,11 +65,12 @@ jobs:
           # PR.
           # For the actual release we should add that label and change this to
           # include more python versions.
-        python-version: ['3.9']
-        cuda-version: ['11.8', '12.6', '12.8']
-        # TODO: put back ffmpeg 5 https://github.com/pytorch/torchcodec/issues/325
-        ffmpeg-version-for-tests: ['4.4.2', '6', '7']
-
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
+        cuda-version: ['11.8', '12.4', '12.6']
+        ffmpeg-version-for-tests: ['4.4.2', '5', '6', '7']
+        exclude:
+        - cuda-version: '12.4'  # TODO put this back it fails with infra issue.
+          ffmpeg-version-for-tests: '4.4.2'
     container:
       image: "pytorch/manylinux2_28-builder:cuda${{ matrix.cuda-version }}"
       options: "--gpus all -e NVIDIA_DRIVER_CAPABILITIES=video,compute,utility"
@@ -89,7 +90,6 @@ jobs:
         uses: pytorch/test-infra/.github/actions/setup-miniconda@main
         with:
           python-version: ${{ matrix.python-version }}
-          # We install conda packages at the start because otherwise conda may have conflicts with dependencies.
           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 }}"
       - name: Check env
         run: |
@@ -104,7 +104,7 @@ jobs:
         run: ${CONDA_RUN} python -m pip install --upgrade pip
       - name: Install PyTorch
         run: |
-          ${CONDA_RUN} python -m pip install --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/cu${{ env.cuda_version_without_periods }}
+          ${CONDA_RUN} python -m pip install torch torchvision --index-url https://download.pytorch.org/whl/cu${{ env.cuda_version_without_periods }}
           ${CONDA_RUN} python -c 'import torch; print(f"{torch.__version__}"); print(f"{torch.__file__}"); print(f"{torch.cuda.is_available()=}")'
       - name: Install torchcodec from the wheel
         run: |

.github/workflows/linux_wheel.yaml

@@ -26,12 +26,12 @@ defaults:
 jobs:
 
   generate-matrix:
-    uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
+    uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.6-torchcodec
     with:
       package-type: wheel
       os: linux
       test-infra-repository: pytorch/test-infra
-      test-infra-ref: main
+      test-infra-ref: release/2.6-torchcodec
       with-xpu: disable
       with-rocm: disable
       with-cuda: disable
@@ -42,12 +42,12 @@ jobs:
     strategy:
       fail-fast: false
     name: Build and Upload Linux wheel
-    uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@main
+    uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@release/2.6-torchcodec
     with:
       repository: pytorch/torchcodec
       ref: ""
       test-infra-repository: pytorch/test-infra
-      test-infra-ref: main
+      test-infra-ref: release/2.6-torchcodec
       build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
       post-script: packaging/post_build_script.sh
       smoke-test-script: packaging/fake_smoke_test.py
@@ -61,7 +61,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.9']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
         ffmpeg-version-for-tests: ['4.4.2', '5.1.2', '6.1.1', '7.0.1']
     needs: build
     steps:
@@ -80,7 +80,7 @@ jobs:
         run: python -m pip install --upgrade pip
       - name: Install PyTorch
         run: |
-          python -m pip install --pre torch --index-url https://download.pytorch.org/whl/nightly/cpu
+          python -m pip install torch --index-url https://download.pytorch.org/whl/cpu
       - name: Install torchcodec from the wheel
         run: |
           wheel_path=`find pytorch/torchcodec/dist -type f -name "*.whl"`
@@ -103,7 +103,7 @@ jobs:
 
       - name: Install test dependencies
         run: |
-          python -m pip install --pre torchvision --index-url https://download.pytorch.org/whl/nightly/cpu
+          python -m pip install torchvision --index-url https://download.pytorch.org/whl/cpu
           # Ideally we would find a way to get those dependencies from pyproject.toml
           python -m pip install numpy pytest pillow
 

.github/workflows/macos_wheel.yaml

@@ -26,12 +26,12 @@ defaults:
 jobs:
 
   generate-matrix:
-    uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
+    uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.6-torchcodec
     with:
       package-type: wheel
       os: macos-arm64
       test-infra-repository: pytorch/test-infra
-      test-infra-ref: main
+      test-infra-ref: release/2.6-torchcodec
       with-xpu: disable
       with-rocm: disable
       with-cuda: disable
@@ -42,12 +42,12 @@ jobs:
     strategy:
       fail-fast: false
     name: Build and Upload Mac wheel
-    uses: pytorch/test-infra/.github/workflows/build_wheels_macos.yml@main
+    uses: pytorch/test-infra/.github/workflows/build_wheels_macos.yml@release/2.6-torchcodec
     with:
       repository: pytorch/torchcodec
       ref: ""
       test-infra-repository: pytorch/test-infra
-      test-infra-ref: main
+      test-infra-ref: release/2.6-torchcodec
       build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
       post-script: packaging/post_build_script.sh
       smoke-test-script: packaging/fake_smoke_test.py
@@ -62,7 +62,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.9']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
         ffmpeg-version-for-tests: ['4.4.2', '5.1.2', '6.1.1', '7.0.1']
     needs: build
     steps:
@@ -84,7 +84,7 @@ jobs:
 
       - name: Install PyTorch
         run: |
-          python -m pip install --pre torch --index-url https://download.pytorch.org/whl/nightly/cpu
+          python -m pip install torch --index-url https://download.pytorch.org/whl/cpu
 
       - name: Install torchcodec from the wheel
         run: |
@@ -102,7 +102,7 @@ jobs:
 
       - name: Install test dependencies
         run: |
-          python -m pip install --pre torchvision --index-url https://download.pytorch.org/whl/nightly/cpu
+          python -m pip install torchvision --index-url https://download.pytorch.org/whl/cpu
           python -m pip install numpy pytest pillow
 
       - name: Delete the src/ folder just for fun

README.md

@@ -152,7 +152,7 @@ format you want. Refer to Nvidia's GPU support matrix for more details
    the CUDA Toolkit.
 
 2. Install or compile FFmpeg with NVDEC support.
-   TorchCodec with CUDA should work with FFmpeg versions in [5, 7].
+   TorchCodec with CUDA should work with FFmpeg versions in [4, 7].
 
    If FFmpeg is not already installed, or you need a more recent version, an
    easy way to install it is to use `conda`:

setup.py

@@ -178,12 +178,14 @@ def _write_version_files():
         # the content of `version.txt` plus some suffix like "+cpu" or "+cu112".
         # See
         # https://github.com/pytorch/test-infra/blob/61e6da7a6557152eb9879e461a26ad667c15f0fd/tools/pkg-helpers/pytorch_pkg_helpers/version.py#L113
+        version = version.replace("+cpu", "")
         with open(_ROOT_DIR / "version.txt", "w") as f:
             f.write(f"{version}")
     else:
         with open(_ROOT_DIR / "version.txt") as f:
             version = f.readline().strip()
         try:
+            version = version.replace("+cpu", "")
             sha = (
                 subprocess.check_output(
                     ["git", "rev-parse", "HEAD"], cwd=str(_ROOT_DIR)

version.txt

@@ -1 +1 @@
-0.3.0a0
+0.2.1