From 6b62b6a5b52e128fe7aba6da8bd9719187ab9a9f Mon Sep 17 00:00:00 2001 From: Nicolas Hug Date: Wed, 23 Apr 2025 10:57:32 +0100 Subject: [PATCH 1/5] Rely on 2.7 branch --- .github/workflows/build_ffmpeg.yaml | 4 ++-- .github/workflows/docs.yaml | 10 +++++----- .github/workflows/linux_cuda_wheel.yaml | 10 +++++----- .github/workflows/linux_wheel.yaml | 8 ++++---- .github/workflows/macos_wheel.yaml | 8 ++++---- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build_ffmpeg.yaml b/.github/workflows/build_ffmpeg.yaml index 4d6a22869..e5d18b2cc 100644 --- a/.github/workflows/build_ffmpeg.yaml +++ b/.github/workflows/build_ffmpeg.yaml @@ -28,7 +28,7 @@ jobs: fail-fast: false matrix: ffmpeg-version: ["4.4.4", "5.1.4", "6.1.1", "7.0.1"] - uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main + uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@release/2.7 permissions: id-token: write contents: read @@ -53,7 +53,7 @@ jobs: fail-fast: false matrix: ffmpeg-version: ["4.4.4", "5.1.4", "6.1.1", "7.0.1"] - uses: pytorch/test-infra/.github/workflows/macos_job.yml@main + uses: pytorch/test-infra/.github/workflows/macos_job.yml@release/2.7 with: job-name: Build upload-artifact: ffmpeg-lgpl-macos-${{ matrix.ffmpeg-version }} diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 60bfbfa2e..3f1150721 100644 --- a/.github/workflows/docs.yaml +++ b/.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.7 with: package-type: wheel os: linux test-infra-repository: pytorch/test-infra - test-infra-ref: main + test-infra-ref: release/2.7 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.7 with: repository: pytorch/torchcodec ref: "" test-infra-repository: pytorch/test-infra - test-infra-ref: main + test-infra-ref: release/2.7 build-matrix: ${{ needs.generate-matrix.outputs.matrix }} pre-script: packaging/pre_build_script.sh post-script: packaging/post_build_script.sh @@ -73,7 +73,7 @@ jobs: name: pytorch_torchcodec__${{ matrix.python-version }}_cu${{ env.cuda_version_without_periods }}_x86_64 path: pytorch/torchcodec/dist/ - name: Setup miniconda using test-infra - uses: pytorch/test-infra/.github/actions/setup-miniconda@main + uses: pytorch/test-infra/.github/actions/setup-miniconda@release/2.7 with: python-version: ${{ matrix.python-version }} # We install conda packages at the start because otherwise conda may have conflicts with dependencies. diff --git a/.github/workflows/linux_cuda_wheel.yaml b/.github/workflows/linux_cuda_wheel.yaml index bd57cac5e..7de1d60c4 100644 --- a/.github/workflows/linux_cuda_wheel.yaml +++ b/.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.7 with: package-type: wheel os: linux test-infra-repository: pytorch/test-infra - test-infra-ref: main + test-infra-ref: release/2.7 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.7 with: repository: pytorch/torchcodec ref: "" test-infra-repository: pytorch/test-infra - test-infra-ref: main + test-infra-ref: release/2.7 build-matrix: ${{ needs.generate-matrix.outputs.matrix }} pre-script: packaging/pre_build_script.sh post-script: packaging/post_build_script.sh @@ -87,7 +87,7 @@ jobs: name: pytorch_torchcodec__${{ matrix.python-version }}_cu${{ env.cuda_version_without_periods }}_x86_64 path: pytorch/torchcodec/dist/ - name: Setup miniconda using test-infra - uses: pytorch/test-infra/.github/actions/setup-miniconda@main + uses: pytorch/test-infra/.github/actions/setup-miniconda@release/2.7 with: python-version: ${{ matrix.python-version }} # We install conda packages at the start because otherwise conda may have conflicts with dependencies. diff --git a/.github/workflows/linux_wheel.yaml b/.github/workflows/linux_wheel.yaml index 1855e904e..6d756e03c 100644 --- a/.github/workflows/linux_wheel.yaml +++ b/.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.7 with: package-type: wheel os: linux test-infra-repository: pytorch/test-infra - test-infra-ref: main + test-infra-ref: release/2.7 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.7 with: repository: pytorch/torchcodec ref: "" test-infra-repository: pytorch/test-infra - test-infra-ref: main + test-infra-ref: release/2.7 build-matrix: ${{ needs.generate-matrix.outputs.matrix }} pre-script: packaging/pre_build_script.sh post-script: packaging/post_build_script.sh diff --git a/.github/workflows/macos_wheel.yaml b/.github/workflows/macos_wheel.yaml index ee436b7a4..7f4a6bab1 100644 --- a/.github/workflows/macos_wheel.yaml +++ b/.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.7 with: package-type: wheel os: macos-arm64 test-infra-repository: pytorch/test-infra - test-infra-ref: main + test-infra-ref: release/2.7 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.7 with: repository: pytorch/torchcodec ref: "" test-infra-repository: pytorch/test-infra - test-infra-ref: main + test-infra-ref: release/2.7 build-matrix: ${{ needs.generate-matrix.outputs.matrix }} pre-script: packaging/pre_build_script.sh post-script: packaging/post_build_script.sh From 1b87f0ed10d27d265fd2575dc5f9473fd083f983 Mon Sep 17 00:00:00 2001 From: Nicolas Hug Date: Wed, 23 Apr 2025 10:59:10 +0100 Subject: [PATCH 2/5] Rely on stable torch --- .github/workflows/docs.yaml | 2 +- .github/workflows/linux_cuda_wheel.yaml | 2 +- .github/workflows/linux_wheel.yaml | 2 +- .github/workflows/macos_wheel.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 3f1150721..d938da5ae 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -91,7 +91,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: | diff --git a/.github/workflows/linux_cuda_wheel.yaml b/.github/workflows/linux_cuda_wheel.yaml index 7de1d60c4..9bfc668ae 100644 --- a/.github/workflows/linux_cuda_wheel.yaml +++ b/.github/workflows/linux_cuda_wheel.yaml @@ -105,7 +105,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: | diff --git a/.github/workflows/linux_wheel.yaml b/.github/workflows/linux_wheel.yaml index 6d756e03c..35279c69f 100644 --- a/.github/workflows/linux_wheel.yaml +++ b/.github/workflows/linux_wheel.yaml @@ -81,7 +81,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"` diff --git a/.github/workflows/macos_wheel.yaml b/.github/workflows/macos_wheel.yaml index 7f4a6bab1..fb63ddaae 100644 --- a/.github/workflows/macos_wheel.yaml +++ b/.github/workflows/macos_wheel.yaml @@ -85,7 +85,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: | From 86b73f476e690ba2a029ea299753d975cedada3a Mon Sep 17 00:00:00 2001 From: Nicolas Hug Date: Wed, 23 Apr 2025 11:00:59 +0100 Subject: [PATCH 3/5] More jobs, set version --- .github/workflows/linux_cuda_wheel.yaml | 4 ++-- .github/workflows/linux_wheel.yaml | 2 +- .github/workflows/macos_wheel.yaml | 2 +- version.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/linux_cuda_wheel.yaml b/.github/workflows/linux_cuda_wheel.yaml index 9bfc668ae..460910f07 100644 --- a/.github/workflows/linux_cuda_wheel.yaml +++ b/.github/workflows/linux_cuda_wheel.yaml @@ -66,10 +66,10 @@ jobs: # PR. # For the actual release we should add that label and change this to # include more python versions. - python-version: ['3.9'] + python-version: ['3.9', '3.10', '3.11', '3.12', '3.13'] cuda-version: ['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'] + ffmpeg-version-for-tests: ['4.4.2', '5', '6', '7'] container: image: "pytorch/manylinux2_28-builder:cuda${{ matrix.cuda-version }}" diff --git a/.github/workflows/linux_wheel.yaml b/.github/workflows/linux_wheel.yaml index 35279c69f..051c7c207 100644 --- a/.github/workflows/linux_wheel.yaml +++ b/.github/workflows/linux_wheel.yaml @@ -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: diff --git a/.github/workflows/macos_wheel.yaml b/.github/workflows/macos_wheel.yaml index fb63ddaae..50626067d 100644 --- a/.github/workflows/macos_wheel.yaml +++ b/.github/workflows/macos_wheel.yaml @@ -63,7 +63,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: diff --git a/version.txt b/version.txt index 515423ed5..2eb3c4fe4 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.5.0a0 +0.5 From cb0e34ba521caa4d53e0b5a608eff1d18cd029b6 Mon Sep 17 00:00:00 2001 From: Andrey Talman Date: Thu, 10 Jul 2025 13:18:19 -0400 Subject: [PATCH 4/5] Update .github/workflows/linux_wheel.yaml --- .github/workflows/linux_wheel.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/linux_wheel.yaml b/.github/workflows/linux_wheel.yaml index 051c7c207..5167e3357 100644 --- a/.github/workflows/linux_wheel.yaml +++ b/.github/workflows/linux_wheel.yaml @@ -33,6 +33,7 @@ jobs: test-infra-repository: pytorch/test-infra test-infra-ref: release/2.7 with-xpu: disable + channel: release with-rocm: disable with-cuda: disable build-python-only: "disable" From cc20b9cb5f938310ebaafcd64b09da6d538bc987 Mon Sep 17 00:00:00 2001 From: Nicolas Hug Date: Fri, 11 Jul 2025 14:45:29 +0100 Subject: [PATCH 5/5] Use 2.7-torchcodec --- .github/workflows/build_ffmpeg.yaml | 4 ++-- .github/workflows/docs.yaml | 10 +++++----- .github/workflows/linux_cuda_wheel.yaml | 10 +++++----- .github/workflows/linux_wheel.yaml | 8 ++++---- .github/workflows/macos_wheel.yaml | 8 ++++---- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build_ffmpeg.yaml b/.github/workflows/build_ffmpeg.yaml index e5d18b2cc..a8190b61a 100644 --- a/.github/workflows/build_ffmpeg.yaml +++ b/.github/workflows/build_ffmpeg.yaml @@ -28,7 +28,7 @@ jobs: fail-fast: false matrix: ffmpeg-version: ["4.4.4", "5.1.4", "6.1.1", "7.0.1"] - uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@release/2.7 + uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@release/2.7-torchcodec permissions: id-token: write contents: read @@ -53,7 +53,7 @@ jobs: fail-fast: false matrix: ffmpeg-version: ["4.4.4", "5.1.4", "6.1.1", "7.0.1"] - uses: pytorch/test-infra/.github/workflows/macos_job.yml@release/2.7 + uses: pytorch/test-infra/.github/workflows/macos_job.yml@release/2.7-torchcodec with: job-name: Build upload-artifact: ffmpeg-lgpl-macos-${{ matrix.ffmpeg-version }} diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index d938da5ae..5c09d6f10 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -15,12 +15,12 @@ defaults: jobs: generate-matrix: - uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.7 + uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.7-torchcodec with: package-type: wheel os: linux test-infra-repository: pytorch/test-infra - test-infra-ref: release/2.7 + test-infra-ref: release/2.7-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@release/2.7 + uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@release/2.7-torchcodec with: repository: pytorch/torchcodec ref: "" test-infra-repository: pytorch/test-infra - test-infra-ref: release/2.7 + test-infra-ref: release/2.7-torchcodec build-matrix: ${{ needs.generate-matrix.outputs.matrix }} pre-script: packaging/pre_build_script.sh post-script: packaging/post_build_script.sh @@ -73,7 +73,7 @@ jobs: name: pytorch_torchcodec__${{ matrix.python-version }}_cu${{ env.cuda_version_without_periods }}_x86_64 path: pytorch/torchcodec/dist/ - name: Setup miniconda using test-infra - uses: pytorch/test-infra/.github/actions/setup-miniconda@release/2.7 + uses: pytorch/test-infra/.github/actions/setup-miniconda@release/2.7-torchcodec with: python-version: ${{ matrix.python-version }} # We install conda packages at the start because otherwise conda may have conflicts with dependencies. diff --git a/.github/workflows/linux_cuda_wheel.yaml b/.github/workflows/linux_cuda_wheel.yaml index 460910f07..d270052e1 100644 --- a/.github/workflows/linux_cuda_wheel.yaml +++ b/.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@release/2.7 + uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.7-torchcodec with: package-type: wheel os: linux test-infra-repository: pytorch/test-infra - test-infra-ref: release/2.7 + test-infra-ref: release/2.7-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@release/2.7 + uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@release/2.7-torchcodec with: repository: pytorch/torchcodec ref: "" test-infra-repository: pytorch/test-infra - test-infra-ref: release/2.7 + test-infra-ref: release/2.7-torchcodec build-matrix: ${{ needs.generate-matrix.outputs.matrix }} pre-script: packaging/pre_build_script.sh post-script: packaging/post_build_script.sh @@ -87,7 +87,7 @@ jobs: name: pytorch_torchcodec__${{ matrix.python-version }}_cu${{ env.cuda_version_without_periods }}_x86_64 path: pytorch/torchcodec/dist/ - name: Setup miniconda using test-infra - uses: pytorch/test-infra/.github/actions/setup-miniconda@release/2.7 + uses: pytorch/test-infra/.github/actions/setup-miniconda@release/2.7-torchcodec with: python-version: ${{ matrix.python-version }} # We install conda packages at the start because otherwise conda may have conflicts with dependencies. diff --git a/.github/workflows/linux_wheel.yaml b/.github/workflows/linux_wheel.yaml index 5167e3357..06c61fb06 100644 --- a/.github/workflows/linux_wheel.yaml +++ b/.github/workflows/linux_wheel.yaml @@ -26,12 +26,12 @@ defaults: jobs: generate-matrix: - uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.7 + uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.7-torchcodec with: package-type: wheel os: linux test-infra-repository: pytorch/test-infra - test-infra-ref: release/2.7 + test-infra-ref: release/2.7-torchcodec with-xpu: disable channel: release with-rocm: disable @@ -43,12 +43,12 @@ jobs: strategy: fail-fast: false name: Build and Upload Linux wheel - uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@release/2.7 + uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@release/2.7-torchcodec with: repository: pytorch/torchcodec ref: "" test-infra-repository: pytorch/test-infra - test-infra-ref: release/2.7 + test-infra-ref: release/2.7-torchcodec build-matrix: ${{ needs.generate-matrix.outputs.matrix }} pre-script: packaging/pre_build_script.sh post-script: packaging/post_build_script.sh diff --git a/.github/workflows/macos_wheel.yaml b/.github/workflows/macos_wheel.yaml index 50626067d..4ac8689c9 100644 --- a/.github/workflows/macos_wheel.yaml +++ b/.github/workflows/macos_wheel.yaml @@ -26,12 +26,12 @@ defaults: jobs: generate-matrix: - uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.7 + uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.7-torchcodec with: package-type: wheel os: macos-arm64 test-infra-repository: pytorch/test-infra - test-infra-ref: release/2.7 + test-infra-ref: release/2.7-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@release/2.7 + uses: pytorch/test-infra/.github/workflows/build_wheels_macos.yml@release/2.7-torchcodec with: repository: pytorch/torchcodec ref: "" test-infra-repository: pytorch/test-infra - test-infra-ref: release/2.7 + test-infra-ref: release/2.7-torchcodec build-matrix: ${{ needs.generate-matrix.outputs.matrix }} pre-script: packaging/pre_build_script.sh post-script: packaging/post_build_script.sh