Merge branch 'main' into no_wrap_ctc_decoder

Author: samanklesaria

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

@@ -34,5 +34,5 @@ fi
     export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_MOD_inflect=true
     export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_MOD_pytorch_lightning=true
     cd test
-    pytest torchaudio_unittest -k "not backend and not /io/ and not prototype and not ffmpeg and not fairseq and not hdemucs and not (torchscript and rnnt) and not torchscript_consistency"
+    pytest torchaudio_unittest -k "not torchscript and not fairseq and not demucs" 
 )

CMakeLists.txt

@@ -173,7 +173,6 @@ if (USE_FFMPEG)
     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)

CONTRIBUTING.md

@@ -61,7 +61,6 @@ Optional packages to install if you want to run related tests:
 - `librosa`
 - `requests`
 - `soundfile`
-- `kaldi_io`
 - `transformers`
 - `fairseq` (it has to be newer than `0.10.2`, so you will need to install from
   source. Commit `e6eddd80` is known to work.)

README.md

@@ -8,10 +8,10 @@ torchaudio: an audio library for PyTorch
 ![TorchAudio Logo](docs/source/_static/img/logo.png)
 
 > [!NOTE]
-> **We are in the process of refactoring TorchAudio and transitioning it into a
->  maintenance phase. This process will include removing some user-facing
->  features: those features are deprecated from TorchAudio 2.8 and will be removed in 2.9.
->  Our main goals are to reduce redundancies with the rest of the
+> **We have transitioned TorchAudio into a
+>  maintenance phase. This process removed some user-facing
+>  features. These features were deprecated from TorchAudio 2.8 and removed in 2.9.
+>  Our main goals were to reduce redundancies with the rest of the
 >  PyTorch ecosystem, make it easier to maintain, and create a version of
 >  TorchAudio that is more tightly scoped to its strengths: processing audio
 >  data for ML. Please see
@@ -27,9 +27,6 @@ processing library. The benefits of PyTorch can be seen in torchaudio through
 having all the computations be through PyTorch operations which makes it easy
 to use and feel like a natural extension.
 
-- [Support audio I/O (Load files, Save files)](http://pytorch.org/audio/main/)
-  - Load a variety of audio formats, such as `wav`, `mp3`, `ogg`, `flac`, `opus`, `sphere`, into a torch Tensor using SoX
-  - [Kaldi (ark/scp)](http://pytorch.org/audio/main/kaldi_io.html)
 - [Dataloaders for common audio datasets](http://pytorch.org/audio/main/datasets.html)
 - Audio and speech processing functions
   - [forced_align](https://pytorch.org/audio/main/generated/torchaudio.functional.forced_align.html)
@@ -70,7 +67,7 @@ If you find this package useful, please cite as:
 
 ```bibtex
 @misc{hwang2023torchaudio,
-      title={TorchAudio 2.1: Advancing speech recognition, self-supervised learning, and audio processing components for PyTorch}, 
+      title={TorchAudio 2.1: Advancing speech recognition, self-supervised learning, and audio processing components for PyTorch},
       author={Jeff Hwang and Moto Hira and Caroline Chen and Xiaohui Zhang and Zhaoheng Ni and Guangzhi Sun and Pingchuan Ma and Ruizhe Huang and Vineel Pratap and Yuekai Zhang and Anurag Kumar and Chin-Yun Yu and Chuang Zhu and Chunxi Liu and Jacob Kahn and Mirco Ravanelli and Peng Sun and Shinji Watanabe and Yangyang Shi and Yumeng Tao and Robin Scheibler and Samuele Cornell and Sean Kim and Stavros Petridis},
       year={2023},
       eprint={2310.17864},

cmake/TorchAudioHelper.cmake

@@ -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")
@@ -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()
 
 

docs/Makefile

@@ -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)