Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 94f8a49

Browse files
committedOct 18, 2024·
CICD: Manually copy over libomp to wheel and update wheel dependencies
CICD: Disable delocate and manually copy over libomp
1 parent 848d8bc commit 94f8a49

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed
 

‎.github/workflows/wheels.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
cmake --build openmp_build --target install --config Release
8282
8383
- name: Install cibuildwheel
84-
run: python -m pip install cibuildwheel==2.21.2
84+
run: python -m pip install cibuildwheel==2.21.3
8585

8686
- name: Build wheels
8787
run: python -m cibuildwheel --output-dir wheelhouse
@@ -90,7 +90,7 @@ jobs:
9090
CIBW_TEST_COMMAND: pytest {project}/tests && python -c "from sparse_dot_topn import _has_openmp_support;assert _has_openmp_support"
9191
# only build for arm; x86_64 wheels are build seperately
9292
CIBW_ARCHS_MACOS: "arm64"
93-
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"
93+
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_VENDOR_OPENMP=ON -DSDTN_ENABLE_OPENMP=ON -DSDTN_DISABLE_OPENMP=OFF -DOpenMP_ROOT=$HOME/.local/libomp"
9494

9595
- name: Verify clean directory
9696
run: git diff --exit-code
@@ -123,7 +123,7 @@ jobs:
123123
- name: Clone OpenMP repo
124124
if: steps.clone-openmp.outputs.cache-hit != 'true'
125125
run: |
126-
git clone --depth 1 --branch llvmorg-17.0.6 https://github.com/llvm/llvm-project
126+
git clone --depth 1 --branch llvmorg-19.1.1 https://github.com/llvm/llvm-project
127127
128128
- name: Build OpenMP
129129
shell: bash
@@ -141,11 +141,11 @@ jobs:
141141
-DCMAKE_INSTALL_PREFIX="/usr/local"
142142
cmake --build openmp_build --target install --config Release
143143
144-
- uses: pypa/cibuildwheel@v2.21.2
144+
- uses: pypa/cibuildwheel@v2.21.3
145145
env:
146146
# only build for x86_64, arm wheels are build seperately
147147
CIBW_ARCHS: "x86_64"
148-
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"
148+
CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET=12.0 CMAKE_ARGS="-DSDTN_ENABLE_ARCH_FLAGS=OFF -DSDTN_VENDOR_OPENMP=ON -DSDTN_ENABLE_OPENMP=ON -DSDTN_DISABLE_OPENMP=OFF -DOpenMP_ROOT=/usr/local"
149149

150150
- name: Verify clean directory
151151
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)
Please sign in to comment.