Skip to content

Commit d417e3f

Browse files
committed
CICD: Disable delocate and manually copy over libomp
1 parent 590a47b commit d417e3f

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

.github/workflows/wheels.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
CIBW_TEST_COMMAND: pytest {project}/tests && python -c "from sparse_dot_topn import _has_openmp_support;assert _has_openmp_support"
9696
# only build for arm; x86_64 wheels are build seperately
9797
CIBW_ARCHS_MACOS: "arm64"
98-
CIBW_ENVIRONMENT_MACOS: PATH="$HOME/.local/:$PATH" MACOSX_DEPLOYMENT_TARGET="12.0" DYLD_LIBRARY_PATH="$HOME/.local/libomp/lib" CMAKE_ARGS="-DSDTN_ENABLE_ARCH_FLAGS=OFF -DSDTN_ENABLE_OPENMP=ON -DSDTN_DISABLE_OPENMP=OFF -DOpenMP_ROOT=$HOME/.local/libomp"
98+
CIBW_ENVIRONMENT_MACOS: PATH="$HOME/.local/:$PATH" MACOSX_DEPLOYMENT_TARGET=$MACOS_DEPL_VERSION DYLD_LIBRARY_PATH="$HOME/.local/libomp/lib" CMAKE_ARGS="-DSDTN_ENABLE_ARCH_FLAGS=OFF -DSDTN_VENDOR_OPENMP=ON -DSDTN_ENABLE_OPENMP=ON -DSDTN_DISABLE_OPENMP=OFF -DOpenMP_ROOT=$HOME/.local/libomp"
9999

100100
- name: Verify clean directory
101101
run: git diff --exit-code
@@ -150,7 +150,7 @@ jobs:
150150
env:
151151
# only build for x86_64, arm wheels are build seperately
152152
CIBW_ARCHS: "x86_64"
153-
CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET="12.0" CMAKE_ARGS="-DSDTN_ENABLE_ARCH_FLAGS=OFF -DSDTN_ENABLE_OPENMP=ON -DSDTN_DISABLE_OPENMP=OFF -DOpenMP_ROOT=/usr/local"
153+
CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET=$MACOS_DEPL_VERSION CMAKE_ARGS="-DSDTN_ENABLE_ARCH_FLAGS=OFF -DSDTN_VENDOR_OPENMP=ON -DSDTN_ENABLE_OPENMP=ON -DSDTN_DISABLE_OPENMP=OFF -DOpenMP_ROOT=/usr/local"
154154

155155
- name: Verify clean directory
156156
run: git diff --exit-code

pyproject.toml

-2
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ repair-wheel-command = "auditwheel repair -w {dest_dir} {wheel}"
7777
[tool.cibuildwheel.macos]
7878
archs = ["x86_64", "arm64"]
7979
# Needed for full C++17 support
80-
environment = { MACOSX_DEPLOYMENT_TARGET = "12.0", CMAKE_ARGS="-DSDTN_ENABLE_ARCH_FLAGS=OFF -DSDTN_DISABLE_OPENMP=ON" }
81-
repair-wheel-command = "delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}"
8280

8381
[tool.cibuildwheel.windows]
8482
before-build = "pip install delvewheel"

0 commit comments

Comments
 (0)