Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable OpenMP on mac #2431

Closed
wants to merge 6 commits into from
Closed

Disable OpenMP on mac #2431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2efeb07
print parallel info
mthrok Jun 1, 2022
dd11490
Revert "ci: Install libomp on macos (#2404)"
mthrok Jun 1, 2022
01885cf
Disable OpenMP on macOS
mthrok Jun 1, 2022
7bdf0f1
debug
mthrok Jun 1, 2022
e1fb54c
fixup! debug
mthrok Jun 1, 2022
58b7de1
fix
mthrok Jun 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 3 additions & 10 deletions .circleci/config.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 3 additions & 10 deletions .circleci/config.yml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,6 @@ commands:
name: Install CUDA
command: |
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
parameters:
Expand Down Expand Up @@ -299,7 +292,6 @@ jobs:
steps:
- checkout
- load_conda_channel_flags
- macos_install_dependencies
- attach_workspace:
at: third_party
- run:
Expand All @@ -314,6 +306,7 @@ jobs:
packaging/build_wheel.sh
environment:
USE_FFMPEG: true
USE_OPENMP: false
- store_artifacts:
path: dist
- persist_to_workspace:
Expand All @@ -328,7 +321,6 @@ jobs:
steps:
- checkout
- load_conda_channel_flags
- macos_install_dependencies
- attach_workspace:
at: third_party
- run:
Expand All @@ -341,6 +333,7 @@ jobs:
packaging/build_conda.sh
environment:
USE_FFMPEG: true
USE_OPENMP: false
- store_artifacts:
path: /Users/distiller/miniconda3/conda-bld/osx-64
- persist_to_workspace:
Expand Down Expand Up @@ -765,7 +758,6 @@ jobs:
steps:
- checkout
- load_conda_channel_flags
- macos_install_dependencies
- attach_workspace:
at: third_party
- designate_upload_channel
Expand All @@ -777,6 +769,7 @@ jobs:
command: .circleci/unittest/linux/scripts/install.sh
environment:
USE_FFMPEG: true
USE_OPENMP: false
BUILD_MAD: true
- run:
name: Run tests
Expand Down
1 change: 1 addition & 0 deletions packaging/torchaudio/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ build:
- USE_CUDA
- TORCH_CUDA_ARCH_LIST
- USE_FFMPEG
- USE_OPENMP
- FFMPEG_ROOT

test:
Expand Down