Skip to content

Commit eebb69f

Browse files
committed
Merge branch 'main' into no_scipy_hack
2 parents 0b430dd + 799d288 commit eebb69f

File tree

14 files changed

+33
-619
lines changed

14 files changed

+33
-619
lines changed

.flake8

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ignore = E203,E402,E741,W503
66

77
# Note: exclude is not honnored when flake8 is executed from pre-commit.
88
# pre-commit has a separate config
9-
exclude = build,docs/src,third_party
9+
exclude = build,docs/src
1010

1111
per-file-ignores =
1212
examples/tutorials/*.py: E501

.github/scripts/ffmpeg/build.bat

Lines changed: 0 additions & 9 deletions
This file was deleted.

.github/scripts/ffmpeg/build.sh

Lines changed: 0 additions & 163 deletions
This file was deleted.

.github/scripts/ffmpeg/build_gpu.sh

Lines changed: 0 additions & 62 deletions
This file was deleted.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ conda activate ci
99
python -m torch.utils.collect_env
1010
env | grep TORCHAUDIO || true
1111

12-
export PATH="${PWD}/third_party/install/bin/:${PATH}"
1312

1413
declare -a args=(
1514
'--continue-on-collection-errors'

.github/workflows/ffmpeg.yml

Lines changed: 0 additions & 108 deletions
This file was deleted.

.github/workflows/unittest-linux-cpu.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ jobs:
4949
conda create -c conda-forge --strict-channel-priority -y -n ci_env python="${PYTHON_VERSION}" ffmpeg="${FFMPEG_VERSION}" cmake ninja
5050
conda activate ci_env
5151
conda info
52-
conda list
5352
ffmpeg -version
5453
python -m pip install --upgrade pip
54+
# We add conda library path as otherwise torchcodec is not
55+
# able to load ffmpeg shared libraries:
5556
export LD_LIBRARY_PATH=${CONDA_PREFIX}/lib:${LD_LIBRARY_PATH}
56-
echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}"
5757
echo "::endgroup::"
5858
5959
echo "::group::Install TorchAudio test and PyTorch dependencies"
@@ -64,8 +64,6 @@ jobs:
6464
PYTORCH_WHEEL_INDEX="https://download.pytorch.org/whl/${UPLOAD_CHANNEL}/cpu"
6565
python -m pip install --pre torch torchcodec --index-url="${PYTORCH_WHEEL_INDEX}"
6666
python -c 'import torch; print(f"{torch.__version__}"); print(f"{torch.__file__}")'
67-
ls -la /opt/conda/envs/ci_env/lib/python3.11/site-packages/torchcodec/
68-
ldd /opt/conda/envs/ci_env/lib/python3.11/site-packages/torchcodec/libtorchcodec_core7.so
6967
python -c 'import torchcodec; print(f"{torchcodec.__version__}"); print(f"{torchcodec.__file__}")'
7068
echo "::endgroup::"
7169

0 commit comments

Comments
 (0)