From a832015983ee7514fc247977e329a97283eb650c Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Fri, 5 Sep 2025 11:53:40 +0300 Subject: [PATCH 1/4] Enable MacOS M1 CI unittests --- .github/workflows/unittest-macos-cpu.yml | 113 ++++++++++++----------- 1 file changed, 58 insertions(+), 55 deletions(-) diff --git a/.github/workflows/unittest-macos-cpu.yml b/.github/workflows/unittest-macos-cpu.yml index 4bea0b0ecb..0e80b120ca 100644 --- a/.github/workflows/unittest-macos-cpu.yml +++ b/.github/workflows/unittest-macos-cpu.yml @@ -1,64 +1,67 @@ -# name: Unit-tests on Macos CPU +name: Unit-tests on MacOS M1 CPU -# on: -# pull_request: -# push: -# branches: -# - nightly -# - main -# - release/* -# workflow_dispatch: +on: + pull_request: + push: + branches: + - nightly + - main + - release/* + workflow_dispatch: -# env: -# CHANNEL: "nightly" +env: + CHANNEL: "nightly" -# jobs: -# tests: -# uses: pytorch/test-infra/.github/workflows/macos_job.yml@main -# with: -# runner: macos-12 -# repository: pytorch/audio -# timeout: 180 -# script: | -# echo '::group::Setup Environment Variables' -# # Mark Build Directory Safe -# git config --global --add safe.directory /__w/audio/audio +jobs: + tests: + uses: pytorch/test-infra/.github/workflows/test_macos_job.yml@main + with: + runner: macos-m1-stable + repository: pytorch/audio + timeout: 180 + script: | + echo '::group::Setup Environment Variables' + # Mark Build Directory Safe + git config --global --add safe.directory /__w/audio/audio -# # Set up Environment Variables -# export PYTHON_VERSION="3.9" -# export CU_VERSION="" -# export CUDATOOLKIT="" -# export USE_OPENMP="0" + # Set up Environment Variables + export PYTHON_VERSION="3.10" + export PIP_PROGRESS_BAR=off + export CONDA_QUIET=1 + export CU_VERSION="" + export CUDATOOLKIT="" + export USE_OPENMP="0" + 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_CUDA=true -# export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_HW_ACCEL=true -# export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_QUANTIZATION=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_TEMPORARY_DISABLED=true -# export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_SOX_DECODER=true -# export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_SOX_ENCODER=true -# echo '::endgroup::' + 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_CUDA=true + export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_HW_ACCEL=true + export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_QUANTIZATION=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_TEMPORARY_DISABLED=true + export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_SOX_DECODER=true + export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_SOX_ENCODER=true + echo '::endgroup::' -# set -euxo pipefail + set -euxo pipefail -# echo '::group::Install PyTorch and Torchaudio' -# ./.github/scripts/unittest-linux/install.sh -# echo '::endgroup::' + echo '::group::Install PyTorch and Torchaudio' + ./.github/scripts/unittest-linux/install.sh + echo '::endgroup::' -# echo '::group::Run Tests' -# ./.github/scripts/unittest-linux/run_test.sh -# echo '::endgroup::' + echo '::group::Run Tests' + ./.github/scripts/unittest-linux/run_test.sh + echo '::endgroup::' From 5ad0d0df05cb1ba032f5852e5725909791b1ef69 Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Fri, 5 Sep 2025 12:06:44 +0300 Subject: [PATCH 2/4] Restore uses. --- .github/workflows/unittest-macos-cpu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unittest-macos-cpu.yml b/.github/workflows/unittest-macos-cpu.yml index 0e80b120ca..ebe357b5b9 100644 --- a/.github/workflows/unittest-macos-cpu.yml +++ b/.github/workflows/unittest-macos-cpu.yml @@ -14,7 +14,7 @@ env: jobs: tests: - uses: pytorch/test-infra/.github/workflows/test_macos_job.yml@main + uses: pytorch/test-infra/.github/workflows/macos_job.yml@main with: runner: macos-m1-stable repository: pytorch/audio From cdb89f76e7d372c2d33fe1a52342d302c179128f Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Fri, 5 Sep 2025 12:43:08 +0300 Subject: [PATCH 3/4] Skip librosa tests due to minor inaccuracy issues --- .github/scripts/unittest-linux/run_test.sh | 2 +- .github/workflows/unittest-macos-cpu.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/scripts/unittest-linux/run_test.sh b/.github/scripts/unittest-linux/run_test.sh index 2ac359c591..6cc935b444 100755 --- a/.github/scripts/unittest-linux/run_test.sh +++ b/.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 torchscript and not fairseq and not demucs" + pytest torchaudio_unittest -k "not torchscript and not fairseq and not demucs ${PYTEST_K_EXTRA}" ) diff --git a/.github/workflows/unittest-macos-cpu.yml b/.github/workflows/unittest-macos-cpu.yml index ebe357b5b9..1e7c52833f 100644 --- a/.github/workflows/unittest-macos-cpu.yml +++ b/.github/workflows/unittest-macos-cpu.yml @@ -63,5 +63,6 @@ jobs: echo '::endgroup::' echo '::group::Run Tests' + export PYTEST_K_EXTRA="and not librosa" ./.github/scripts/unittest-linux/run_test.sh echo '::endgroup::' From ebe4e71e78cf13d2b78ba77918b39cb563f6c246 Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Fri, 5 Sep 2025 12:45:34 +0300 Subject: [PATCH 4/4] OT: Fix windows CPU CI title --- .github/workflows/unittest-windows-cpu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unittest-windows-cpu.yml b/.github/workflows/unittest-windows-cpu.yml index dc501cd4f4..f6a786fcc1 100644 --- a/.github/workflows/unittest-windows-cpu.yml +++ b/.github/workflows/unittest-windows-cpu.yml @@ -1,4 +1,4 @@ -# name: Unittests on Windows CPU +name: Unittests on Windows CPU on: pull_request: