Enable windows tests

.github/scripts/unittest-windows/environment.yml

@@ -8,7 +8,6 @@ dependencies:
   - scipy >= 1.4.1
   - pip
   - pip:
-    - PySoundFile
     - future
     - parameterized
     - dataclasses

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

@@ -50,45 +50,4 @@ printf "* Installing torchaudio\n"
 
 # 3. Install Test tools
 printf "* Installing test tools\n"
-NUMBA_DEV_CHANNEL=""
-SENTENCEPIECE_DEPENDENCY="sentencepiece"
-case "$(python --version)" in
-    *3.9*)
-        # Numba isn't available for Python 3.9 except on the numba dev channel and building from source fails
-        # See https://github.com/librosa/librosa/issues/1270#issuecomment-759065048
-        NUMBA_DEV_CHANNEL="-c numba/label/dev"
-        ;;
-    *3.10*)
-        # Don't install sentencepiece, no python 3.10 dependencies available for windows yet
-        SENTENCEPIECE_DEPENDENCY=""
-        NUMBA_DEV_CHANNEL="-c numba/label/dev"
-        ;;
-esac
-(
-    conda install -y -c conda-forge ${NUMBA_DEV_CHANNEL} parameterized 'requests>=2.20'
-    # Need to disable shell check since this'll fail out if SENTENCEPIECE_DEPENDENCY is empty
-    # shellcheck disable=SC2086
-    pip install \
-        ${SENTENCEPIECE_DEPENDENCY} \
-        Pillow \
-        SoundFile \
-        coverage \
-        expecttest \
-        inflect \
-        pytest \
-        pytest-cov \
-        pytorch-lightning \
-        'scipy==1.7.3' \
-        unidecode \
-        'protobuf<4.21.0' \
-        demucs \
-        tinytag \
-        pyroomacoustics \
-        flashlight-text \
-        git+https://github.com/kpu/kenlm/
-)
-# Install fairseq
-git clone https://github.com/pytorch/fairseq
-cd fairseq
-git checkout e47a4c8
-pip install .
+pip install parameterized requests coverage pytest pytest-cov scipy numpy expecttest

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

@@ -1,52 +1,52 @@
-# name: Unittests on Windows CPU
+name: Unittests on Windows CPU
 
