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

Jump to bottom

Set LDFLAGS and CPPFLAGS for keg-only libomp in CI config #7407

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Set LDFLAGS and CPPFLAGS for keg-only libomp in CI config #7407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6343433
Set LDFLAGS and CPPFLAGS for keg-only libomp
lagru Apr 30, 2024
46d3e7c
Merge branch 'main' into patch-clang-macos
lagru May 6, 2024
3b57214
Revert "Temporarily pin macos-12 runner in CI (#7408)"
lagru May 6, 2024
d792764
Merge branch 'main' into patch-clang-macos
lagru May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ jobs:

test_skimage_macos:
name: macos-cp${{ matrix.python-version }}
runs-on: macos-12
runs-on: macos-latest

strategy:
# Ensure that a wheel builder finishes even if another fails
Expand All @@ -123,10 +123,14 @@ jobs:
TEST_EXAMPLES: 0
CC: /usr/bin/clang
CXX: /usr/bin/clang++
CPPFLAGS: "-Xpreprocessor -fopenmp"
CPPFLAGS: "-Xpreprocessor -fopenmp -I/opt/homebrew/opt/libomp/include"
CFLAGS: "-Wno-implicit-function-declaration -I/usr/local/opt/libomp/include"
CXXFLAGS: "-I/usr/local/opt/libomp/include"
LDFLAGS: "-Wl,-rpath,/usr/local/opt/libomp/lib -L/usr/local/opt/libomp/lib -lomp"
LDFLAGS: >-
-Wl,-rpath,/usr/local/opt/libomp/lib
-L/usr/local/opt/libomp/lib
-L/opt/homebrew/opt/libomp/lib
-lomp

steps:
- name: Checkout scikit-image
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/wheels_recipe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos-12]
os: [macos-latest]
cibw_python: ["cp310-*", "cp311-*", "cp312-*"]
# TODO: add "universal2" once a universal2 libomp is available
cibw_arch: ["x86_64", "arm64"]
Expand Down