Skip to content

Commit 7e9e438

Browse files
authored
CI: Upgrade macos-arm64-gpu vulkan sdk (Tencent#2464)
Upgrade vulkansdk version: vulkansdk-macos-1.2.135.0 -> vulkansdk-macos-1.2.162.0
1 parent ee28223 commit 7e9e438

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

.github/workflows/macos-arm64-gpu.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,26 +38,28 @@ jobs:
3838
id: cache-vulkansdk
3939
uses: actions/cache@v1
4040
with:
41-
path: "vulkansdk-macos-1.2.135.0"
42-
key: vulkansdk-macos-1.2.135.0
41+
path: "vulkansdk-macos-1.2.162.0"
42+
key: vulkansdk-macos-1.2.162.0
4343
- name: vulkansdk
4444
if: steps.cache-vulkansdk.outputs.cache-hit != 'true'
4545
run: |
46-
wget https://sdk.lunarg.com/sdk/download/1.2.135.0/mac/vulkansdk-macos-1.2.135.0.tar.gz?Human=true -O vulkansdk-macos-1.2.135.0.tar.gz
47-
tar -xf vulkansdk-macos-1.2.135.0.tar.gz
48-
rm -rf vulkansdk-macos-1.2.135.0/Applications
49-
find vulkansdk-macos-1.2.135.0 -type f | grep -v -E 'vulkan|glslang|MoltenVK' | xargs rm
46+
wget https://sdk.lunarg.com/sdk/download/1.2.162.0/mac/vulkansdk-macos-1.2.162.0.dmg?Human=true -O vulkansdk-macos-1.2.162.0.dmg
47+
hdiutil attach vulkansdk-macos-1.2.162.0.dmg
48+
cp -r /Volumes/vulkansdk-macos-1.2.162.0 .
49+
rm -rf vulkansdk-macos-1.2.162.0/Applications
50+
find vulkansdk-macos-1.2.162.0 -type f | grep -v -E 'vulkan|glslang|MoltenVK' | xargs rm
51+
hdiutil detach /Volumes/vulkansdk-macos-1.2.162.0
5052
- name: configure
5153
run: |
52-
export VULKAN_SDK=`pwd`/vulkansdk-macos-1.2.135.0/macOS
54+
export VULKAN_SDK=`pwd`/vulkansdk-macos-1.2.162.0/macOS
5355
mkdir build && cd build
5456
cmake -DCMAKE_CROSSCOMPILING=ON -DCMAKE_SYSTEM_PROCESSOR=arm64 -DCMAKE_OSX_ARCHITECTURES=arm64 \
5557
-DOpenMP_C_FLAGS="-Xclang -fopenmp" -DOpenMP_CXX_FLAGS="-Xclang -fopenmp" \
5658
-DOpenMP_C_LIB_NAMES="libomp" -DOpenMP_CXX_LIB_NAMES="libomp" \
5759
-DOpenMP_libomp_LIBRARY="$DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/libomp.a" \
5860
-DNCNN_BUILD_TOOLS=OFF -DNCNN_BUILD_EXAMPLES=OFF \
59-
-DVulkan_INCLUDE_DIR=`pwd`/../vulkansdk-macos-1.2.135.0/MoltenVK/include \
60-
-DVulkan_LIBRARY=`pwd`/../vulkansdk-macos-1.2.135.0/MoltenVK/iOS/dynamic/libMoltenVK.dylib \
61+
-DVulkan_INCLUDE_DIR=`pwd`/../vulkansdk-macos-1.2.162.0/MoltenVK/include \
62+
-DVulkan_LIBRARY=`pwd`/../vulkansdk-macos-1.2.162.0/MoltenVK/dylib/macOS/libMoltenVK.dylib \
6163
-DNCNN_VULKAN=ON ..
6264
- name: build
6365
run: cmake --build build -j 2

0 commit comments

Comments
 (0)