Unverified Commit f6dc2f67 authored by moto's avatar moto Committed by GitHub
Browse files

Add macOS CPU unittest (#777)

parent c9142fd5
...@@ -43,7 +43,7 @@ commands: ...@@ -43,7 +43,7 @@ commands:
steps: steps:
- run: - run:
name: Install cmake and pkg-config name: Install cmake and pkg-config
command: HOMEBREW_NO_AUTO_UPDATE=1 brew install cmake pkg-config command: HOMEBREW_NO_AUTO_UPDATE=1 brew install cmake pkg-config wget
# Disable brew auto update which is very slow # Disable brew auto update which is very slow
binary_common: &binary_common binary_common: &binary_common
...@@ -533,6 +533,47 @@ jobs: ...@@ -533,6 +533,47 @@ jobs:
- store_test_results: - store_test_results:
path: test-results path: test-results
unittest_macos_cpu:
<<: *binary_common
macos:
xcode: "9.0"
resource_class: large
steps:
- checkout
- install_build_tools_macos
- attach_workspace:
at: third_party
- generate_cache_key
- restore_cache:
keys:
- env-v3-macos-{{ arch }}-py<< parameters.python_version >>-{{ checksum ".circleci/unittest/linux/scripts/environment.yml" }}-{{ checksum "third_party/CMakeLists.txt" }}-{{ checksum ".cachekey" }}
- run:
name: Setup
command: .circleci/unittest/linux/scripts/setup_env.sh
- save_cache:
key: env-v3-macos-{{ arch }}-py<< parameters.python_version >>-{{ checksum ".circleci/unittest/linux/scripts/environment.yml" }}-{{ checksum "third_party/CMakeLists.txt" }}-{{ checksum ".cachekey" }}
paths:
- conda
- env
- third_party/build
- third_party/install
- third_party/src
- run:
name: Install torchaudio
command: .circleci/unittest/linux/scripts/install.sh
- run:
name: Run tests
command: .circleci/unittest/linux/scripts/run_test.sh
- run:
name: Post process
command: .circleci/unittest/linux/scripts/post_process.sh
- store_test_results:
path: test-results
stylecheck: stylecheck:
<<: *binary_common <<: *binary_common
docker: docker:
...@@ -744,6 +785,21 @@ workflows: ...@@ -744,6 +785,21 @@ workflows:
only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/ only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
name: unittest_windows_gpu_py3.8 name: unittest_windows_gpu_py3.8
python_version: '3.8' python_version: '3.8'
- unittest_macos_cpu:
name: unittest_macos_cpu_py3.6
python_version: '3.6'
requires:
- download_third_parties_nix
- unittest_macos_cpu:
name: unittest_macos_cpu_py3.7
python_version: '3.7'
requires:
- download_third_parties_nix
- unittest_macos_cpu:
name: unittest_macos_cpu_py3.8
python_version: '3.8'
requires:
- download_third_parties_nix
nightly: nightly:
jobs: jobs:
- circleci_consistency: - circleci_consistency:
......
...@@ -43,7 +43,7 @@ commands: ...@@ -43,7 +43,7 @@ commands:
steps: steps:
- run: - run:
name: Install cmake and pkg-config name: Install cmake and pkg-config
command: HOMEBREW_NO_AUTO_UPDATE=1 brew install cmake pkg-config command: HOMEBREW_NO_AUTO_UPDATE=1 brew install cmake pkg-config wget
# Disable brew auto update which is very slow # Disable brew auto update which is very slow
binary_common: &binary_common binary_common: &binary_common
...@@ -533,6 +533,47 @@ jobs: ...@@ -533,6 +533,47 @@ jobs:
- store_test_results: - store_test_results:
path: test-results path: test-results
unittest_macos_cpu:
<<: *binary_common
macos:
xcode: "9.0"
resource_class: large
steps:
- checkout
- install_build_tools_macos
- attach_workspace:
at: third_party
- generate_cache_key
- restore_cache:
{% raw %}
keys:
- env-v3-macos-{{ arch }}-py<< parameters.python_version >>-{{ checksum ".circleci/unittest/linux/scripts/environment.yml" }}-{{ checksum "third_party/CMakeLists.txt" }}-{{ checksum ".cachekey" }}
{% endraw %}
- run:
name: Setup
command: .circleci/unittest/linux/scripts/setup_env.sh
- save_cache:
{% raw %}
key: env-v3-macos-{{ arch }}-py<< parameters.python_version >>-{{ checksum ".circleci/unittest/linux/scripts/environment.yml" }}-{{ checksum "third_party/CMakeLists.txt" }}-{{ checksum ".cachekey" }}
{% endraw %}
paths:
- conda
- env
- third_party/build
- third_party/install
- third_party/src
- run:
name: Install torchaudio
command: .circleci/unittest/linux/scripts/install.sh
- run:
name: Run tests
command: .circleci/unittest/linux/scripts/run_test.sh
- run:
name: Post process
command: .circleci/unittest/linux/scripts/post_process.sh
- store_test_results:
path: test-results
stylecheck: stylecheck:
<<: *binary_common <<: *binary_common
docker: docker:
......
...@@ -136,8 +136,11 @@ def indent(indentation, data_list): ...@@ -136,8 +136,11 @@ def indent(indentation, data_list):
def unittest_workflows(indentation=6): def unittest_workflows(indentation=6):
jobs = [] jobs = []
jobs += build_download_job(None) jobs += build_download_job(None)
for os_type in ["linux", "windows"]: for os_type in ["linux", "windows", "macos"]:
for device_type in ["cpu", "gpu"]: for device_type in ["cpu", "gpu"]:
if os_type == "macos" and device_type == "gpu":
continue
for i, python_version in enumerate(PYTHON_VERSIONS): for i, python_version in enumerate(PYTHON_VERSIONS):
job = { job = {
"name": f"unittest_{os_type}_{device_type}_py{python_version}", "name": f"unittest_{os_type}_{device_type}_py{python_version}",
......
...@@ -11,7 +11,6 @@ dependencies: ...@@ -11,7 +11,6 @@ dependencies:
- llvmlite==0.31 # See https://github.com/pytorch/audio/pull/766 - llvmlite==0.31 # See https://github.com/pytorch/audio/pull/766
- pip - pip
- pip: - pip:
- clang-format
- kaldi-io - kaldi-io
- scipy - scipy
- parameterized - parameterized
......
...@@ -14,10 +14,15 @@ env_dir="${root_dir}/env" ...@@ -14,10 +14,15 @@ env_dir="${root_dir}/env"
cd "${root_dir}" cd "${root_dir}"
case "$(uname -s)" in
Darwin*) os=MacOSX;;
*) os=Linux
esac
# 1. Install conda at ./conda # 1. Install conda at ./conda
if [ ! -d "${conda_dir}" ]; then if [ ! -d "${conda_dir}" ]; then
printf "* Installing conda\n" printf "* Installing conda\n"
wget -O miniconda.sh http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh wget -O miniconda.sh "http://repo.continuum.io/miniconda/Miniconda3-latest-${os}-x86_64.sh"
bash ./miniconda.sh -b -f -p "${conda_dir}" bash ./miniconda.sh -b -f -p "${conda_dir}"
fi fi
eval "$(${conda_dir}/bin/conda shell.bash hook)" eval "$(${conda_dir}/bin/conda shell.bash hook)"
...@@ -32,6 +37,9 @@ conda activate "${env_dir}" ...@@ -32,6 +37,9 @@ conda activate "${env_dir}"
# 3. Install Conda dependencies # 3. Install Conda dependencies
printf "* Installing dependencies (except PyTorch)\n" printf "* Installing dependencies (except PyTorch)\n"
conda env update --file "${this_dir}/environment.yml" --prune conda env update --file "${this_dir}/environment.yml" --prune
if [ "${os}" == Linux ] ; then
pip install clang-format
fi
# 4. Buld codecs # 4. Buld codecs
mkdir -p third_party/build mkdir -p third_party/build
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment