Skip to content

Commit 3f90600

Browse files
pearupearu
authored
Enable MacOS M1 CI unittests (#4091)
* Enable MacOS M1 CI unittests * Skip librosa tests due to minor inaccuracy issues * OT: Fix windows CPU CI title
1 parent 83df5d7 commit 3f90600

File tree

3 files changed

+61
-57
lines changed

3 files changed

+61
-57
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ fi
3434
export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_MOD_inflect=true
3535
export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_MOD_pytorch_lightning=true
3636
cd test
37-
pytest torchaudio_unittest -k "not torchscript and not fairseq and not demucs"
37+
pytest torchaudio_unittest -k "not torchscript and not fairseq and not demucs ${PYTEST_K_EXTRA}"
3838
)

‎.github/workflows/unittest-macos-cpu.yml‎

Lines changed: 59 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,68 @@
1-
# name: Unit-tests on Macos CPU
1+
name: Unit-tests on MacOS M1 CPU
22

3-
# on:
4-
# pull_request:
5-
# push:
6-
# branches:
7-
# - nightly
8-
# - main
9-
# - release/*
10-
# workflow_dispatch:
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- nightly
8+
- main
9+
- release/*
10+
workflow_dispatch:
1111

12-
# env:
13-
# CHANNEL: "nightly"
12+
env:
13+
CHANNEL: "nightly"
1414

15-
# jobs:
16-
# tests:
17-
# uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
18-
# with:
19-
# runner: macos-12
20-
# repository: pytorch/audio
21-
# timeout: 180
22-
# script: |
23-
# echo '::group::Setup Environment Variables'
24-
# # Mark Build Directory Safe
25-
# git config --global --add safe.directory /__w/audio/audio
15+
jobs:
16+
tests:
17+
uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
18+
with:
19+
runner: macos-m1-stable
20+
repository: pytorch/audio
21+
timeout: 180
22+
script: |
23+
echo '::group::Setup Environment Variables'
24+
# Mark Build Directory Safe
25+
git config --global --add safe.directory /__w/audio/audio
2626
27-
# # Set up Environment Variables
28-
# export PYTHON_VERSION="3.9"
29-
# export CU_VERSION=""
30-
# export CUDATOOLKIT=""
31-
# export USE_OPENMP="0"
27+
# Set up Environment Variables
28+
export PYTHON_VERSION="3.10"
29+
export PIP_PROGRESS_BAR=off
30+
export CONDA_QUIET=1
31+
export CU_VERSION=""
32+
export CUDATOOLKIT=""
33+
export USE_OPENMP="0"
34+
unset CUDA_VERSION
3235
33-
# # Set CHANNEL
34-
# if [[(${GITHUB_EVENT_NAME} = 'pull_request' && (${GITHUB_BASE_REF} = 'release'*)) || (${GITHUB_REF} = 'refs/heads/release'*) ]]; then
35-
# export UPLOAD_CHANNEL=test
36-
# else
37-
# export UPLOAD_CHANNEL=nightly
38-
# fi
36+
# Set CHANNEL
37+
if [[(${GITHUB_EVENT_NAME} = 'pull_request' && (${GITHUB_BASE_REF} = 'release'*)) || (${GITHUB_REF} = 'refs/heads/release'*) ]]; then
38+
export UPLOAD_CHANNEL=test
39+
else
40+
export UPLOAD_CHANNEL=nightly
41+
fi
3942
40-
# export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_APPLY_CMVN_SLIDING=true
41-
# export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_COMPUTE_FBANK_FEATS=true
42-
# export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_COMPUTE_KALDI_PITCH_FEATS=true
43-
# export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_COMPUTE_MFCC_FEATS=true
44-
# export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_COMPUTE_SPECTROGRAM_FEATS=true
45-
# export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CUDA=true
46-
# export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_HW_ACCEL=true
47-
# export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_QUANTIZATION=true
48-
# export TORCHAUDIO_TEST_ALLOW_SKIP_IF_ON_PYTHON_310=true
49-
# export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_MOD_sentencepiece=true
50-
# export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_AUDIO_OUT_DEVICE=true
51-
# export TORCHAUDIO_TEST_ALLOW_SKIP_IF_TEMPORARY_DISABLED=true
52-
# export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_SOX_DECODER=true
53-
# export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_SOX_ENCODER=true
54-
# echo '::endgroup::'
43+
export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_APPLY_CMVN_SLIDING=true
44+
export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_COMPUTE_FBANK_FEATS=true
45+
export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_COMPUTE_KALDI_PITCH_FEATS=true
46+
export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_COMPUTE_MFCC_FEATS=true
47+
export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_COMPUTE_SPECTROGRAM_FEATS=true
48+
export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CUDA=true
49+
export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_HW_ACCEL=true
50+
export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_QUANTIZATION=true
51+
export TORCHAUDIO_TEST_ALLOW_SKIP_IF_ON_PYTHON_310=true
52+
export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_MOD_sentencepiece=true
53+
export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_AUDIO_OUT_DEVICE=true
54+
export TORCHAUDIO_TEST_ALLOW_SKIP_IF_TEMPORARY_DISABLED=true
55+
export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_SOX_DECODER=true
56+
export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_SOX_ENCODER=true
57+
echo '::endgroup::'
5558
56-
# set -euxo pipefail
59+
set -euxo pipefail
5760
58-
# echo '::group::Install PyTorch and Torchaudio'
59-
# ./.github/scripts/unittest-linux/install.sh
60-
# echo '::endgroup::'
61+
echo '::group::Install PyTorch and Torchaudio'
62+
./.github/scripts/unittest-linux/install.sh
63+
echo '::endgroup::'
6164
62-
# echo '::group::Run Tests'
63-
# ./.github/scripts/unittest-linux/run_test.sh
64-
# echo '::endgroup::'
65+
echo '::group::Run Tests'
66+
export PYTEST_K_EXTRA="and not librosa"
67+
./.github/scripts/unittest-linux/run_test.sh
68+
echo '::endgroup::'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# name: Unittests on Windows CPU
1+
name: Unittests on Windows CPU
22

33
on:
44
pull_request:

0 commit comments

Comments
 (0)