-# on:
-#   pull_request:
-#   push:
-#     branches:
-#       - nightly
-#       - main
-#       - release/*
-#   workflow_dispatch:
+on:
+  pull_request:
+  push:
+    branches:
+      - nightly
+      - main
+      - release/*
+  workflow_dispatch:
 
-# jobs:
-#   unittests-windows-cpu:
-#     uses: pytorch/test-infra/.github/workflows/windows_job.yml@main
-#     with:
-#       repository: pytorch/audio
-#       runner: windows.4xlarge
-#       timeout: 180
-#       script: |
-#         # Mark Build Directory Safe
-#         git config --global --add safe.directory /__w/audio/audio
+jobs:
+  unittests-windows-cpu:
+    uses: pytorch/test-infra/.github/workflows/windows_job.yml@main
+    with:
+      repository: pytorch/audio
+      runner: windows.4xlarge
+      timeout: 180
+      script: |
+        # Mark Build Directory Safe
+        git config --global --add safe.directory /__w/audio/audio
 
-#         # Set up Environment Variables
-#         export PYTHON_VERSION="3.9"
-#         unset CUDA_VERSION
+        # Set up Environment Variables
+        export PYTHON_VERSION="3.9"
+        unset CUDA_VERSION
 
-#         # Set CHANNEL
-#         if [[(${GITHUB_EVENT_NAME} = 'pull_request' && (${GITHUB_BASE_REF} = 'release'*)) || (${GITHUB_REF} = 'refs/heads/release'*) ]]; then
-#           export UPLOAD_CHANNEL=test
-#         else
-#           export UPLOAD_CHANNEL=nightly
-#         fi
+        # Set CHANNEL
+        if [[(${GITHUB_EVENT_NAME} = 'pull_request' && (${GITHUB_BASE_REF} = 'release'*)) || (${GITHUB_REF} = 'refs/heads/release'*) ]]; then
+          export UPLOAD_CHANNEL=test
+        else
+          export UPLOAD_CHANNEL=nightly
+        fi
 
-#         export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_APPLY_CMVN_SLIDING=true
-#         export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_COMPUTE_FBANK_FEATS=true
-#         export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_COMPUTE_KALDI_PITCH_FEATS=true
-#         export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_COMPUTE_MFCC_FEATS=true
-#         export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_COMPUTE_SPECTROGRAM_FEATS=true
-#         export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_SOX=true
-#         export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CUDA=true
-#         export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_HW_ACCEL=true
-#         export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_KALDI=true
-#         export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_SOX=true
-#         export TORCHAUDIO_TEST_ALLOW_SKIP_IF_ON_PYTHON_310=true
-#         export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_MOD_sentencepiece=true
-#         export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_AUDIO_OUT_DEVICE=true
-#         export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_MACOS=true
-#         export TORCHAUDIO_TEST_ALLOW_SKIP_IF_TEMPORARY_DISABLED=true
+        export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_APPLY_CMVN_SLIDING=true
+        export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_COMPUTE_FBANK_FEATS=true
+        export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_COMPUTE_KALDI_PITCH_FEATS=true
+        export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_COMPUTE_MFCC_FEATS=true
+        export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_COMPUTE_SPECTROGRAM_FEATS=true
+        export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_SOX=true
+        export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CUDA=true
+        export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_HW_ACCEL=true
+        export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_KALDI=true
+        export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_SOX=true
+        export TORCHAUDIO_TEST_ALLOW_SKIP_IF_ON_PYTHON_310=true
+        export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_MOD_sentencepiece=true
+        export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_AUDIO_OUT_DEVICE=true
+        export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_MACOS=true
+        export TORCHAUDIO_TEST_ALLOW_SKIP_IF_TEMPORARY_DISABLED=true
 
-#         .github/scripts/unittest-windows/setup_env.sh
-#         .github/scripts/unittest-windows/install.sh
-#         .github/scripts/unittest-windows/run_test.sh
+        .github/scripts/unittest-windows/setup_env.sh
+        .github/scripts/unittest-windows/install.sh
+        .github/scripts/unittest-windows/run_test.sh

.github/workflows/unittest-windows-gpu.yml

@@ -1,52 +1,52 @@
-# name: Unittests on Windows GPU
+name: Unittests on Windows GPU
 
-# on:
-#   pull_request:
-#   push:
-#     branches:
-#       - nightly
-#       - main
-#       - release/*
-#   workflow_dispatch:
+on:
+  pull_request:
+  push:
+    branches:
+      - nightly
+      - main
+      - release/*
+  workflow_dispatch:
 
-# jobs:
-#   unittests-windows-gpu:
-#     uses: pytorch/test-infra/.github/workflows/windows_job.yml@main
-#     with:
-#       repository: pytorch/audio
-#       runner: windows.g5.4xlarge.nvidia.gpu
-#       timeout: 360
-#       script: |
-#         # Mark Build Directory Safe
-#         git config --global --add safe.directory /__w/audio/audio
+jobs:
+  unittests-windows-gpu:
+    uses: pytorch/test-infra/.github/workflows/windows_job.yml@main
+    with:
+      repository: pytorch/audio
+      runner: windows.g5.4xlarge.nvidia.gpu
+      timeout: 360
+      script: |
+        # Mark Build Directory Safe
+        git config --global --add safe.directory /__w/audio/audio
 
-#         # Set up Environment Variables
-#         export PYTHON_VERSION="3.9"
-#         export CUDA_VERSION=12.6
+        # Set up Environment Variables
+        export PYTHON_VERSION="3.9"
+        export CUDA_VERSION=12.6
 
-#         # Set CHANNEL
-#         if [[(${GITHUB_EVENT_NAME} = 'pull_request' && (${GITHUB_BASE_REF} = 'release'*)) || (${GITHUB_REF} = 'refs/heads/release'*) ]]; then
-#           export UPLOAD_CHANNEL=test
-#         else
-#           export UPLOAD_CHANNEL=nightly
-#         fi
+        # Set CHANNEL
+        if [[(${GITHUB_EVENT_NAME} = 'pull_request' && (${GITHUB_BASE_REF} = 'release'*)) || (${GITHUB_REF} = 'refs/heads/release'*) ]]; then
+          export UPLOAD_CHANNEL=test
+        else
+          export UPLOAD_CHANNEL=nightly
+        fi
 
-#         export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_APPLY_CMVN_SLIDING=true
-#         export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_COMPUTE_FBANK_FEATS=true
-#         export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_COMPUTE_KALDI_PITCH_FEATS=true
-#         export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_COMPUTE_MFCC_FEATS=true
-#         export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_COMPUTE_SPECTROGRAM_FEATS=true
-#         export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_SOX=true
-#         export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_KALDI=true
-#         export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_SOX=true
-#         export TORCHAUDIO_TEST_ALLOW_SKIP_IF_ON_PYTHON_310=true
-#         export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_MOD_sentencepiece=true
-#         export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_AUDIO_OUT_DEVICE=true
-#         export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_MACOS=true
-#         export TORCHAUDIO_TEST_ALLOW_SKIP_IF_CUDA_SMALL_MEMORY=true
-#         export TORCHAUDIO_TEST_ALLOW_SKIP_IF_TEMPORARY_DISABLED=true
+        export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_APPLY_CMVN_SLIDING=true
+        export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_COMPUTE_FBANK_FEATS=true
+        export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_COMPUTE_KALDI_PITCH_FEATS=true
+        export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_COMPUTE_MFCC_FEATS=true
+        export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_COMPUTE_SPECTROGRAM_FEATS=true
+        export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_SOX=true
+        export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_KALDI=true
+        export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_SOX=true
+        export TORCHAUDIO_TEST_ALLOW_SKIP_IF_ON_PYTHON_310=true
+        export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_MOD_sentencepiece=true
+        export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_AUDIO_OUT_DEVICE=true
+        export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_MACOS=true
+        export TORCHAUDIO_TEST_ALLOW_SKIP_IF_CUDA_SMALL_MEMORY=true
+        export TORCHAUDIO_TEST_ALLOW_SKIP_IF_TEMPORARY_DISABLED=true
 
 
-#         .github/scripts/unittest-windows/setup_env.sh
-#         .github/scripts/unittest-windows/install.sh
-#         .github/scripts/unittest-windows/run_test.sh
+        .github/scripts/unittest-windows/setup_env.sh
+        .github/scripts/unittest-windows/install.sh
+        .github/scripts/unittest-windows/run_test.sh

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

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)