Skip to content

Remove libtorio #4035

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 56 commits into
base: remove_ffmpeg_util
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
2e25279
Add torchcodec mock with wav loading and saving
samanklesaria Jul 18, 2025
fe375f4
Merge branch 'main' into test_wav_hack
NicolasHug Jul 28, 2025
dd90ff3
WIP
samanklesaria Aug 11, 2025
d2ccd82
Remove libtorio ffmpeg from cmakelists
samanklesaria Aug 11, 2025
7b47628
Remove io directory
samanklesaria Aug 11, 2025
a300221
Let load and save rely on *_with_torchcodec
NicolasHug Jul 16, 2025
07e3b77
install torchcodec in doc job
NicolasHug Jul 16, 2025
92719d3
Add docstring and arguments for load and save
samanklesaria Aug 12, 2025
4a98ee5
Revise docstring
samanklesaria Aug 13, 2025
7b02754
Add typing imports
samanklesaria Aug 13, 2025
74edc0a
Try ffmpeg>4
samanklesaria Aug 13, 2025
80f5eb7
Install conda deps before pip deps
samanklesaria Aug 13, 2025
7f063a6
Add scipy hack for load and save
samanklesaria Aug 13, 2025
700c6c9
Only import scipy during testing
samanklesaria Aug 13, 2025
6995b21
Revert "Install conda deps before pip deps"
samanklesaria Aug 13, 2025
4ab5993
Revert "Try ffmpeg>4"
samanklesaria Aug 13, 2025
43c4602
Revert torchcodec installation changes
samanklesaria Aug 13, 2025
f74f004
Use existing wav_utils
samanklesaria Aug 13, 2025
89ca133
Remove _backend folder
samanklesaria Aug 13, 2025
50a538a
Merge branch 'remove_backends' into remove_io_dir
samanklesaria Aug 13, 2025
3bd3038
Merge branch 'remove_io_dir' into remove_libtorio
samanklesaria Aug 13, 2025
953fc65
Support frame_offset and num_frames in load hack
samanklesaria Aug 13, 2025
9ab06f7
Merge branch 'torchcodec_loading' into remove_backends
samanklesaria Aug 13, 2025
bea8d82
Merge branch 'remove_backends' into remove_io_dir
samanklesaria Aug 13, 2025
dd3ff90
Use rand instead of randn for test_save_channels_first
samanklesaria Aug 14, 2025
6013c36
Merge branch 'torchcodec_loading' into remove_backends
samanklesaria Aug 14, 2025
872310b
Merge branch 'remove_backends' into remove_io_dir
samanklesaria Aug 14, 2025
6e3f83e
Merge branch 'remove_io_dir' into remove_libtorio
samanklesaria Aug 14, 2025
72539b9
Merge branch 'test_wav_hack' into torchcodec_loading
samanklesaria Aug 14, 2025
c94e011
Remove pytest-aware code in src
samanklesaria Aug 14, 2025
b622d82
Remove torchcodec version check
samanklesaria Aug 14, 2025
93351a2
Fix bugs in torchcodec mock
samanklesaria Aug 14, 2025
5407163
Skip test_load_save_torchcodec
samanklesaria Aug 14, 2025
bd7eb52
Correct call to pytest skip
samanklesaria Aug 14, 2025
c3d0cc2
Remove torchcodec installation
samanklesaria Aug 14, 2025
d10fc19
Add torchcodec to build installation
samanklesaria Aug 15, 2025
92fee51
Remove redundant wav_utils
samanklesaria Aug 15, 2025
34d39ed
Merge branch 'torchcodec_loading' into remove_backends
samanklesaria Aug 15, 2025
0f6ce2d
Merge branch 'remove_backends' into remove_io_dir
samanklesaria Aug 15, 2025
a178f93
Merge branch 'remove_io_dir' into remove_libtorio
samanklesaria Aug 15, 2025
03b441e
Merge branch 'main' into remove_backends
samanklesaria Aug 18, 2025
4e0a9f1
Merge branch 'remove_backends' into remove_io_dir
samanklesaria Aug 18, 2025
ec4712d
Merge branch 'remove_io_dir' into remove_libtorio
samanklesaria Aug 18, 2025
8ac0720
Remove io export
samanklesaria Aug 18, 2025
48c7e95
Merge branch 'remove_io_dir' into remove_libtorio
samanklesaria Aug 18, 2025
6b7d78c
Remove io import
samanklesaria Aug 18, 2025
f2c21e6
Remove torchaudio.io references in docs
samanklesaria Aug 18, 2025
3e6cd31
Merge branch 'remove_io_dir' into remove_libtorio
samanklesaria Aug 18, 2025
11560ef
Merge branch 'main' into remove_libtorio
samanklesaria Aug 19, 2025
7ef8c69
Remove some torio references
samanklesaria Aug 19, 2025
a645da6
Remove sox (#4046)
samanklesaria Aug 19, 2025
b184873
Merge branch 'main' into remove_libtorio
samanklesaria Aug 19, 2025
a9123a9
Remove docs references to libtorio
samanklesaria Aug 19, 2025
6e1ff7e
FFmpeg available missing
samanklesaria Aug 19, 2025
075b613
Merge branch 'remove_ffmpeg_util' into remove_libtorio
samanklesaria Aug 19, 2025
c001763
Remove _IS_FFMPEG_AVAILABLE references
samanklesaria Aug 19, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -166,18 +166,13 @@ else()
endif()

add_subdirectory(src/libtorchaudio)
if (BUILD_SOX)
add_subdirectory(third_party/sox)
add_subdirectory(src/libtorchaudio/sox)
endif()
if (USE_FFMPEG)
if (DEFINED ENV{FFMPEG_ROOT})
add_subdirectory(third_party/ffmpeg/single)
else()
message(STATUS "Building FFmpeg integration with multi version support")
add_subdirectory(third_party/ffmpeg/multi)
endif()
add_subdirectory(src/libtorio/ffmpeg)
endif()
if (BUILD_CUDA_CTC_DECODER)
if (NOT USE_CUDA)
Expand Down
21 changes: 0 additions & 21 deletions cmake/TorchAudioHelper.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,6 @@ function(torchaudio_library name source include_dirs link_libraries compile_defs
)
endfunction()

function(torio_library name source include_dirs link_libraries compile_defs)
_library(
torio/lib
"${name}"
"${source}"
"${include_dirs}"
"${link_libraries}"
"${compile_defs}"
)
endfunction()

if (BUILD_TORCHAUDIO_PYTHON_EXTENSION)
# See https://github.com/pytorch/pytorch/issues/38122
find_library(TORCH_PYTHON_LIBRARY torch_python PATHS "${TORCH_INSTALL_PREFIX}/lib")
Expand Down Expand Up @@ -103,16 +92,6 @@ if (BUILD_TORCHAUDIO_PYTHON_EXTENSION)
"${definitions}"
)
endfunction()
function(torio_extension name sources include_dirs libraries definitions)
_extension(
torio/lib
"${name}"
"${sources}"
"${include_dirs}"
"${libraries}"
"${definitions}"
)
endfunction()
endif()


Expand Down
1 change: 0 additions & 1 deletion docs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ docset: html
# Catch-all target: route all unknown targets to Sphinx using the new
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
%: Makefile
# doxygen source/Doxyfile
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
@python post_process_dispatcher.py $(BUILDDIR)

Expand Down
Loading