Skip to content

Commit 5dc998e

Browse files
nihuinihui
authored
update release ci, drop bitcode and 32bit apple package, visionos package (#5409)
1 parent f61e2d1 commit 5dc998e

File tree

2 files changed

+1092
-1042
lines changed

2 files changed

+1092
-1042
lines changed

‎.github/workflows/release-python.yml

+52-41
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ on:
66
- '*'
77

88
env:
9-
DEVELOPER_DIR: /Applications/Xcode_13.4.1.app/Contents/Developer
10-
MAC_DEPLOYMENT_TARGET: '10.9'
11-
MAC_ARM64_DEPLOYMENT_TARGET: '11.0'
9+
DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
10+
MAC_DEPLOYMENT_TARGET: '11.0'
1211
ENABLE_BITCODE: OFF
1312
ENABLE_ARC: OFF
1413
ENABLE_VISIBILITY: OFF
@@ -57,9 +56,24 @@ jobs:
5756
- { os: windows-2019, arch: AMD64, build: 'cp*', build_id: cp }
5857
- { os: windows-2019, arch: AMD64, build: 'pp*', build_id: pp }
5958
- { os: windows-2019, arch: ARM64, build: 'cp*', build_id: cp }
60-
- { os: macos-latest, arch: x86_64, build: 'cp*', build_id: cp }
61-
- { os: macos-latest, arch: x86_64, build: 'pp*', build_id: pp }
62-
- { os: macos-latest, arch: arm64, build: 'cp*', build_id: cp }
59+
- { os: macos-13, arch: x86_64, build: 'cp*', build_id: cp }
60+
- { os: macos-13, arch: x86_64, build: 'pp*', build_id: pp }
61+
- { os: macos-13, arch: arm64, build: 'cp*', build_id: cp }
62+
63+
env:
64+
OPENMP_VERSION: '18.1.2'
65+
OPENMP_CMAKE_OPTIONS: |
66+
-DCMAKE_TOOLCHAIN_FILE=../../toolchains/ios.toolchain.cmake \
67+
-DDEPLOYMENT_TARGET=$MAC_DEPLOYMENT_TARGET \
68+
-DENABLE_BITCODE=$ENABLE_BITCODE \
69+
-DENABLE_ARC=$ENABLE_ARC \
70+
-DENABLE_VISIBILITY=$ENABLE_VISIBILITY \
71+
-DCMAKE_INSTALL_PREFIX=install \
72+
-DCMAKE_BUILD_TYPE=Release \
73+
-DPERL_EXECUTABLE=/usr/local/bin/perl \
74+
-DLIBOMP_ENABLE_SHARED=OFF \
75+
-DLIBOMP_OMPT_SUPPORT=OFF \
76+
-DLIBOMP_USE_HWLOC=OFF \
6377
6478
steps:
6579
- uses: actions/checkout@v4
@@ -109,76 +123,73 @@ jobs:
109123
with:
110124
output-dir: wheelhouse
111125

112-
# build wheels for macos-latest
126+
# build wheels for macos-13
113127
- name: cache-openmp for macos
114-
if: matrix.os == 'macos-latest'
128+
if: matrix.os == 'macos-13'
115129
id: cache-openmp
116130
uses: actions/cache@v4
117131
with:
118132
path: openmp-install
119-
key: openmp-macos-install-20230504
133+
key: openmp-macos-install-20240403
120134

121135
- name: openmp for macos
122-
if: matrix.os == 'macos-latest' && steps.cache-openmp.outputs.cache-hit != 'true'
136+
if: matrix.os == 'macos-13' && steps.cache-openmp.outputs.cache-hit != 'true'
123137
run: |
124-
wget https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.0/openmp-11.0.0.src.tar.xz
125-
tar -xf openmp-11.0.0.src.tar.xz
126-
cd openmp-11.0.0.src
127-
sed -i'' -e '/.size __kmp_unnamed_critical_addr/d' runtime/src/z_Linux_asm.S
128-
sed -i'' -e 's/__kmp_unnamed_critical_addr/___kmp_unnamed_critical_addr/g' runtime/src/z_Linux_asm.S
138+
wget https://github.com/llvm/llvm-project/releases/download/llvmorg-${{ env.OPENMP_VERSION }}/cmake-${{ env.OPENMP_VERSION }}.src.tar.xz
139+
tar -xf cmake-${{ env.OPENMP_VERSION }}.src.tar.xz
140+
wget https://github.com/llvm/llvm-project/releases/download/llvmorg-${{ env.OPENMP_VERSION }}/openmp-${{ env.OPENMP_VERSION }}.src.tar.xz
141+
tar -xf openmp-${{ env.OPENMP_VERSION }}.src.tar.xz
142+
mv cmake-${{ env.OPENMP_VERSION }}.src/Modules/* openmp-${{ env.OPENMP_VERSION }}.src/cmake/
143+
cd openmp-${{ env.OPENMP_VERSION }}.src
144+
wget https://github.com/nihui/llvm-project/commit/ef8c35bcf5d9cfdb0764ffde6a63c04ec715bc37.patch
145+
patch -p2 -i ef8c35bcf5d9cfdb0764ffde6a63c04ec715bc37.patch
146+
wget https://github.com/nihui/llvm-project/commit/5c12711f9a21f41bea70566bf15a4026804d6b20.patch
147+
patch -p2 -i 5c12711f9a21f41bea70566bf15a4026804d6b20.patch
129148
130149
- name: openmp-build-x86_64 for macos
131-
if: matrix.os == 'macos-latest' && steps.cache-openmp.outputs.cache-hit != 'true'
150+
if: matrix.os == 'macos-13' && steps.cache-openmp.outputs.cache-hit != 'true'
132151
run: |
133-
cd openmp-11.0.0.src
152+
cd openmp-${{ env.OPENMP_VERSION }}.src
134153
mkdir -p build-x86_64 && cd build-x86_64
135-
cmake -DCMAKE_TOOLCHAIN_FILE=$GITHUB_WORKSPACE/toolchains/ios.toolchain.cmake -DPLATFORM=MAC -DARCHS="x86_64" \
136-
-DDEPLOYMENT_TARGET=$MAC_DEPLOYMENT_TARGET -DENABLE_BITCODE=$ENABLE_BITCODE -DENABLE_ARC=$ENABLE_ARC -DENABLE_VISIBILITY=$ENABLE_VISIBILITY \
137-
-DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install \
138-
-DPERL_EXECUTABLE=/usr/local/bin/perl \
139-
-DLIBOMP_ENABLE_SHARED=OFF -DLIBOMP_OMPT_SUPPORT=OFF -DLIBOMP_USE_HWLOC=OFF ..
140-
cmake --build . -j 3
154+
cmake ${{ env.OPENMP_CMAKE_OPTIONS }} -DPLATFORM=MAC -DARCHS="x86_64" ..
155+
cmake --build . -j 4
141156
cmake --build . --target install
142157
143158
- name: openmp-build-arm64 for macos
144-
if: matrix.os == 'macos-latest' && steps.cache-openmp.outputs.cache-hit != 'true'
159+
if: matrix.os == 'macos-13' && steps.cache-openmp.outputs.cache-hit != 'true'
145160
run: |
146-
cd openmp-11.0.0.src
161+
cd openmp-${{ env.OPENMP_VERSION }}.src
147162
mkdir -p build-arm64 && cd build-arm64
148-
cmake -DCMAKE_TOOLCHAIN_FILE=$GITHUB_WORKSPACE/toolchains/ios.toolchain.cmake -DPLATFORM=MAC_ARM64 -DARCHS="arm64" \
149-
-DDEPLOYMENT_TARGET=$MAC_ARM64_DEPLOYMENT_TARGET -DENABLE_BITCODE=$ENABLE_BITCODE -DENABLE_ARC=$ENABLE_ARC -DENABLE_VISIBILITY=$ENABLE_VISIBILITY \
150-
-DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install \
151-
-DPERL_EXECUTABLE=/usr/local/bin/perl \
152-
-DLIBOMP_ENABLE_SHARED=OFF -DLIBOMP_OMPT_SUPPORT=OFF -DLIBOMP_USE_HWLOC=OFF ..
153-
cmake --build . -j 3
163+
cmake ${{ env.OPENMP_CMAKE_OPTIONS }} -DPLATFORM=MAC_ARM64 -DARCHS="arm64" ..
164+
cmake --build . -j 4
154165
cmake --build . --target install
155166
156167
- name: openmp-merge-fat-library for macos
157-
if: matrix.os == 'macos-latest' && steps.cache-openmp.outputs.cache-hit != 'true'
168+
if: matrix.os == 'macos-13' && steps.cache-openmp.outputs.cache-hit != 'true'
158169
run: |
159170
mkdir -p $GITHUB_WORKSPACE/openmp-install
160-
cp -a openmp-11.0.0.src/build-x86_64/install/include $GITHUB_WORKSPACE/openmp-install
171+
cp -a openmp-${{ env.OPENMP_VERSION }}.src/build-x86_64/install/include $GITHUB_WORKSPACE/openmp-install
161172
mkdir -p $GITHUB_WORKSPACE/openmp-install/lib
162173
lipo -create \
163-
openmp-11.0.0.src/build-x86_64/install/lib/libomp.a \
164-
openmp-11.0.0.src/build-arm64/install/lib/libomp.a \
174+
openmp-${{ env.OPENMP_VERSION }}.src/build-x86_64/install/lib/libomp.a \
175+
openmp-${{ env.OPENMP_VERSION }}.src/build-arm64/install/lib/libomp.a \
165176
-o $GITHUB_WORKSPACE/openmp-install/lib/libomp.a
166177
167178
- name: install-openmp for macos
168-
if: matrix.os == 'macos-latest'
179+
if: matrix.os == 'macos-13'
169180
run: |
170181
sudo cp $GITHUB_WORKSPACE/openmp-install/include/* $DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include
171182
sudo cp $GITHUB_WORKSPACE/openmp-install/lib/libomp.a $DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib
172183
173184
- name: vulkansdk for macos
174-
if: matrix.os == 'macos-latest'
185+
if: matrix.os == 'macos-13'
175186
run: |
176187
wget https://sdk.lunarg.com/sdk/download/1.3.236.0/mac/vulkansdk-macos-1.3.236.0.dmg?Human=true -O vulkansdk-macos-1.3.236.0.dmg
177188
hdiutil attach vulkansdk-macos-1.3.236.0.dmg
178189
sudo /Volumes/vulkansdk-macos-1.3.236.0/InstallVulkan.app/Contents/MacOS/InstallVulkan --root $GITHUB_WORKSPACE/vulkansdk-macos-1.3.236.0 --accept-licenses --default-answer --confirm-command install
179190
180191
- name: Build wheels for macos x86_64
181-
if: matrix.os == 'macos-latest' && matrix.arch == 'x86_64'
192+
if: matrix.os == 'macos-13' && matrix.arch == 'x86_64'
182193
uses: pypa/[email protected]
183194
env:
184195
CIBW_ARCHS_MACOS: ${{ matrix.arch }}
@@ -189,13 +200,13 @@ jobs:
189200
DEPLOYMENT_TARGET="10.9" ENABLE_BITCODE=OFF ENABLE_ARC=OFF ENABLE_VISIBILITY=OFF
190201
OpenMP_C_FLAGS="-Xclang -fopenmp" OpenMP_CXX_FLAGS="-Xclang -fopenmp"
191202
OpenMP_C_LIB_NAMES="libomp" OpenMP_CXX_LIB_NAMES="libomp"
192-
OpenMP_libomp_LIBRARY="$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/libomp.a"
203+
OpenMP_libomp_LIBRARY="libomp.a"
193204
Vulkan_LIBRARY=$GITHUB_WORKSPACE/vulkansdk-macos-1.3.236.0/MoltenVK/dylib/macOS/libMoltenVK.dylib
194205
with:
195206
output-dir: wheelhouse
196207

197208
- name: Build wheels for macos arm64
198-
if: matrix.os == 'macos-latest' && matrix.arch == 'arm64'
209+
if: matrix.os == 'macos-13' && matrix.arch == 'arm64'
199210
uses: pypa/[email protected]
200211
env:
201212
CIBW_ARCHS_MACOS: ${{ matrix.arch }}
@@ -206,7 +217,7 @@ jobs:
206217
DEPLOYMENT_TARGET="11.0" ENABLE_BITCODE=OFF ENABLE_ARC=OFF ENABLE_VISIBILITY=OFF
207218
OpenMP_C_FLAGS="-Xclang -fopenmp" OpenMP_CXX_FLAGS="-Xclang -fopenmp"
208219
OpenMP_C_LIB_NAMES="libomp" OpenMP_CXX_LIB_NAMES="libomp"
209-
OpenMP_libomp_LIBRARY="$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/libomp.a"
220+
OpenMP_libomp_LIBRARY="libomp.a"
210221
Vulkan_LIBRARY=$GITHUB_WORKSPACE/vulkansdk-macos-1.3.236.0/MoltenVK/dylib/macOS/libMoltenVK.dylib
211222
with:
212223
output-dir: wheelhouse

0 commit comments

Comments
 (0)