From a40672b1d69bd6220b57c909ff4571e4698325ac Mon Sep 17 00:00:00 2001 From: Nicolas Hug Date: Tue, 22 Apr 2025 14:44:53 +0100 Subject: [PATCH 1/3] Remove torchvision test dependency --- .github/workflows/linux_cuda_wheel.yaml | 2 +- .github/workflows/linux_wheel.yaml | 1 - .github/workflows/macos_wheel.yaml | 1 - .github/workflows/reference_resources.yaml | 2 +- CONTRIBUTING.md | 2 +- 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/linux_cuda_wheel.yaml b/.github/workflows/linux_cuda_wheel.yaml index a3abf1c5..eaebef3f 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 --pre torch --index-url https://download.pytorch.org/whl/nightly/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 c20d348c..1855e904 100644 --- a/.github/workflows/linux_wheel.yaml +++ b/.github/workflows/linux_wheel.yaml @@ -104,7 +104,6 @@ jobs: - name: Install test dependencies run: | - python -m pip install --pre torchvision --index-url https://download.pytorch.org/whl/nightly/cpu # Ideally we would find a way to get those dependencies from pyproject.toml python -m pip install numpy pytest pillow diff --git a/.github/workflows/macos_wheel.yaml b/.github/workflows/macos_wheel.yaml index 64448a0f..ee436b7a 100644 --- a/.github/workflows/macos_wheel.yaml +++ b/.github/workflows/macos_wheel.yaml @@ -103,7 +103,6 @@ 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 numpy pytest pillow - name: Delete the src/ folder just for fun diff --git a/.github/workflows/reference_resources.yaml b/.github/workflows/reference_resources.yaml index c3a10fef..7471134a 100644 --- a/.github/workflows/reference_resources.yaml +++ b/.github/workflows/reference_resources.yaml @@ -42,7 +42,7 @@ jobs: run: | # Note that we're installing stable - this is for running a script where we're a normal PyTorch # user, not for building TorhCodec. - python -m pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu + python -m pip install torch --index-url https://download.pytorch.org/whl/cpu python -m pip install numpy pillow - name: Check out repo diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 278090b9..af19028f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -48,7 +48,7 @@ pip install -e ".[dev]" --no-build-isolation -vv ### Running unit tests -To run python tests run (please make sure `torchvision` is installed): +To run python tests run: ```bash pytest test -vvv From 9a4304988eab681500bcf29695dfac47ee54cc4e Mon Sep 17 00:00:00 2001 From: Nicolas Hug Date: Tue, 22 Apr 2025 15:25:23 +0100 Subject: [PATCH 2/3] Put back dep for CUDA job since we run the benchmarks --- .github/workflows/linux_cuda_wheel.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux_cuda_wheel.yaml b/.github/workflows/linux_cuda_wheel.yaml index eaebef3f..a3abf1c5 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 --index-url https://download.pytorch.org/whl/nightly/cu${{ env.cuda_version_without_periods }} + ${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 -c 'import torch; print(f"{torch.__version__}"); print(f"{torch.__file__}"); print(f"{torch.cuda.is_available()=}")' - name: Install torchcodec from the wheel run: | From 2dae6ab7455371b89e0b71802442de6608a5f0f7 Mon Sep 17 00:00:00 2001 From: Nicolas Hug Date: Tue, 22 Apr 2025 17:04:21 +0100 Subject: [PATCH 3/3] empty