From ab4240287cd2800a6e0bdbbb15866391c494cc8f Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Wed, 3 Sep 2025 13:01:03 +0300 Subject: [PATCH 01/40] [DEBUG] setup_env.sh issue in activating conda environment --- .github/scripts/unittest-windows/setup_env.sh | 11 ++- .github/workflows/unittest-windows-cpu.yml | 90 +++++++++---------- 2 files changed, 54 insertions(+), 47 deletions(-) diff --git a/.github/scripts/unittest-windows/setup_env.sh b/.github/scripts/unittest-windows/setup_env.sh index 88ac15ca5c..bb50f53d06 100644 --- a/.github/scripts/unittest-windows/setup_env.sh +++ b/.github/scripts/unittest-windows/setup_env.sh @@ -13,7 +13,9 @@ conda_dir="${root_dir}/conda" env_dir="${root_dir}/env" cd "${root_dir}" - +echo "1: Content of root_dir: $(ls ${root_dir})" +echo "1: Content of env_dir: $(ls ${env_dir})" +echo "1: Content of conda_dir: $(ls ${conda_dir})" # 1. Install conda at ./conda if [ ! -d "${conda_dir}" ]; then printf "* Installing conda\n" @@ -21,9 +23,14 @@ if [ ! -d "${conda_dir}" ]; then export miniconda_exe="$(echo $root_dir | tr '/' '\\')\\miniconda.exe" curl --silent --output miniconda.exe https://repo.anaconda.com/miniconda/Miniconda3-latest-Windows-x86_64.exe -O "$this_dir/install_conda.bat" + echo "2: Content of conda_dir: $(ls ${conda_dir})" unset tmp_conda unset miniconda_exe fi + +echo "2: Content of conda_dir: $(ls ${conda_dir})" +echo "2: Content of conda_dir/Scripts: $(ls ${conda_dir}/Scripts)" + eval "$("${conda_dir}/Scripts/conda.exe" 'shell.bash' 'hook')" # 2. Create test environment at ./env @@ -35,4 +42,4 @@ conda activate "${env_dir}" # 3. Install minimal build tools pip --quiet install cmake ninja -conda install --quiet -y 'ffmpeg>=4.1' +# conda install --quiet -y 'ffmpeg>=4.1' diff --git a/.github/workflows/unittest-windows-cpu.yml b/.github/workflows/unittest-windows-cpu.yml index a0e3cc93d2..67790aef18 100644 --- a/.github/workflows/unittest-windows-cpu.yml +++ b/.github/workflows/unittest-windows-cpu.yml @@ -1,52 +1,52 @@ # 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 From 72ff6beb23bb9be3683a5dd607d33e7410a21c09 Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Wed, 3 Sep 2025 13:12:27 +0300 Subject: [PATCH 02/40] Fix conda path to use _conda.exe --- .github/scripts/unittest-windows/setup_env.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/scripts/unittest-windows/setup_env.sh b/.github/scripts/unittest-windows/setup_env.sh index bb50f53d06..fb5eaf39a8 100644 --- a/.github/scripts/unittest-windows/setup_env.sh +++ b/.github/scripts/unittest-windows/setup_env.sh @@ -13,9 +13,6 @@ conda_dir="${root_dir}/conda" env_dir="${root_dir}/env" cd "${root_dir}" -echo "1: Content of root_dir: $(ls ${root_dir})" -echo "1: Content of env_dir: $(ls ${env_dir})" -echo "1: Content of conda_dir: $(ls ${conda_dir})" # 1. Install conda at ./conda if [ ! -d "${conda_dir}" ]; then printf "* Installing conda\n" @@ -23,15 +20,13 @@ if [ ! -d "${conda_dir}" ]; then export miniconda_exe="$(echo $root_dir | tr '/' '\\')\\miniconda.exe" curl --silent --output miniconda.exe https://repo.anaconda.com/miniconda/Miniconda3-latest-Windows-x86_64.exe -O "$this_dir/install_conda.bat" - echo "2: Content of conda_dir: $(ls ${conda_dir})" unset tmp_conda unset miniconda_exe fi echo "2: Content of conda_dir: $(ls ${conda_dir})" -echo "2: Content of conda_dir/Scripts: $(ls ${conda_dir}/Scripts)" -eval "$("${conda_dir}/Scripts/conda.exe" 'shell.bash' 'hook')" +eval "$("${conda_dir}/_conda.exe" 'shell.bash' 'hook')" # 2. Create test environment at ./env if [ ! -d "${env_dir}" ]; then From f0866f276bd74df7a7c60865359c6fcbd0d860a0 Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Wed, 3 Sep 2025 13:28:31 +0300 Subject: [PATCH 03/40] disable silent miniconda installation --- .github/scripts/unittest-windows/install_conda.bat | 2 +- .github/scripts/unittest-windows/setup_env.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/scripts/unittest-windows/install_conda.bat b/.github/scripts/unittest-windows/install_conda.bat index 6052ad08b1..ac0b59d059 100644 --- a/.github/scripts/unittest-windows/install_conda.bat +++ b/.github/scripts/unittest-windows/install_conda.bat @@ -1 +1 @@ -start /wait "" "%miniconda_exe%" /S /InstallationType=JustMe /RegisterPython=0 /AddToPath=0 /D=%tmp_conda% +start /wait "" "%miniconda_exe%" /InstallationType=JustMe /RegisterPython=0 /AddToPath=0 /D=%tmp_conda% diff --git a/.github/scripts/unittest-windows/setup_env.sh b/.github/scripts/unittest-windows/setup_env.sh index fb5eaf39a8..8c7c142162 100644 --- a/.github/scripts/unittest-windows/setup_env.sh +++ b/.github/scripts/unittest-windows/setup_env.sh @@ -13,12 +13,16 @@ conda_dir="${root_dir}/conda" env_dir="${root_dir}/env" cd "${root_dir}" + +echo "1: Content of conda_dir: $(ls ${conda_dir})" + # 1. Install conda at ./conda if [ ! -d "${conda_dir}" ]; then printf "* Installing conda\n" export tmp_conda="$(echo $conda_dir | tr '/' '\\')" export miniconda_exe="$(echo $root_dir | tr '/' '\\')\\miniconda.exe" curl --silent --output miniconda.exe https://repo.anaconda.com/miniconda/Miniconda3-latest-Windows-x86_64.exe -O + echo "1: Content of root_dir: $(ls ${root_dir})" "$this_dir/install_conda.bat" unset tmp_conda unset miniconda_exe From ed011c238f0b7e9b6ccc6755504beb4e66be26e5 Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Wed, 3 Sep 2025 13:48:00 +0300 Subject: [PATCH 04/40] undo last commit --- .github/scripts/unittest-windows/install_conda.bat | 2 +- .github/scripts/unittest-windows/setup_env.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/scripts/unittest-windows/install_conda.bat b/.github/scripts/unittest-windows/install_conda.bat index ac0b59d059..6052ad08b1 100644 --- a/.github/scripts/unittest-windows/install_conda.bat +++ b/.github/scripts/unittest-windows/install_conda.bat @@ -1 +1 @@ -start /wait "" "%miniconda_exe%" /InstallationType=JustMe /RegisterPython=0 /AddToPath=0 /D=%tmp_conda% +start /wait "" "%miniconda_exe%" /S /InstallationType=JustMe /RegisterPython=0 /AddToPath=0 /D=%tmp_conda% diff --git a/.github/scripts/unittest-windows/setup_env.sh b/.github/scripts/unittest-windows/setup_env.sh index 8c7c142162..89e841dd2e 100644 --- a/.github/scripts/unittest-windows/setup_env.sh +++ b/.github/scripts/unittest-windows/setup_env.sh @@ -29,6 +29,7 @@ if [ ! -d "${conda_dir}" ]; then fi echo "2: Content of conda_dir: $(ls ${conda_dir})" +echo "2: Content of conda_dir/bin: $(ls ${conda_dir}/bin)" eval "$("${conda_dir}/_conda.exe" 'shell.bash' 'hook')" From 7e86b11575a572d11adcc2767b6255a7b8b50d04 Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Wed, 3 Sep 2025 13:59:04 +0300 Subject: [PATCH 05/40] Use previous version of miniconda --- .github/scripts/unittest-windows/setup_env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/unittest-windows/setup_env.sh b/.github/scripts/unittest-windows/setup_env.sh index 89e841dd2e..af4dd987cf 100644 --- a/.github/scripts/unittest-windows/setup_env.sh +++ b/.github/scripts/unittest-windows/setup_env.sh @@ -21,7 +21,7 @@ if [ ! -d "${conda_dir}" ]; then printf "* Installing conda\n" export tmp_conda="$(echo $conda_dir | tr '/' '\\')" export miniconda_exe="$(echo $root_dir | tr '/' '\\')\\miniconda.exe" - curl --silent --output miniconda.exe https://repo.anaconda.com/miniconda/Miniconda3-latest-Windows-x86_64.exe -O + curl --silent --output miniconda.exe https://repo.anaconda.com/miniconda/Miniconda3-py313_25.5.1-1-Windows-x86_64.exe -O echo "1: Content of root_dir: $(ls ${root_dir})" "$this_dir/install_conda.bat" unset tmp_conda From bd2c3a11398c80b3b11cb2a51b0d3801396fc092 Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Wed, 3 Sep 2025 14:09:11 +0300 Subject: [PATCH 06/40] Use py3.9 of miniconda --- .github/scripts/unittest-windows/setup_env.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/scripts/unittest-windows/setup_env.sh b/.github/scripts/unittest-windows/setup_env.sh index af4dd987cf..10f168d196 100644 --- a/.github/scripts/unittest-windows/setup_env.sh +++ b/.github/scripts/unittest-windows/setup_env.sh @@ -14,6 +14,7 @@ env_dir="${root_dir}/env" cd "${root_dir}" +echo "1: Content of root_dir: $(ls ${root_dir})" echo "1: Content of conda_dir: $(ls ${conda_dir})" # 1. Install conda at ./conda @@ -21,9 +22,9 @@ if [ ! -d "${conda_dir}" ]; then printf "* Installing conda\n" export tmp_conda="$(echo $conda_dir | tr '/' '\\')" export miniconda_exe="$(echo $root_dir | tr '/' '\\')\\miniconda.exe" - curl --silent --output miniconda.exe https://repo.anaconda.com/miniconda/Miniconda3-py313_25.5.1-1-Windows-x86_64.exe -O - echo "1: Content of root_dir: $(ls ${root_dir})" + curl --silent --output miniconda.exe https://repo.anaconda.com/miniconda/Miniconda3-py39_25.7.0-2-Windows-x86_64.exe -O "$this_dir/install_conda.bat" + echo "2: Content of root_dir: $(ls ${root_dir})" unset tmp_conda unset miniconda_exe fi From 621ee703d39e49f8e225c110e37b811ee3db4b92 Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Wed, 3 Sep 2025 14:21:01 +0300 Subject: [PATCH 07/40] Peak into Lib --- .github/scripts/unittest-windows/setup_env.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/scripts/unittest-windows/setup_env.sh b/.github/scripts/unittest-windows/setup_env.sh index 10f168d196..5acbbe56bc 100644 --- a/.github/scripts/unittest-windows/setup_env.sh +++ b/.github/scripts/unittest-windows/setup_env.sh @@ -14,9 +14,6 @@ env_dir="${root_dir}/env" cd "${root_dir}" -echo "1: Content of root_dir: $(ls ${root_dir})" -echo "1: Content of conda_dir: $(ls ${conda_dir})" - # 1. Install conda at ./conda if [ ! -d "${conda_dir}" ]; then printf "* Installing conda\n" @@ -24,13 +21,12 @@ if [ ! -d "${conda_dir}" ]; then export miniconda_exe="$(echo $root_dir | tr '/' '\\')\\miniconda.exe" curl --silent --output miniconda.exe https://repo.anaconda.com/miniconda/Miniconda3-py39_25.7.0-2-Windows-x86_64.exe -O "$this_dir/install_conda.bat" - echo "2: Content of root_dir: $(ls ${root_dir})" unset tmp_conda unset miniconda_exe fi echo "2: Content of conda_dir: $(ls ${conda_dir})" -echo "2: Content of conda_dir/bin: $(ls ${conda_dir}/bin)" +echo "2: Content of conda_dir/Lib: $(ls ${conda_dir}/Lib)" eval "$("${conda_dir}/_conda.exe" 'shell.bash' 'hook')" From 2cd0ef164926b83f7e1b35f880649b93f7af9757 Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Wed, 3 Sep 2025 14:27:27 +0300 Subject: [PATCH 08/40] Move /S to the end in starting installer. --- .github/scripts/unittest-windows/install_conda.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/unittest-windows/install_conda.bat b/.github/scripts/unittest-windows/install_conda.bat index 6052ad08b1..200d0d4d69 100644 --- a/.github/scripts/unittest-windows/install_conda.bat +++ b/.github/scripts/unittest-windows/install_conda.bat @@ -1 +1 @@ -start /wait "" "%miniconda_exe%" /S /InstallationType=JustMe /RegisterPython=0 /AddToPath=0 /D=%tmp_conda% +start /wait "" "%miniconda_exe%" /InstallationType=JustMe /RegisterPython=0 /AddToPath=0 /S /D=%tmp_conda% From db80ae41c2ce2d1b2d18998fa56b261b8549d525 Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Wed, 3 Sep 2025 14:33:52 +0300 Subject: [PATCH 09/40] Show errorlevel. --- .github/scripts/unittest-windows/install_conda.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/scripts/unittest-windows/install_conda.bat b/.github/scripts/unittest-windows/install_conda.bat index 200d0d4d69..d4c64bf411 100644 --- a/.github/scripts/unittest-windows/install_conda.bat +++ b/.github/scripts/unittest-windows/install_conda.bat @@ -1 +1,2 @@ start /wait "" "%miniconda_exe%" /InstallationType=JustMe /RegisterPython=0 /AddToPath=0 /S /D=%tmp_conda% +echo Errorlevel: [%errorlevel%] From 5f0a62f1478927f5de3119ec54cc6c7744e98d1e Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Wed, 3 Sep 2025 15:32:09 +0300 Subject: [PATCH 10/40] Use Power-Shell Start-Process --- .github/scripts/unittest-windows/install_conda.bat | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/scripts/unittest-windows/install_conda.bat b/.github/scripts/unittest-windows/install_conda.bat index d4c64bf411..815bf1af6d 100644 --- a/.github/scripts/unittest-windows/install_conda.bat +++ b/.github/scripts/unittest-windows/install_conda.bat @@ -1,2 +1 @@ -start /wait "" "%miniconda_exe%" /InstallationType=JustMe /RegisterPython=0 /AddToPath=0 /S /D=%tmp_conda% -echo Errorlevel: [%errorlevel%] +Start-Process -FilePath %miniconda_exe% -ArgumentList "/S /InstallationType=AllUsers /AddToPath=0 /D=%tmp_conda%" -NoNewWindow -Wait From 3b0c7e780e26c99e2c027c2fcda90cfd168e3e8d Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Wed, 3 Sep 2025 15:45:17 +0300 Subject: [PATCH 11/40] Use shorted /D argument --- .github/scripts/unittest-windows/install_conda.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/unittest-windows/install_conda.bat b/.github/scripts/unittest-windows/install_conda.bat index 815bf1af6d..c251a353c1 100644 --- a/.github/scripts/unittest-windows/install_conda.bat +++ b/.github/scripts/unittest-windows/install_conda.bat @@ -1 +1 @@ -Start-Process -FilePath %miniconda_exe% -ArgumentList "/S /InstallationType=AllUsers /AddToPath=0 /D=%tmp_conda%" -NoNewWindow -Wait +start /wait "" "%miniconda_exe%" /S /InstallationType=JustMe /RegisterPython=0 /AddToPath=1 /D=conda From 229512c6362360219c5956cc475773e7ad67a788 Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Wed, 3 Sep 2025 15:54:44 +0300 Subject: [PATCH 12/40] rename conda_dir --- .github/scripts/unittest-windows/install_conda.bat | 2 +- .github/scripts/unittest-windows/setup_env.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/scripts/unittest-windows/install_conda.bat b/.github/scripts/unittest-windows/install_conda.bat index c251a353c1..71fdd57e78 100644 --- a/.github/scripts/unittest-windows/install_conda.bat +++ b/.github/scripts/unittest-windows/install_conda.bat @@ -1 +1 @@ -start /wait "" "%miniconda_exe%" /S /InstallationType=JustMe /RegisterPython=0 /AddToPath=1 /D=conda +start /wait "" "%miniconda_exe%" /S /InstallationType=JustMe /RegisterPython=0 /AddToPath=1 /D=%tmp_conda% diff --git a/.github/scripts/unittest-windows/setup_env.sh b/.github/scripts/unittest-windows/setup_env.sh index 5acbbe56bc..455098b162 100644 --- a/.github/scripts/unittest-windows/setup_env.sh +++ b/.github/scripts/unittest-windows/setup_env.sh @@ -9,7 +9,7 @@ set -euxo pipefail this_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" root_dir="$(git rev-parse --show-toplevel)" -conda_dir="${root_dir}/conda" +conda_dir="${root_dir}/conda_" env_dir="${root_dir}/env" cd "${root_dir}" @@ -18,9 +18,11 @@ cd "${root_dir}" if [ ! -d "${conda_dir}" ]; then printf "* Installing conda\n" export tmp_conda="$(echo $conda_dir | tr '/' '\\')" + echo "tmp_conda=$tmp_conda" export miniconda_exe="$(echo $root_dir | tr '/' '\\')\\miniconda.exe" curl --silent --output miniconda.exe https://repo.anaconda.com/miniconda/Miniconda3-py39_25.7.0-2-Windows-x86_64.exe -O "$this_dir/install_conda.bat" + echo "2: Content of tmp_conda: $(ls ${tmp_conda})" unset tmp_conda unset miniconda_exe fi From c60b4ebbcf364c99a186ecef3c9a744fe21464e8 Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Wed, 3 Sep 2025 16:01:59 +0300 Subject: [PATCH 13/40] Shorten conda_dir --- .github/scripts/unittest-windows/setup_env.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/scripts/unittest-windows/setup_env.sh b/.github/scripts/unittest-windows/setup_env.sh index 455098b162..fc4ffe48be 100644 --- a/.github/scripts/unittest-windows/setup_env.sh +++ b/.github/scripts/unittest-windows/setup_env.sh @@ -9,9 +9,9 @@ set -euxo pipefail this_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" root_dir="$(git rev-parse --show-toplevel)" -conda_dir="${root_dir}/conda_" +conda_dir=$(realpath "${root_dir}/../../../myconda") env_dir="${root_dir}/env" - +echo "conda_dir=$conda_dir" cd "${root_dir}" # 1. Install conda at ./conda @@ -30,7 +30,7 @@ fi echo "2: Content of conda_dir: $(ls ${conda_dir})" echo "2: Content of conda_dir/Lib: $(ls ${conda_dir}/Lib)" -eval "$("${conda_dir}/_conda.exe" 'shell.bash' 'hook')" +eval "$("${conda_dir}/Scripts/conda.exe" 'shell.bash' 'hook')" # 2. Create test environment at ./env if [ ! -d "${env_dir}" ]; then From 757f7cb9df017cd4b58272e6954a9a4502b4cf3e Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Wed, 3 Sep 2025 16:18:49 +0300 Subject: [PATCH 14/40] Use miniconda v24.11 --- .github/scripts/unittest-windows/setup_env.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/scripts/unittest-windows/setup_env.sh b/.github/scripts/unittest-windows/setup_env.sh index fc4ffe48be..f2220e054f 100644 --- a/.github/scripts/unittest-windows/setup_env.sh +++ b/.github/scripts/unittest-windows/setup_env.sh @@ -9,7 +9,7 @@ set -euxo pipefail this_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" root_dir="$(git rev-parse --show-toplevel)" -conda_dir=$(realpath "${root_dir}/../../../myconda") +conda_dir="${root_dir}/conda" env_dir="${root_dir}/env" echo "conda_dir=$conda_dir" cd "${root_dir}" @@ -20,7 +20,7 @@ if [ ! -d "${conda_dir}" ]; then export tmp_conda="$(echo $conda_dir | tr '/' '\\')" echo "tmp_conda=$tmp_conda" export miniconda_exe="$(echo $root_dir | tr '/' '\\')\\miniconda.exe" - curl --silent --output miniconda.exe https://repo.anaconda.com/miniconda/Miniconda3-py39_25.7.0-2-Windows-x86_64.exe -O + curl --silent --output miniconda.exe https://repo.anaconda.com/miniconda/Miniconda3-py39_24.11.1-0-Windows-x86_64.exe -O "$this_dir/install_conda.bat" echo "2: Content of tmp_conda: $(ls ${tmp_conda})" unset tmp_conda From 2827acdf0027e117bc1bceb23774291d65c0b056 Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Wed, 3 Sep 2025 16:28:53 +0300 Subject: [PATCH 15/40] Check diskspace --- .github/scripts/unittest-windows/install_conda.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/scripts/unittest-windows/install_conda.bat b/.github/scripts/unittest-windows/install_conda.bat index 71fdd57e78..cc2b1290e8 100644 --- a/.github/scripts/unittest-windows/install_conda.bat +++ b/.github/scripts/unittest-windows/install_conda.bat @@ -1 +1,2 @@ +dir C:\ start /wait "" "%miniconda_exe%" /S /InstallationType=JustMe /RegisterPython=0 /AddToPath=1 /D=%tmp_conda% From 0cd966518984d8544b287c668f9989bcd7e3df6b Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Wed, 3 Sep 2025 16:33:47 +0300 Subject: [PATCH 16/40] Try miniforge. --- .github/scripts/unittest-windows/setup_env.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/scripts/unittest-windows/setup_env.sh b/.github/scripts/unittest-windows/setup_env.sh index f2220e054f..3c18834bb1 100644 --- a/.github/scripts/unittest-windows/setup_env.sh +++ b/.github/scripts/unittest-windows/setup_env.sh @@ -20,7 +20,8 @@ if [ ! -d "${conda_dir}" ]; then export tmp_conda="$(echo $conda_dir | tr '/' '\\')" echo "tmp_conda=$tmp_conda" export miniconda_exe="$(echo $root_dir | tr '/' '\\')\\miniconda.exe" - curl --silent --output miniconda.exe https://repo.anaconda.com/miniconda/Miniconda3-py39_24.11.1-0-Windows-x86_64.exe -O + curl --silent --output miniconda.exe https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe -O + # curl --silent --output miniconda.exe https://repo.anaconda.com/miniconda/Miniconda3-py39_24.11.1-0-Windows-x86_64.exe -O "$this_dir/install_conda.bat" echo "2: Content of tmp_conda: $(ls ${tmp_conda})" unset tmp_conda From d0f1dbed65eb755f86ecae45c19c7012fe5d295d Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Wed, 3 Sep 2025 16:38:16 +0300 Subject: [PATCH 17/40] Add check path length --- .github/scripts/unittest-windows/install_conda.bat | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/scripts/unittest-windows/install_conda.bat b/.github/scripts/unittest-windows/install_conda.bat index cc2b1290e8..9e7b6e1205 100644 --- a/.github/scripts/unittest-windows/install_conda.bat +++ b/.github/scripts/unittest-windows/install_conda.bat @@ -1,2 +1 @@ -dir C:\ -start /wait "" "%miniconda_exe%" /S /InstallationType=JustMe /RegisterPython=0 /AddToPath=1 /D=%tmp_conda% +start /wait "" "%miniconda_exe%" /S /InstallationType=JustMe /RegisterPython=0 /AddToPath=1 /CheckPathLength=1 /D=%tmp_conda% From 9cc16c7b26419a8a9a21214b1bf035766ce2c6b3 Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Wed, 3 Sep 2025 17:04:23 +0300 Subject: [PATCH 18/40] Check if curl is downloading anything --- .github/scripts/unittest-windows/install_conda.bat | 2 +- .github/scripts/unittest-windows/setup_env.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/scripts/unittest-windows/install_conda.bat b/.github/scripts/unittest-windows/install_conda.bat index 9e7b6e1205..71fdd57e78 100644 --- a/.github/scripts/unittest-windows/install_conda.bat +++ b/.github/scripts/unittest-windows/install_conda.bat @@ -1 +1 @@ -start /wait "" "%miniconda_exe%" /S /InstallationType=JustMe /RegisterPython=0 /AddToPath=1 /CheckPathLength=1 /D=%tmp_conda% +start /wait "" "%miniconda_exe%" /S /InstallationType=JustMe /RegisterPython=0 /AddToPath=1 /D=%tmp_conda% diff --git a/.github/scripts/unittest-windows/setup_env.sh b/.github/scripts/unittest-windows/setup_env.sh index 3c18834bb1..1f9a48597c 100644 --- a/.github/scripts/unittest-windows/setup_env.sh +++ b/.github/scripts/unittest-windows/setup_env.sh @@ -21,6 +21,7 @@ if [ ! -d "${conda_dir}" ]; then echo "tmp_conda=$tmp_conda" export miniconda_exe="$(echo $root_dir | tr '/' '\\')\\miniconda.exe" curl --silent --output miniconda.exe https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe -O + ls -la $miniconda.exe # curl --silent --output miniconda.exe https://repo.anaconda.com/miniconda/Miniconda3-py39_24.11.1-0-Windows-x86_64.exe -O "$this_dir/install_conda.bat" echo "2: Content of tmp_conda: $(ls ${tmp_conda})" From 9eb608d3313f847de8e3f40e5286a7c9e11ade83 Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Wed, 3 Sep 2025 17:20:01 +0300 Subject: [PATCH 19/40] Use curl -L --- .github/scripts/unittest-windows/setup_env.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/scripts/unittest-windows/setup_env.sh b/.github/scripts/unittest-windows/setup_env.sh index 1f9a48597c..4e0630b1ad 100644 --- a/.github/scripts/unittest-windows/setup_env.sh +++ b/.github/scripts/unittest-windows/setup_env.sh @@ -18,9 +18,8 @@ cd "${root_dir}" if [ ! -d "${conda_dir}" ]; then printf "* Installing conda\n" export tmp_conda="$(echo $conda_dir | tr '/' '\\')" - echo "tmp_conda=$tmp_conda" export miniconda_exe="$(echo $root_dir | tr '/' '\\')\\miniconda.exe" - curl --silent --output miniconda.exe https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe -O + curl -L --silent --output miniconda.exe https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe -O ls -la $miniconda.exe # curl --silent --output miniconda.exe https://repo.anaconda.com/miniconda/Miniconda3-py39_24.11.1-0-Windows-x86_64.exe -O "$this_dir/install_conda.bat" From c5bd4081b8dcd38cc7cc8c9049c1db7e0130409e Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Wed, 3 Sep 2025 17:20:55 +0300 Subject: [PATCH 20/40] Use curl -L --- .github/scripts/unittest-windows/setup_env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/unittest-windows/setup_env.sh b/.github/scripts/unittest-windows/setup_env.sh index 4e0630b1ad..300aa289f6 100644 --- a/.github/scripts/unittest-windows/setup_env.sh +++ b/.github/scripts/unittest-windows/setup_env.sh @@ -20,7 +20,7 @@ if [ ! -d "${conda_dir}" ]; then export tmp_conda="$(echo $conda_dir | tr '/' '\\')" export miniconda_exe="$(echo $root_dir | tr '/' '\\')\\miniconda.exe" curl -L --silent --output miniconda.exe https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe -O - ls -la $miniconda.exe + ls -la "${miniconda.exe}" # curl --silent --output miniconda.exe https://repo.anaconda.com/miniconda/Miniconda3-py39_24.11.1-0-Windows-x86_64.exe -O "$this_dir/install_conda.bat" echo "2: Content of tmp_conda: $(ls ${tmp_conda})" From 996ead2e7d60458f6220090aabfdc30ba9e6106c Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Wed, 3 Sep 2025 17:28:59 +0300 Subject: [PATCH 21/40] Fix typo. --- .github/scripts/unittest-windows/setup_env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/unittest-windows/setup_env.sh b/.github/scripts/unittest-windows/setup_env.sh index 300aa289f6..0045ff2be9 100644 --- a/.github/scripts/unittest-windows/setup_env.sh +++ b/.github/scripts/unittest-windows/setup_env.sh @@ -20,7 +20,7 @@ if [ ! -d "${conda_dir}" ]; then export tmp_conda="$(echo $conda_dir | tr '/' '\\')" export miniconda_exe="$(echo $root_dir | tr '/' '\\')\\miniconda.exe" curl -L --silent --output miniconda.exe https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe -O - ls -la "${miniconda.exe}" + ls -la "${miniconda_exe}" # curl --silent --output miniconda.exe https://repo.anaconda.com/miniconda/Miniconda3-py39_24.11.1-0-Windows-x86_64.exe -O "$this_dir/install_conda.bat" echo "2: Content of tmp_conda: $(ls ${tmp_conda})" From da7c489cb17e907ba3c43c0e0fb6e18dcdad2ac1 Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Wed, 3 Sep 2025 17:41:45 +0300 Subject: [PATCH 22/40] Remove -L to be sure it is needed --- .github/scripts/unittest-windows/setup_env.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/scripts/unittest-windows/setup_env.sh b/.github/scripts/unittest-windows/setup_env.sh index 0045ff2be9..9a70685d50 100644 --- a/.github/scripts/unittest-windows/setup_env.sh +++ b/.github/scripts/unittest-windows/setup_env.sh @@ -11,7 +11,6 @@ this_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" root_dir="$(git rev-parse --show-toplevel)" conda_dir="${root_dir}/conda" env_dir="${root_dir}/env" -echo "conda_dir=$conda_dir" cd "${root_dir}" # 1. Install conda at ./conda @@ -19,17 +18,15 @@ if [ ! -d "${conda_dir}" ]; then printf "* Installing conda\n" export tmp_conda="$(echo $conda_dir | tr '/' '\\')" export miniconda_exe="$(echo $root_dir | tr '/' '\\')\\miniconda.exe" - curl -L --silent --output miniconda.exe https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe -O + curl --silent --output miniconda.exe https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe -O ls -la "${miniconda_exe}" # curl --silent --output miniconda.exe https://repo.anaconda.com/miniconda/Miniconda3-py39_24.11.1-0-Windows-x86_64.exe -O "$this_dir/install_conda.bat" - echo "2: Content of tmp_conda: $(ls ${tmp_conda})" unset tmp_conda unset miniconda_exe fi echo "2: Content of conda_dir: $(ls ${conda_dir})" -echo "2: Content of conda_dir/Lib: $(ls ${conda_dir}/Lib)" eval "$("${conda_dir}/Scripts/conda.exe" 'shell.bash' 'hook')" From c7dcaa9ebaae6e0202bda6b181e2a51b835405f9 Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Wed, 3 Sep 2025 17:45:42 +0300 Subject: [PATCH 23/40] Enable -L and use miniconda --- .github/scripts/unittest-windows/setup_env.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/scripts/unittest-windows/setup_env.sh b/.github/scripts/unittest-windows/setup_env.sh index 9a70685d50..d6dbbf76a2 100644 --- a/.github/scripts/unittest-windows/setup_env.sh +++ b/.github/scripts/unittest-windows/setup_env.sh @@ -18,9 +18,9 @@ if [ ! -d "${conda_dir}" ]; then printf "* Installing conda\n" export tmp_conda="$(echo $conda_dir | tr '/' '\\')" export miniconda_exe="$(echo $root_dir | tr '/' '\\')\\miniconda.exe" - curl --silent --output miniconda.exe https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe -O + # curl --silent --output miniconda.exe https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe -O + curl -L --silent --output miniconda.exe https://repo.anaconda.com/miniconda/Miniconda3-latest-Windows-x86_64.exe -O ls -la "${miniconda_exe}" - # curl --silent --output miniconda.exe https://repo.anaconda.com/miniconda/Miniconda3-py39_24.11.1-0-Windows-x86_64.exe -O "$this_dir/install_conda.bat" unset tmp_conda unset miniconda_exe From 857b3e4d636a0597c0aed5f26f37daa359ccc5e9 Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Wed, 3 Sep 2025 18:01:06 +0300 Subject: [PATCH 24/40] Clean up --- .github/scripts/unittest-windows/install_conda.bat | 2 +- .github/scripts/unittest-windows/setup_env.sh | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/scripts/unittest-windows/install_conda.bat b/.github/scripts/unittest-windows/install_conda.bat index 71fdd57e78..6052ad08b1 100644 --- a/.github/scripts/unittest-windows/install_conda.bat +++ b/.github/scripts/unittest-windows/install_conda.bat @@ -1 +1 @@ -start /wait "" "%miniconda_exe%" /S /InstallationType=JustMe /RegisterPython=0 /AddToPath=1 /D=%tmp_conda% +start /wait "" "%miniconda_exe%" /S /InstallationType=JustMe /RegisterPython=0 /AddToPath=0 /D=%tmp_conda% diff --git a/.github/scripts/unittest-windows/setup_env.sh b/.github/scripts/unittest-windows/setup_env.sh index d6dbbf76a2..a977ff1cc7 100644 --- a/.github/scripts/unittest-windows/setup_env.sh +++ b/.github/scripts/unittest-windows/setup_env.sh @@ -18,16 +18,14 @@ if [ ! -d "${conda_dir}" ]; then printf "* Installing conda\n" export tmp_conda="$(echo $conda_dir | tr '/' '\\')" export miniconda_exe="$(echo $root_dir | tr '/' '\\')\\miniconda.exe" - # curl --silent --output miniconda.exe https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe -O - curl -L --silent --output miniconda.exe https://repo.anaconda.com/miniconda/Miniconda3-latest-Windows-x86_64.exe -O - ls -la "${miniconda_exe}" + # not using miniconda because its installation will be incomplete + # despite using `start /wait` in the install batch file + curl -L --silent --output miniconda.exe https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Windows-x86_64.exe -O "$this_dir/install_conda.bat" unset tmp_conda unset miniconda_exe fi -echo "2: Content of conda_dir: $(ls ${conda_dir})" - eval "$("${conda_dir}/Scripts/conda.exe" 'shell.bash' 'hook')" # 2. Create test environment at ./env From 312e36822d6c8cc83520f46b2320ed83e2013904 Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Wed, 3 Sep 2025 18:31:20 +0300 Subject: [PATCH 25/40] Clean up 2 --- .github/scripts/unittest-windows/setup_env.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/scripts/unittest-windows/setup_env.sh b/.github/scripts/unittest-windows/setup_env.sh index a977ff1cc7..2f85582dc4 100644 --- a/.github/scripts/unittest-windows/setup_env.sh +++ b/.github/scripts/unittest-windows/setup_env.sh @@ -11,6 +11,7 @@ this_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" root_dir="$(git rev-parse --show-toplevel)" conda_dir="${root_dir}/conda" env_dir="${root_dir}/env" + cd "${root_dir}" # 1. Install conda at ./conda @@ -25,7 +26,6 @@ if [ ! -d "${conda_dir}" ]; then unset tmp_conda unset miniconda_exe fi - eval "$("${conda_dir}/Scripts/conda.exe" 'shell.bash' 'hook')" # 2. Create test environment at ./env @@ -37,4 +37,4 @@ conda activate "${env_dir}" # 3. Install minimal build tools pip --quiet install cmake ninja -# conda install --quiet -y 'ffmpeg>=4.1' +conda install --quiet -y 'ffmpeg>=4.1' From 3382d0121ff1877cd81650ff8fb5a8025a81497b Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Thu, 4 Sep 2025 10:53:01 +0300 Subject: [PATCH 26/40] Fix installing torch --- .github/scripts/unittest-windows/install.sh | 45 +++++---------------- .github/workflows/unittest-linux-cpu.yml | 1 + 2 files changed, 12 insertions(+), 34 deletions(-) diff --git a/.github/scripts/unittest-windows/install.sh b/.github/scripts/unittest-windows/install.sh index dcb9503e2a..1a0c6ea639 100644 --- a/.github/scripts/unittest-windows/install.sh +++ b/.github/scripts/unittest-windows/install.sh @@ -22,14 +22,12 @@ source "$this_dir/set_cuda_envs.sh" # 1. Install PyTorch if [ -z "${CUDA_VERSION:-}" ] ; then - cudatoolkit="cpuonly" - version="cpu" + wheel="cpu" else - version="$(python -c "print('.'.join(\"${CUDA_VERSION}\".split('.')[:2]))")" - cudatoolkit="pytorch-cuda=${version}" + wheel="cu$(python -c "print(''.join(\"${CUDA_VERSION}\".split('.')[:2]))")" fi -printf "Installing PyTorch with %s\n" "${cudatoolkit}" -conda install -y -c "pytorch-${UPLOAD_CHANNEL}" -c nvidia pytorch "${cudatoolkit}" pytest pybind11 +printf "Installing PyTorch\n" +pip install --pre torch --index-url https://download.pytorch.org/whl/${UPLOAD_CHANNEL}/${wheel} torch_cuda=$(python -c "import torch; print(torch.cuda.is_available())") echo torch.cuda.is_available is $torch_cuda @@ -45,27 +43,17 @@ fi printf "* Installing fsspec\n" pip install --trusted-host pypi.org --trusted-host files.pythonhosted.org fsspec +printf "* Installing torchaudio build dependencies\n" +conda install -y -c conda-forge cmake + printf "* Installing torchaudio\n" "$root_dir/packaging/vc_env_helper.bat" pip install . -v --no-build-isolation # 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' + conda install -y -c conda-forge parameterized 'requests>=2.20' # Need to disable shell check since this'll fail out if SENTENCEPIECE_DEPENDENCY is empty # shellcheck disable=SC2086 pip install \ @@ -77,18 +65,7 @@ esac 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/ + numpy \ + scipy + ) -# Install fairseq -git clone https://github.com/pytorch/fairseq -cd fairseq -git checkout e47a4c8 -pip install . diff --git a/.github/workflows/unittest-linux-cpu.yml b/.github/workflows/unittest-linux-cpu.yml index ef77070756..a33e89bcd5 100644 --- a/.github/workflows/unittest-linux-cpu.yml +++ b/.github/workflows/unittest-linux-cpu.yml @@ -31,6 +31,7 @@ jobs: # Set up Environment Variables export PYTHON_VERSION="${{ matrix.python_version }}" + export PIP_PROGRESS_BAR=off export CUDA_TESTS_ONLY="0" unset CUDA_VERSION From 342d08567ff0d9858f4d4e6a8e8e9cbf284f593b Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Thu, 4 Sep 2025 11:25:24 +0300 Subject: [PATCH 27/40] Clean up. Enable windows gpu workflow. --- .github/scripts/unittest-windows/install.sh | 15 ++- .github/scripts/unittest-windows/setup_env.sh | 3 +- .github/workflows/unittest-windows-cpu.yml | 1 + .github/workflows/unittest-windows-gpu.yml | 91 ++++++++++--------- 4 files changed, 54 insertions(+), 56 deletions(-) diff --git a/.github/scripts/unittest-windows/install.sh b/.github/scripts/unittest-windows/install.sh index 1a0c6ea639..b16aac5592 100644 --- a/.github/scripts/unittest-windows/install.sh +++ b/.github/scripts/unittest-windows/install.sh @@ -20,6 +20,9 @@ conda activate "${env_dir}" source "$this_dir/set_cuda_envs.sh" +printf "* Installing torchaudio/torch dependencies\n" +conda install -q -y -c conda-forge numpy scipy + # 1. Install PyTorch if [ -z "${CUDA_VERSION:-}" ] ; then wheel="cpu" @@ -40,12 +43,9 @@ if [ ! -z "${CUDA_VERSION:-}" ] ; then fi # 2. Install torchaudio -printf "* Installing fsspec\n" +printf "* Installing fsspec\n" # TODO: is this required for torchaudio?? pip install --trusted-host pypi.org --trusted-host files.pythonhosted.org fsspec -printf "* Installing torchaudio build dependencies\n" -conda install -y -c conda-forge cmake - printf "* Installing torchaudio\n" "$root_dir/packaging/vc_env_helper.bat" pip install . -v --no-build-isolation @@ -53,7 +53,7 @@ printf "* Installing torchaudio\n" printf "* Installing test tools\n" SENTENCEPIECE_DEPENDENCY="sentencepiece" ( - conda install -y -c conda-forge parameterized 'requests>=2.20' + conda install -q -y -c conda-forge parameterized 'requests>=2.20' # Need to disable shell check since this'll fail out if SENTENCEPIECE_DEPENDENCY is empty # shellcheck disable=SC2086 pip install \ @@ -64,8 +64,5 @@ SENTENCEPIECE_DEPENDENCY="sentencepiece" expecttest \ inflect \ pytest \ - pytest-cov \ - numpy \ - scipy - + pytest-cov ) diff --git a/.github/scripts/unittest-windows/setup_env.sh b/.github/scripts/unittest-windows/setup_env.sh index 2f85582dc4..b82563e992 100644 --- a/.github/scripts/unittest-windows/setup_env.sh +++ b/.github/scripts/unittest-windows/setup_env.sh @@ -36,5 +36,4 @@ fi conda activate "${env_dir}" # 3. Install minimal build tools -pip --quiet install cmake ninja -conda install --quiet -y 'ffmpeg>=4.1' +conda install -q -y -c conda-forge cmake ninja diff --git a/.github/workflows/unittest-windows-cpu.yml b/.github/workflows/unittest-windows-cpu.yml index 67790aef18..4fcfa517d4 100644 --- a/.github/workflows/unittest-windows-cpu.yml +++ b/.github/workflows/unittest-windows-cpu.yml @@ -22,6 +22,7 @@ jobs: # Set up Environment Variables export PYTHON_VERSION="3.9" + export PIP_PROGRESS_BAR=off unset CUDA_VERSION # Set CHANNEL diff --git a/.github/workflows/unittest-windows-gpu.yml b/.github/workflows/unittest-windows-gpu.yml index dd3b5e754b..1dbdbf978e 100644 --- a/.github/workflows/unittest-windows-gpu.yml +++ b/.github/workflows/unittest-windows-gpu.yml @@ -1,52 +1,53 @@ -# 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 + export PIP_PROGRESS_BAR=off -# # 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 From 4598c7e21331736eb1ba9ff2bdd8e940e0d46c60 Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Thu, 4 Sep 2025 11:32:33 +0300 Subject: [PATCH 28/40] Use CONDA_QUIET=1 --- .github/scripts/unittest-windows/install.sh | 4 ++-- .github/scripts/unittest-windows/setup_env.sh | 2 +- .github/workflows/unittest-linux-cpu.yml | 1 + .github/workflows/unittest-linux-gpu.yml | 2 ++ .github/workflows/unittest-windows-cpu.yml | 1 + .github/workflows/unittest-windows-gpu.yml | 1 + 6 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/scripts/unittest-windows/install.sh b/.github/scripts/unittest-windows/install.sh index b16aac5592..deb9abe847 100644 --- a/.github/scripts/unittest-windows/install.sh +++ b/.github/scripts/unittest-windows/install.sh @@ -21,7 +21,7 @@ conda activate "${env_dir}" source "$this_dir/set_cuda_envs.sh" printf "* Installing torchaudio/torch dependencies\n" -conda install -q -y -c conda-forge numpy scipy +conda install -y -c conda-forge numpy scipy # 1. Install PyTorch if [ -z "${CUDA_VERSION:-}" ] ; then @@ -53,7 +53,7 @@ printf "* Installing torchaudio\n" printf "* Installing test tools\n" SENTENCEPIECE_DEPENDENCY="sentencepiece" ( - conda install -q -y -c conda-forge parameterized 'requests>=2.20' + conda install -y -c conda-forge parameterized 'requests>=2.20' # Need to disable shell check since this'll fail out if SENTENCEPIECE_DEPENDENCY is empty # shellcheck disable=SC2086 pip install \ diff --git a/.github/scripts/unittest-windows/setup_env.sh b/.github/scripts/unittest-windows/setup_env.sh index b82563e992..8203a1d978 100644 --- a/.github/scripts/unittest-windows/setup_env.sh +++ b/.github/scripts/unittest-windows/setup_env.sh @@ -36,4 +36,4 @@ fi conda activate "${env_dir}" # 3. Install minimal build tools -conda install -q -y -c conda-forge cmake ninja +conda install -y -c conda-forge cmake ninja diff --git a/.github/workflows/unittest-linux-cpu.yml b/.github/workflows/unittest-linux-cpu.yml index a33e89bcd5..99f7875bde 100644 --- a/.github/workflows/unittest-linux-cpu.yml +++ b/.github/workflows/unittest-linux-cpu.yml @@ -32,6 +32,7 @@ jobs: # Set up Environment Variables export PYTHON_VERSION="${{ matrix.python_version }}" export PIP_PROGRESS_BAR=off + export CONDA_QUIET=1 export CUDA_TESTS_ONLY="0" unset CUDA_VERSION diff --git a/.github/workflows/unittest-linux-gpu.yml b/.github/workflows/unittest-linux-gpu.yml index d5879641e0..3d785db097 100644 --- a/.github/workflows/unittest-linux-gpu.yml +++ b/.github/workflows/unittest-linux-gpu.yml @@ -32,6 +32,8 @@ jobs: set -ex # Set up Environment Variables export PYTHON_VERSION="${{ matrix.python_version }}" + export PIP_PROGRESS_BAR=off + export CONDA_QUIET=1 export CU_VERSION="${{ matrix.cuda_arch_version }}" export CUDATOOLKIT="pytorch-cuda=${CU_VERSION}" export TORCHAUDIO_TEST_ALLOW_SKIP_IF_CUDA_SMALL_MEMORY=true diff --git a/.github/workflows/unittest-windows-cpu.yml b/.github/workflows/unittest-windows-cpu.yml index 4fcfa517d4..c966ec2c26 100644 --- a/.github/workflows/unittest-windows-cpu.yml +++ b/.github/workflows/unittest-windows-cpu.yml @@ -23,6 +23,7 @@ jobs: # Set up Environment Variables export PYTHON_VERSION="3.9" export PIP_PROGRESS_BAR=off + export CONDA_QUIET=1 unset CUDA_VERSION # Set CHANNEL diff --git a/.github/workflows/unittest-windows-gpu.yml b/.github/workflows/unittest-windows-gpu.yml index 1dbdbf978e..a159621e29 100644 --- a/.github/workflows/unittest-windows-gpu.yml +++ b/.github/workflows/unittest-windows-gpu.yml @@ -24,6 +24,7 @@ jobs: export PYTHON_VERSION="3.9" export CUDA_VERSION=12.6 export PIP_PROGRESS_BAR=off + export CONDA_QUIET=1 # Set CHANNEL if [[(${GITHUB_EVENT_NAME} = 'pull_request' && (${GITHUB_BASE_REF} = 'release'*)) || (${GITHUB_REF} = 'refs/heads/release'*) ]]; then From 5a1de5b322645808c888157e7ef641a8118861b1 Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Thu, 4 Sep 2025 12:23:22 +0300 Subject: [PATCH 29/40] Use Python 3.10 to get newer numpy --- .github/workflows/unittest-windows-cpu.yml | 2 +- .github/workflows/unittest-windows-gpu.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unittest-windows-cpu.yml b/.github/workflows/unittest-windows-cpu.yml index c966ec2c26..4100c13e50 100644 --- a/.github/workflows/unittest-windows-cpu.yml +++ b/.github/workflows/unittest-windows-cpu.yml @@ -21,7 +21,7 @@ jobs: git config --global --add safe.directory /__w/audio/audio # Set up Environment Variables - export PYTHON_VERSION="3.9" + export PYTHON_VERSION="3.10" export PIP_PROGRESS_BAR=off export CONDA_QUIET=1 unset CUDA_VERSION diff --git a/.github/workflows/unittest-windows-gpu.yml b/.github/workflows/unittest-windows-gpu.yml index a159621e29..34b8fe2a45 100644 --- a/.github/workflows/unittest-windows-gpu.yml +++ b/.github/workflows/unittest-windows-gpu.yml @@ -21,7 +21,7 @@ jobs: git config --global --add safe.directory /__w/audio/audio # Set up Environment Variables - export PYTHON_VERSION="3.9" + export PYTHON_VERSION="3.10" export CUDA_VERSION=12.6 export PIP_PROGRESS_BAR=off export CONDA_QUIET=1 From 996dd426b94f7fdd534ce6a8fb734a744e66fe66 Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Thu, 4 Sep 2025 12:57:20 +0300 Subject: [PATCH 30/40] windows: skip linux tests + test_mvdr_weights_rtf --- .github/scripts/unittest-windows/run_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/unittest-windows/run_test.sh b/.github/scripts/unittest-windows/run_test.sh index ad29a6c021..ac71b43c3f 100644 --- a/.github/scripts/unittest-windows/run_test.sh +++ b/.github/scripts/unittest-windows/run_test.sh @@ -12,5 +12,5 @@ python -m torch.utils.collect_env env | grep TORCHAUDIO || true cd test -pytest --continue-on-collection-errors --cov=torchaudio --junitxml=${RUNNER_TEST_RESULTS_DIR}/junit.xml -v --durations 20 torchaudio_unittest +pytest --continue-on-collection-errors --cov=torchaudio --junitxml=${RUNNER_TEST_RESULTS_DIR}/junit.xml -v --durations 20 torchaudio_unittest -k "not test_mvdr_weights_rtf and not torchscript and not fairseq and not demucs" coverage html From 2a7df6d7d2ae7063e1632c086c4648596e0259f9 Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Thu, 4 Sep 2025 13:23:11 +0300 Subject: [PATCH 31/40] Use numpy from pypi. --- .github/scripts/unittest-windows/install.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/scripts/unittest-windows/install.sh b/.github/scripts/unittest-windows/install.sh index deb9abe847..73934b8fd0 100644 --- a/.github/scripts/unittest-windows/install.sh +++ b/.github/scripts/unittest-windows/install.sh @@ -20,8 +20,8 @@ conda activate "${env_dir}" source "$this_dir/set_cuda_envs.sh" -printf "* Installing torchaudio/torch dependencies\n" -conda install -y -c conda-forge numpy scipy +printf "* Installing torch import-time dependencies\n" +pip install numpy # 1. Install PyTorch if [ -z "${CUDA_VERSION:-}" ] ; then @@ -64,5 +64,6 @@ SENTENCEPIECE_DEPENDENCY="sentencepiece" expecttest \ inflect \ pytest \ - pytest-cov + pytest-cov \ + scipy ) From bd05c8d8f2a97f7853fb5696d16d42157e58d848 Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Thu, 4 Sep 2025 13:25:21 +0300 Subject: [PATCH 32/40] windows: skip test_mvdr_weights --- .github/scripts/unittest-windows/run_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/unittest-windows/run_test.sh b/.github/scripts/unittest-windows/run_test.sh index ac71b43c3f..c6c58499c5 100644 --- a/.github/scripts/unittest-windows/run_test.sh +++ b/.github/scripts/unittest-windows/run_test.sh @@ -12,5 +12,5 @@ python -m torch.utils.collect_env env | grep TORCHAUDIO || true cd test -pytest --continue-on-collection-errors --cov=torchaudio --junitxml=${RUNNER_TEST_RESULTS_DIR}/junit.xml -v --durations 20 torchaudio_unittest -k "not test_mvdr_weights_rtf and not torchscript and not fairseq and not demucs" +pytest --continue-on-collection-errors --cov=torchaudio --junitxml=${RUNNER_TEST_RESULTS_DIR}/junit.xml -v --durations 20 torchaudio_unittest -k "not test_mvdr_weights and not torchscript and not fairseq and not demucs" coverage html From 898c2ee95141e3027c38bccf03492b39648c4551 Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Thu, 4 Sep 2025 13:26:22 +0300 Subject: [PATCH 33/40] windows: skip non-functional --- .github/scripts/unittest-windows/run_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/unittest-windows/run_test.sh b/.github/scripts/unittest-windows/run_test.sh index c6c58499c5..42d4a59910 100644 --- a/.github/scripts/unittest-windows/run_test.sh +++ b/.github/scripts/unittest-windows/run_test.sh @@ -12,5 +12,5 @@ python -m torch.utils.collect_env env | grep TORCHAUDIO || true cd test -pytest --continue-on-collection-errors --cov=torchaudio --junitxml=${RUNNER_TEST_RESULTS_DIR}/junit.xml -v --durations 20 torchaudio_unittest -k "not test_mvdr_weights and not torchscript and not fairseq and not demucs" +pytest --continue-on-collection-errors --cov=torchaudio --junitxml=${RUNNER_TEST_RESULTS_DIR}/junit.xml -v --durations 20 torchaudio_unittest/functional -k "not test_mvdr_weights and not torchscript and not fairseq and not demucs" coverage html From 38d895f822472a1fd77ccbd61fb302f6be5c148d Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Thu, 4 Sep 2025 13:56:07 +0300 Subject: [PATCH 34/40] Use CUBLAS_WORKSPACE_CONFIG to enable deterministic behavior in tests --- .github/workflows/unittest-windows-gpu.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/unittest-windows-gpu.yml b/.github/workflows/unittest-windows-gpu.yml index 34b8fe2a45..a48d95f9e0 100644 --- a/.github/workflows/unittest-windows-gpu.yml +++ b/.github/workflows/unittest-windows-gpu.yml @@ -25,6 +25,7 @@ jobs: export CUDA_VERSION=12.6 export PIP_PROGRESS_BAR=off export CONDA_QUIET=1 + export CUBLAS_WORKSPACE_CONFIG=:4096:8 # Set CHANNEL if [[(${GITHUB_EVENT_NAME} = 'pull_request' && (${GITHUB_BASE_REF} = 'release'*)) || (${GITHUB_REF} = 'refs/heads/release'*) ]]; then From 819d17c5afc7324d422d22adc7f6cd6b4c961469 Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Thu, 4 Sep 2025 13:56:31 +0300 Subject: [PATCH 35/40] Run only test_mvdr_weights tests --- .github/scripts/unittest-windows/run_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/unittest-windows/run_test.sh b/.github/scripts/unittest-windows/run_test.sh index 42d4a59910..69cf03c4ca 100644 --- a/.github/scripts/unittest-windows/run_test.sh +++ b/.github/scripts/unittest-windows/run_test.sh @@ -12,5 +12,5 @@ python -m torch.utils.collect_env env | grep TORCHAUDIO || true cd test -pytest --continue-on-collection-errors --cov=torchaudio --junitxml=${RUNNER_TEST_RESULTS_DIR}/junit.xml -v --durations 20 torchaudio_unittest/functional -k "not test_mvdr_weights and not torchscript and not fairseq and not demucs" +pytest --continue-on-collection-errors --cov=torchaudio --junitxml=${RUNNER_TEST_RESULTS_DIR}/junit.xml -v --durations 20 torchaudio_unittest/functional -k "test_mvdr_weights and not torchscript and not fairseq and not demucs" coverage html From fe3b4e745ec209b5a9f8477db941e3fd4d2d4480 Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Thu, 4 Sep 2025 14:07:51 +0300 Subject: [PATCH 36/40] Enable all linux tests --- .github/scripts/unittest-windows/run_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/unittest-windows/run_test.sh b/.github/scripts/unittest-windows/run_test.sh index 69cf03c4ca..d835004ab3 100644 --- a/.github/scripts/unittest-windows/run_test.sh +++ b/.github/scripts/unittest-windows/run_test.sh @@ -12,5 +12,5 @@ python -m torch.utils.collect_env env | grep TORCHAUDIO || true cd test -pytest --continue-on-collection-errors --cov=torchaudio --junitxml=${RUNNER_TEST_RESULTS_DIR}/junit.xml -v --durations 20 torchaudio_unittest/functional -k "test_mvdr_weights and not torchscript and not fairseq and not demucs" +pytest --continue-on-collection-errors --cov=torchaudio --junitxml=${RUNNER_TEST_RESULTS_DIR}/junit.xml -v --durations 20 torchaudio_unittest/functional -k "not torchscript and not fairseq and not demucs" coverage html From 3b94552727d4d2f6e1861bfdebb8ea050b44a8a2 Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Thu, 4 Sep 2025 15:40:16 +0300 Subject: [PATCH 37/40] Skip librosa tests --- .github/scripts/unittest-windows/run_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/unittest-windows/run_test.sh b/.github/scripts/unittest-windows/run_test.sh index d835004ab3..adb136f22d 100644 --- a/.github/scripts/unittest-windows/run_test.sh +++ b/.github/scripts/unittest-windows/run_test.sh @@ -12,5 +12,5 @@ python -m torch.utils.collect_env env | grep TORCHAUDIO || true cd test -pytest --continue-on-collection-errors --cov=torchaudio --junitxml=${RUNNER_TEST_RESULTS_DIR}/junit.xml -v --durations 20 torchaudio_unittest/functional -k "not torchscript and not fairseq and not demucs" +pytest --continue-on-collection-errors --cov=torchaudio --junitxml=${RUNNER_TEST_RESULTS_DIR}/junit.xml -v --durations 20 torchaudio_unittest/functional -k "not torchscript and not fairseq and not demucs and not librosa" coverage html From 4af77947c55c17e7bf70dbc06c5cbfb7649ed1ab Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Thu, 4 Sep 2025 17:20:13 +0300 Subject: [PATCH 38/40] Restore non-functional tests --- .github/scripts/unittest-windows/run_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/unittest-windows/run_test.sh b/.github/scripts/unittest-windows/run_test.sh index adb136f22d..25d8e14196 100644 --- a/.github/scripts/unittest-windows/run_test.sh +++ b/.github/scripts/unittest-windows/run_test.sh @@ -12,5 +12,5 @@ python -m torch.utils.collect_env env | grep TORCHAUDIO || true cd test -pytest --continue-on-collection-errors --cov=torchaudio --junitxml=${RUNNER_TEST_RESULTS_DIR}/junit.xml -v --durations 20 torchaudio_unittest/functional -k "not torchscript and not fairseq and not demucs and not librosa" +pytest --continue-on-collection-errors --cov=torchaudio --junitxml=${RUNNER_TEST_RESULTS_DIR}/junit.xml -v --durations 20 torchaudio_unittest -k "not torchscript and not fairseq and not demucs and not librosa" coverage html From c22c1ca20731003f3dca9d5dad223d379e9525f2 Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Thu, 4 Sep 2025 19:53:54 +0300 Subject: [PATCH 39/40] Add allow-skip variables from PR4059. --- .github/scripts/unittest-windows/environment.yml | 1 - .github/workflows/unittest-windows-cpu.yml | 6 ++++++ .github/workflows/unittest-windows-gpu.yml | 7 ++++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/scripts/unittest-windows/environment.yml b/.github/scripts/unittest-windows/environment.yml index c550773a38..33ad0eddfc 100644 --- a/.github/scripts/unittest-windows/environment.yml +++ b/.github/scripts/unittest-windows/environment.yml @@ -8,7 +8,6 @@ dependencies: - scipy >= 1.4.1 - pip - pip: - - PySoundFile - future - parameterized - dataclasses diff --git a/.github/workflows/unittest-windows-cpu.yml b/.github/workflows/unittest-windows-cpu.yml index 4100c13e50..dc501cd4f4 100644 --- a/.github/workflows/unittest-windows-cpu.yml +++ b/.github/workflows/unittest-windows-cpu.yml @@ -48,6 +48,12 @@ jobs: 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_QUANTIZATION=true + export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CTC_DECODER=true + export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_MOD_unidecode=true + export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_MOD_inflect=true + export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_MOD_pytorch_lightning=true + export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_MOD_sentencepiece=true .github/scripts/unittest-windows/setup_env.sh .github/scripts/unittest-windows/install.sh diff --git a/.github/workflows/unittest-windows-gpu.yml b/.github/workflows/unittest-windows-gpu.yml index a48d95f9e0..f7f053ce1a 100644 --- a/.github/workflows/unittest-windows-gpu.yml +++ b/.github/workflows/unittest-windows-gpu.yml @@ -25,6 +25,7 @@ jobs: export CUDA_VERSION=12.6 export PIP_PROGRESS_BAR=off export CONDA_QUIET=1 + export USE_CUDA=1 export CUBLAS_WORKSPACE_CONFIG=:4096:8 # Set CHANNEL @@ -48,7 +49,11 @@ jobs: 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_CTC_DECODER=true + export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_MOD_unidecode=true + export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_MOD_inflect=true + export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_MOD_pytorch_lightning=true + export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_MOD_sentencepiece=true .github/scripts/unittest-windows/setup_env.sh .github/scripts/unittest-windows/install.sh From a4d696eb648a70da71ab6ceccb25dae4562584c3 Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Thu, 4 Sep 2025 22:42:21 +0300 Subject: [PATCH 40/40] Add TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_QUANTIZATION=true --- .github/workflows/unittest-windows-gpu.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/unittest-windows-gpu.yml b/.github/workflows/unittest-windows-gpu.yml index f7f053ce1a..b00a512956 100644 --- a/.github/workflows/unittest-windows-gpu.yml +++ b/.github/workflows/unittest-windows-gpu.yml @@ -49,6 +49,7 @@ jobs: 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_QUANTIZATION=true export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CTC_DECODER=true export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_MOD_unidecode=true export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_MOD_inflect=true