Skip to content

Commit 34d39ed

Browse files
committed
Merge branch 'torchcodec_loading' into remove_backends
2 parents 6013c36 + 92fee51 commit 34d39ed

File tree

9 files changed

+273
-276
lines changed

9 files changed

+273
-276
lines changed

.github/scripts/unittest-linux/install.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ case $GPU_ARCH_TYPE in
7474
;;
7575
esac
7676
PYTORCH_WHEEL_INDEX="https://download.pytorch.org/whl/${UPLOAD_CHANNEL}/${GPU_ARCH_ID}"
77-
pip install --progress-bar=off --pre torch torchcodec --index-url="${PYTORCH_WHEEL_INDEX}"
77+
pip install --progress-bar=off --pre torch --index-url="${PYTORCH_WHEEL_INDEX}"
7878

7979

8080
# 2. Install torchaudio
@@ -88,7 +88,6 @@ pip install . -v --no-build-isolation
8888
printf "* Installing test tools\n"
8989
# On this CI, for whatever reason, we're only able to install ffmpeg 4.
9090
conda install -y "ffmpeg<5"
91-
python -c "import torch; import torchaudio; import torchcodec; print(torch.__version__, torchaudio.__version__, torchcodec.__version__)"
9291

9392
NUMBA_DEV_CHANNEL=""
9493
if [[ "$(python --version)" = *3.9* || "$(python --version)" = *3.10* ]]; then

.github/workflows/build_docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
6969
GPU_ARCH_ID=cu126 # This is hard-coded and must be consistent with gpu-arch-version.
7070
PYTORCH_WHEEL_INDEX="https://download.pytorch.org/whl/${CHANNEL}/${GPU_ARCH_ID}"
71-
pip install --progress-bar=off --pre torch --index-url="${PYTORCH_WHEEL_INDEX}"
71+
pip install --progress-bar=off --pre torch torchcodec --index-url="${PYTORCH_WHEEL_INDEX}"
7272
7373
echo "::endgroup::"
7474
echo "::group::Install TorchAudio"

src/torchaudio/__init__.py

Lines changed: 166 additions & 198 deletions
Large diffs are not rendered by default.

test/conftest.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import sys
2+
from pathlib import Path
3+
4+
sys.path.append(str(Path(__file__).parent.resolve()))

test/torchaudio_unittest/common_utils/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from .func_utils import torch_script
2727
from .image_utils import get_image, rgb_to_gray, rgb_to_yuv_ccir, save_image
2828
from .parameterized_utils import load_params, nested_params
29-
from torchaudio.utils.wav_utils import get_wav_data, load_wav, normalize_wav, save_wav
29+
from .wav_utils import get_wav_data, load_wav, normalize_wav, save_wav
3030
import pytest
3131

3232
class RequestMixin:

0 commit comments

Comments
 (0)