Skip to content

Commit 69d0c96

Browse files
authored
[MRG] Reverting openmp compilation flags for macOS (#797)
* Reverting openmp compilation flags * Reverting openmp compilation flags (ruff-format) * Wring PR number * Typo in new test * Removing tes_ot_openmp (already tested in test_ot)
1 parent e164e78 commit 69d0c96

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

RELEASES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ This new release adds support for sparse cost matrices and a new lazy EMD solver
2424
- Clean documentation (PR #787)
2525
- Fix code coverage (PR #791)
2626
- Fix test of the version of jax in `ot.backend` (PR #794)
27+
- Reverting the openmp fix on macOS (PR #789) for macOS (PR #797)
2728

2829

2930
## 0.9.6.post1

ot/helpers/openmp_helpers.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,13 @@ def get_openmp_flag(compiler):
3434
omp_flag = ["-fopenmp"]
3535
if sys.platform.startswith("darwin"):
3636
omp_flag = ["-Xpreprocessor", "-fopenmp"]
37-
omp_flag += ["-I/usr/local/opt/libomp/include"]
3837
# Assuming `brew install libomp` on recent macOS
3938
if os.path.isfile("/opt/homebrew/opt/libomp/lib/libomp.dylib"):
4039
omp_flag += ["-I/opt/homebrew/opt/libomp/include"]
41-
omp_flag += ["/opt/homebrew/opt/libomp/lib/libomp.dylib"]
4240
else:
4341
# Assuming `brew install libomp` on old macOS
4442
if os.path.isfile("/usr/local/opt/libomp/lib/libomp.dylib"):
4543
omp_flag += ["-I/usr/local/opt/libomp/include"]
46-
omp_flag += ["/usr/local/opt/libomp/lib/libomp.dylib"]
4744

4845
return omp_flag
4946

0 commit comments

Comments
 (0)