Commit 6e563839 authored by moto's avatar moto Committed by Facebook GitHub Bot
Browse files

Disable OpenMP on mac (#2431)

Summary:
A couple of weeks ago we started to see OpenMP not found error on macOS CI.
From https://github.com/pytorch/audio/issues/2404, we install OpenMP from brew, and build passes, but unit tests are seg-faulting ever since.

https://app.circleci.com/pipelines/github/pytorch/audio/10825/workflows/c0ecae99-d409-4df2-ab91-9bcb126c309d/jobs/671518

The failing test uses `torchaudio.functional.filitfilt`, which uses [OpenMP for parallel execution](https://github.com/pytorch/audio/blob/6057d3cf1c2f3a4c5072a3853a021bb8b4ce61f7/torchaudio/csrc/lfilter.cpp#L20).

This commit reverts https://github.com/pytorch/audio/issues/2404 and disables OpenMP for macOS builds and tests.

Pull Request resolved: https://github.com/pytorch/audio/pull/2431

Reviewed By: atalman

Differential Revision: D36819141

Pulled By: mthrok

fbshipit-source-id: 824300866a55f8b029d21649dc96cd80ae2ff697
parent 5d86054a
...@@ -53,13 +53,6 @@ commands: ...@@ -53,13 +53,6 @@ commands:
name: Install CUDA name: Install CUDA
command: | command: |
packaging/windows/internal/cuda_install.bat packaging/windows/internal/cuda_install.bat
macos_install_dependencies:
description: "Install ci dependencies for macOS"
steps:
- run:
name: Install ci dependencies
command: |
brew install libomp
binary_common: &binary_common binary_common: &binary_common
parameters: parameters:
...@@ -299,7 +292,6 @@ jobs: ...@@ -299,7 +292,6 @@ jobs:
steps: steps:
- checkout - checkout
- load_conda_channel_flags - load_conda_channel_flags
- macos_install_dependencies
- attach_workspace: - attach_workspace:
at: third_party at: third_party
- run: - run:
...@@ -314,6 +306,7 @@ jobs: ...@@ -314,6 +306,7 @@ jobs:
packaging/build_wheel.sh packaging/build_wheel.sh
environment: environment:
USE_FFMPEG: true USE_FFMPEG: true
USE_OPENMP: false
- store_artifacts: - store_artifacts:
path: dist path: dist
- persist_to_workspace: - persist_to_workspace:
...@@ -328,7 +321,6 @@ jobs: ...@@ -328,7 +321,6 @@ jobs:
steps: steps:
- checkout - checkout
- load_conda_channel_flags - load_conda_channel_flags
- macos_install_dependencies
- attach_workspace: - attach_workspace:
at: third_party at: third_party
- run: - run:
...@@ -341,6 +333,7 @@ jobs: ...@@ -341,6 +333,7 @@ jobs:
packaging/build_conda.sh packaging/build_conda.sh
environment: environment:
USE_FFMPEG: true USE_FFMPEG: true
USE_OPENMP: false
- store_artifacts: - store_artifacts:
path: /Users/distiller/miniconda3/conda-bld/osx-64 path: /Users/distiller/miniconda3/conda-bld/osx-64
- persist_to_workspace: - persist_to_workspace:
...@@ -765,7 +758,6 @@ jobs: ...@@ -765,7 +758,6 @@ jobs:
steps: steps:
- checkout - checkout
- load_conda_channel_flags - load_conda_channel_flags
- macos_install_dependencies
- attach_workspace: - attach_workspace:
at: third_party at: third_party
- designate_upload_channel - designate_upload_channel
...@@ -777,6 +769,7 @@ jobs: ...@@ -777,6 +769,7 @@ jobs:
command: .circleci/unittest/linux/scripts/install.sh command: .circleci/unittest/linux/scripts/install.sh
environment: environment:
USE_FFMPEG: true USE_FFMPEG: true
USE_OPENMP: false
BUILD_MAD: true BUILD_MAD: true
- run: - run:
name: Run tests name: Run tests
......
...@@ -53,13 +53,6 @@ commands: ...@@ -53,13 +53,6 @@ commands:
name: Install CUDA name: Install CUDA
command: | command: |
packaging/windows/internal/cuda_install.bat packaging/windows/internal/cuda_install.bat
macos_install_dependencies:
description: "Install ci dependencies for macOS"
steps:
- run:
name: Install ci dependencies
command: |
brew install libomp
binary_common: &binary_common binary_common: &binary_common
parameters: parameters:
...@@ -299,7 +292,6 @@ jobs: ...@@ -299,7 +292,6 @@ jobs:
steps: steps:
- checkout - checkout
- load_conda_channel_flags - load_conda_channel_flags
- macos_install_dependencies
- attach_workspace: - attach_workspace:
at: third_party at: third_party
- run: - run:
...@@ -314,6 +306,7 @@ jobs: ...@@ -314,6 +306,7 @@ jobs:
packaging/build_wheel.sh packaging/build_wheel.sh
environment: environment:
USE_FFMPEG: true USE_FFMPEG: true
USE_OPENMP: false
- store_artifacts: - store_artifacts:
path: dist path: dist
- persist_to_workspace: - persist_to_workspace:
...@@ -328,7 +321,6 @@ jobs: ...@@ -328,7 +321,6 @@ jobs:
steps: steps:
- checkout - checkout
- load_conda_channel_flags - load_conda_channel_flags
- macos_install_dependencies
- attach_workspace: - attach_workspace:
at: third_party at: third_party
- run: - run:
...@@ -341,6 +333,7 @@ jobs: ...@@ -341,6 +333,7 @@ jobs:
packaging/build_conda.sh packaging/build_conda.sh
environment: environment:
USE_FFMPEG: true USE_FFMPEG: true
USE_OPENMP: false
- store_artifacts: - store_artifacts:
path: /Users/distiller/miniconda3/conda-bld/osx-64 path: /Users/distiller/miniconda3/conda-bld/osx-64
- persist_to_workspace: - persist_to_workspace:
...@@ -765,7 +758,6 @@ jobs: ...@@ -765,7 +758,6 @@ jobs:
steps: steps:
- checkout - checkout
- load_conda_channel_flags - load_conda_channel_flags
- macos_install_dependencies
- attach_workspace: - attach_workspace:
at: third_party at: third_party
- designate_upload_channel - designate_upload_channel
...@@ -777,6 +769,7 @@ jobs: ...@@ -777,6 +769,7 @@ jobs:
command: .circleci/unittest/linux/scripts/install.sh command: .circleci/unittest/linux/scripts/install.sh
environment: environment:
USE_FFMPEG: true USE_FFMPEG: true
USE_OPENMP: false
BUILD_MAD: true BUILD_MAD: true
- run: - run:
name: Run tests name: Run tests
......
...@@ -47,6 +47,7 @@ build: ...@@ -47,6 +47,7 @@ build:
- USE_CUDA - USE_CUDA
- TORCH_CUDA_ARCH_LIST - TORCH_CUDA_ARCH_LIST
- USE_FFMPEG - USE_FFMPEG
- USE_OPENMP
- FFMPEG_ROOT - FFMPEG_ROOT
test: test:
......
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