Skip to content

Commit b27d507

Browse files
nihuinihui
committed
drop online spirv ci variant as it is the default one, update qcom410 benchmark
1 parent eec5cf7 commit b27d507

11 files changed

+60
-492
lines changed

‎.github/workflows/android-armv7-gpu.yml

-24
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,3 @@ jobs:
2222
run: export PATH=`pwd`/1.1.114.0/x86_64/bin:$PATH && mkdir build && cd build && cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_HOME/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_ABI="armeabi-v7a" -DANDROID_ARM_NEON=ON -DANDROID_PLATFORM=android-24 -DNCNN_VULKAN=ON ..
2323
- name: build
2424
run: cmake --build build -j 2
25-
26-
android-armv7-gpu-online-spirv:
27-
runs-on: ubuntu-latest
28-
steps:
29-
- uses: actions/checkout@v2
30-
with:
31-
submodules: 'true'
32-
- name: cache-vulkansdk
33-
id: cache-vulkansdk
34-
uses: actions/cache@v1
35-
with:
36-
path: "1.1.114.0"
37-
key: vulkansdk-linux-x86_64-1.1.114.0
38-
- name: vulkansdk
39-
if: steps.cache-vulkansdk.outputs.cache-hit != 'true'
40-
run: |
41-
wget https://sdk.lunarg.com/sdk/download/1.1.114.0/linux/vulkansdk-linux-x86_64-1.1.114.0.tar.gz?Human=true -O vulkansdk-linux-x86_64-1.1.114.0.tar.gz
42-
tar -xf vulkansdk-linux-x86_64-1.1.114.0.tar.gz
43-
rm -rf 1.1.114.0/source 1.1.114.0/samples
44-
find 1.1.114.0 -type f | grep -v -E 'vulkan|glslang' | xargs rm
45-
- name: configure
46-
run: export PATH=`pwd`/1.1.114.0/x86_64/bin:$PATH && mkdir build && cd build && cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_HOME/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_ABI="armeabi-v7a" -DANDROID_ARM_NEON=ON -DANDROID_PLATFORM=android-24 -DNCNN_VULKAN=ON -DNCNN_VULKAN_ONLINE_SPIRV=ON ..
47-
- name: build
48-
run: cmake --build build -j 2

‎.github/workflows/android-armv8-gpu.yml

-24
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,3 @@ jobs:
2222
run: export PATH=`pwd`/1.1.114.0/x86_64/bin:$PATH && mkdir build && cd build && cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_HOME/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_ABI="arm64-v8a" -DANDROID_PLATFORM=android-24 -DNCNN_VULKAN=ON ..
2323
- name: build
2424
run: cmake --build build -j 2
25-
26-
android-aarch64-gpu-online-spirv:
27-
runs-on: ubuntu-latest
28-
steps:
29-
- uses: actions/checkout@v2
30-
with:
31-
submodules: 'true'
32-
- name: cache-vulkansdk
33-
id: cache-vulkansdk
34-
uses: actions/cache@v1
35-
with:
36-
path: "1.1.114.0"
37-
key: vulkansdk-linux-x86_64-1.1.114.0
38-
- name: vulkansdk
39-
if: steps.cache-vulkansdk.outputs.cache-hit != 'true'
40-
run: |
41-
wget https://sdk.lunarg.com/sdk/download/1.1.114.0/linux/vulkansdk-linux-x86_64-1.1.114.0.tar.gz?Human=true -O vulkansdk-linux-x86_64-1.1.114.0.tar.gz
42-
tar -xf vulkansdk-linux-x86_64-1.1.114.0.tar.gz
43-
rm -rf 1.1.114.0/source 1.1.114.0/samples
44-
find 1.1.114.0 -type f | grep -v -E 'vulkan|glslang' | xargs rm
45-
- name: configure
46-
run: export PATH=`pwd`/1.1.114.0/x86_64/bin:$PATH && mkdir build && cd build && cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_HOME/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_ABI="arm64-v8a" -DANDROID_PLATFORM=android-24 -DNCNN_VULKAN=ON -DNCNN_VULKAN_ONLINE_SPIRV=ON ..
47-
- name: build
48-
run: cmake --build build -j 2

‎.github/workflows/android-x64-gpu.yml

-24
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,3 @@ jobs:
2222
run: export PATH=`pwd`/1.1.114.0/x86_64/bin:$PATH && mkdir build && cd build && cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_HOME/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_ABI="x86_64" -DANDROID_PLATFORM=android-24 -DNCNN_VULKAN=ON ..
2323
- name: build
2424
run: cmake --build build -j 2
25-
26-
android-x86_64-gpu-online-spirv:
27-
runs-on: ubuntu-latest
28-
steps:
29-
- uses: actions/checkout@v2
30-
with:
31-
submodules: 'true'
32-
- name: cache-vulkansdk
33-
id: cache-vulkansdk
34-
uses: actions/cache@v1
35-
with:
36-
path: "1.1.114.0"
37-
key: vulkansdk-linux-x86_64-1.1.114.0
38-
- name: vulkansdk
39-
if: steps.cache-vulkansdk.outputs.cache-hit != 'true'
40-
run: |
41-
wget https://sdk.lunarg.com/sdk/download/1.1.114.0/linux/vulkansdk-linux-x86_64-1.1.114.0.tar.gz?Human=true -O vulkansdk-linux-x86_64-1.1.114.0.tar.gz
42-
tar -xf vulkansdk-linux-x86_64-1.1.114.0.tar.gz
43-
rm -rf 1.1.114.0/source 1.1.114.0/samples
44-
find 1.1.114.0 -type f | grep -v -E 'vulkan|glslang' | xargs rm
45-
- name: configure
46-
run: export PATH=`pwd`/1.1.114.0/x86_64/bin:$PATH && mkdir build && cd build && cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_HOME/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_ABI="x86_64" -DANDROID_PLATFORM=android-24 -DNCNN_VULKAN=ON -DNCNN_VULKAN_ONLINE_SPIRV=ON ..
47-
- name: build
48-
run: cmake --build build -j 2

‎.github/workflows/android-x86-gpu.yml

-24
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,3 @@ jobs:
2222
run: export PATH=`pwd`/1.1.114.0/x86_64/bin:$PATH && mkdir build && cd build && cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_HOME/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_ABI="x86" -DANDROID_PLATFORM=android-24 -DNCNN_VULKAN=ON ..
2323
- name: build
2424
run: cmake --build build -j 2
25-
26-
android-x86-gpu-online-spirv:
27-
runs-on: ubuntu-latest
28-
steps:
29-
- uses: actions/checkout@v2
30-
with:
31-
submodules: 'true'
32-
- name: cache-vulkansdk
33-
id: cache-vulkansdk
34-
uses: actions/cache@v1
35-
with:
36-
path: "1.1.114.0"
37-
key: vulkansdk-linux-x86_64-1.1.114.0
38-
- name: vulkansdk
39-
if: steps.cache-vulkansdk.outputs.cache-hit != 'true'
40-
run: |
41-
wget https://sdk.lunarg.com/sdk/download/1.1.114.0/linux/vulkansdk-linux-x86_64-1.1.114.0.tar.gz?Human=true -O vulkansdk-linux-x86_64-1.1.114.0.tar.gz
42-
tar -xf vulkansdk-linux-x86_64-1.1.114.0.tar.gz
43-
rm -rf 1.1.114.0/source 1.1.114.0/samples
44-
find 1.1.114.0 -type f | grep -v -E 'vulkan|glslang' | xargs rm
45-
- name: configure
46-
run: export PATH=`pwd`/1.1.114.0/x86_64/bin:$PATH && mkdir build && cd build && cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_HOME/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_ABI="x86" -DANDROID_PLATFORM=android-24 -DNCNN_VULKAN=ON -DNCNN_VULKAN_ONLINE_SPIRV=ON ..
47-
- name: build
48-
run: cmake --build build -j 2

‎.github/workflows/ios-64bit-gpu.yml

-24
Original file line numberDiff line numberDiff line change
@@ -22,27 +22,3 @@ jobs:
2222
run: export VULKAN_SDK=`pwd`/vulkansdk-macos-1.1.114.0/macOS && mkdir build && cd build && cmake -DCMAKE_TOOLCHAIN_FILE=../toolchains/ios.toolchain.cmake -DIOS_PLATFORM=OS64 -DVulkan_INCLUDE_DIR=`pwd`/../vulkansdk-macos-1.1.114.0/MoltenVK/include -DVulkan_LIBRARY=`pwd`/../vulkansdk-macos-1.1.114.0/MoltenVK/iOS/dynamic/libMoltenVK.dylib -DNCNN_VULKAN=ON ..
2323
- name: build
2424
run: cmake --build build -j 2
25-
26-
ios-iphone-os-gpu-online-spirv:
27-
runs-on: macos-latest
28-
steps:
29-
- uses: actions/checkout@v2
30-
with:
31-
submodules: 'true'
32-
- name: cache-vulkansdk
33-
id: cache-vulkansdk
34-
uses: actions/cache@v1
35-
with:
36-
path: "vulkansdk-macos-1.1.114.0"
37-
key: vulkansdk-macos-1.1.114.0
38-
- name: vulkansdk
39-
if: steps.cache-vulkansdk.outputs.cache-hit != 'true'
40-
run: |
41-
wget https://sdk.lunarg.com/sdk/download/1.1.114.0/mac/vulkansdk-macos-1.1.114.0.tar.gz?Human=true -O vulkansdk-macos-1.1.114.0.tar.gz
42-
tar -xf vulkansdk-macos-1.1.114.0.tar.gz
43-
rm -rf vulkansdk-macos-1.1.114.0/Applications
44-
find vulkansdk-macos-1.1.114.0 -type f | grep -v -E 'vulkan|glslang|MoltenVK' | xargs rm
45-
- name: configure
46-
run: export VULKAN_SDK=`pwd`/vulkansdk-macos-1.1.114.0/macOS && mkdir build && cd build && cmake -DCMAKE_TOOLCHAIN_FILE=../toolchains/ios.toolchain.cmake -DIOS_PLATFORM=OS64 -DVulkan_INCLUDE_DIR=`pwd`/../vulkansdk-macos-1.1.114.0/MoltenVK/include -DVulkan_LIBRARY=`pwd`/../vulkansdk-macos-1.1.114.0/MoltenVK/iOS/dynamic/libMoltenVK.dylib -DNCNN_VULKAN=ON -DNCNN_VULKAN_ONLINE_SPIRV=ON ..
47-
- name: build
48-
run: cmake --build build -j 2

‎.github/workflows/linux-x64-gpu-clang.yml

-62
Original file line numberDiff line numberDiff line change
@@ -60,65 +60,3 @@ jobs:
6060
run: |
6161
export VK_ICD_FILENAMES="$GITHUB_WORKSPACE/swiftshader-install/vk_swiftshader_icd.json"
6262
cd build && ctest --output-on-failure -j 2
63-
64-
linux-clang-gpu-online-spirv:
65-
runs-on: ubuntu-latest
66-
steps:
67-
- uses: actions/checkout@v2
68-
with:
69-
submodules: 'true'
70-
- name: update
71-
run: sudo apt-get update
72-
- name: protobuf
73-
run: sudo apt-get install libprotobuf-dev protobuf-compiler libopencv-dev
74-
- name: cache-vulkansdk
75-
id: cache-vulkansdk
76-
uses: actions/cache@v1
77-
with:
78-
path: "1.1.114.0"
79-
key: vulkansdk-linux-x86_64-1.1.114.0
80-
- name: vulkansdk
81-
if: steps.cache-vulkansdk.outputs.cache-hit != 'true'
82-
run: |
83-
wget https://sdk.lunarg.com/sdk/download/1.1.114.0/linux/vulkansdk-linux-x86_64-1.1.114.0.tar.gz?Human=true -O vulkansdk-linux-x86_64-1.1.114.0.tar.gz
84-
tar -xf vulkansdk-linux-x86_64-1.1.114.0.tar.gz
85-
rm -rf 1.1.114.0/source 1.1.114.0/samples
86-
find 1.1.114.0 -type f | grep -v -E 'vulkan|glslang' | xargs rm
87-
- name: cache-swiftshader
88-
id: cache-swiftshader
89-
uses: actions/cache@v1
90-
with:
91-
path: swiftshader-install
92-
key: swiftshader-linux-install-20200508
93-
- name: checkout-swiftshader
94-
if: steps.cache-swiftshader.outputs.cache-hit != 'true'
95-
uses: actions/checkout@v2
96-
with:
97-
repository: google/swiftshader
98-
path: swiftshader
99-
ref: 2dd864470e310d173d35fa95ca3a14d216734aab
100-
- name: checkout-swiftshader-submodules
101-
if: steps.cache-swiftshader.outputs.cache-hit != 'true'
102-
run: |
103-
cd swiftshader
104-
git submodule update --init --recursive
105-
- name: swiftshader
106-
if: steps.cache-swiftshader.outputs.cache-hit != 'true'
107-
run: |
108-
cd swiftshader
109-
mkdir -p build; cd build
110-
cmake -DCMAKE_INSTALL_PREFIX=install -DSWIFTSHADER_BUILD_EGL=FALSE -DSWIFTSHADER_BUILD_GLESv2=FALSE -DSWIFTSHADER_BUILD_GLES_CM=FALSE -DSWIFTSHADER_BUILD_VULKAN=TRUE -DSWIFTSHADER_BUILD_PVR=FALSE -DSWIFTSHADER_BUILD_TESTS=FALSE -DSWIFTSHADER_ENABLE_ASTC=FALSE -DSWIFTSHADER_WARNINGS_AS_ERRORS=FALSE -DREACTOR_BACKEND=Subzero -DREACTOR_DEFAULT_OPT_LEVEL=Default -DCMAKE_BUILD_TYPE=Release ..
111-
cmake --build . -j 2
112-
mkdir $GITHUB_WORKSPACE/swiftshader-install
113-
cp Linux/* $GITHUB_WORKSPACE/swiftshader-install
114-
- name: configure
115-
env:
116-
CC: clang
117-
CXX: clang++
118-
run: export VULKAN_SDK=`pwd`/1.1.114.0/x86_64 && mkdir build && cd build && cmake -DNCNN_VULKAN=ON -DNCNN_VULKAN_ONLINE_SPIRV=ON ..
119-
- name: build
120-
run: cmake --build build -j 2
121-
- name: test
122-
run: |
123-
export VK_ICD_FILENAMES="$GITHUB_WORKSPACE/swiftshader-install/vk_swiftshader_icd.json"
124-
cd build && ctest --output-on-failure -j 2

‎.github/workflows/linux-x64-gpu-gcc.yml

-59
Original file line numberDiff line numberDiff line change
@@ -57,62 +57,3 @@ jobs:
5757
run: |
5858
export VK_ICD_FILENAMES="$GITHUB_WORKSPACE/swiftshader-install/vk_swiftshader_icd.json"
5959
cd build && ctest --output-on-failure -j 2
60-
61-
linux-gcc-gpu-online-spirv:
62-
runs-on: ubuntu-latest
63-
steps:
64-
- uses: actions/checkout@v2
65-
with:
66-
submodules: 'true'
67-
- name: update
68-
run: sudo apt-get update
69-
- name: protobuf
70-
run: sudo apt-get install libprotobuf-dev protobuf-compiler libopencv-dev
71-
- name: cache-vulkansdk
72-
id: cache-vulkansdk
73-
uses: actions/cache@v1
74-
with:
75-
path: "1.1.114.0"
76-
key: vulkansdk-linux-x86_64-1.1.114.0
77-
- name: vulkansdk
78-
if: steps.cache-vulkansdk.outputs.cache-hit != 'true'
79-
run: |
80-
wget https://sdk.lunarg.com/sdk/download/1.1.114.0/linux/vulkansdk-linux-x86_64-1.1.114.0.tar.gz?Human=true -O vulkansdk-linux-x86_64-1.1.114.0.tar.gz
81-
tar -xf vulkansdk-linux-x86_64-1.1.114.0.tar.gz
82-
rm -rf 1.1.114.0/source 1.1.114.0/samples
83-
find 1.1.114.0 -type f | grep -v -E 'vulkan|glslang' | xargs rm
84-
- name: cache-swiftshader
85-
id: cache-swiftshader
86-
uses: actions/cache@v1
87-
with:
88-
path: swiftshader-install
89-
key: swiftshader-linux-install-20200508
90-
- name: checkout-swiftshader
91-
if: steps.cache-swiftshader.outputs.cache-hit != 'true'
92-
uses: actions/checkout@v2
93-
with:
94-
repository: google/swiftshader
95-
path: swiftshader
96-
ref: 2dd864470e310d173d35fa95ca3a14d216734aab
97-
- name: checkout-swiftshader-submodules
98-
if: steps.cache-swiftshader.outputs.cache-hit != 'true'
99-
run: |
100-
cd swiftshader
101-
git submodule update --init --recursive
102-
- name: swiftshader
103-
if: steps.cache-swiftshader.outputs.cache-hit != 'true'
104-
run: |
105-
cd swiftshader
106-
mkdir -p build; cd build
107-
cmake -DCMAKE_INSTALL_PREFIX=install -DSWIFTSHADER_BUILD_EGL=FALSE -DSWIFTSHADER_BUILD_GLESv2=FALSE -DSWIFTSHADER_BUILD_GLES_CM=FALSE -DSWIFTSHADER_BUILD_VULKAN=TRUE -DSWIFTSHADER_BUILD_PVR=FALSE -DSWIFTSHADER_BUILD_TESTS=FALSE -DSWIFTSHADER_ENABLE_ASTC=FALSE -DSWIFTSHADER_WARNINGS_AS_ERRORS=FALSE -DREACTOR_BACKEND=Subzero -DREACTOR_DEFAULT_OPT_LEVEL=Default -DCMAKE_BUILD_TYPE=Release ..
108-
cmake --build . -j 2
109-
mkdir $GITHUB_WORKSPACE/swiftshader-install
110-
cp Linux/* $GITHUB_WORKSPACE/swiftshader-install
111-
- name: configure
112-
run: export VULKAN_SDK=`pwd`/1.1.114.0/x86_64 && mkdir build && cd build && cmake -DNCNN_VULKAN=ON -DNCNN_VULKAN_ONLINE_SPIRV=ON ..
113-
- name: build
114-
run: cmake --build build -j 2
115-
- name: test
116-
run: |
117-
export VK_ICD_FILENAMES="$GITHUB_WORKSPACE/swiftshader-install/vk_swiftshader_icd.json"
118-
cd build && ctest --output-on-failure -j 2

‎.github/workflows/macos-x64-gpu.yml

-58
Original file line numberDiff line numberDiff line change
@@ -56,61 +56,3 @@ jobs:
5656
export DYLD_LIBRARY_PATH="vulkansdk-macos-1.1.114.0/macOS/lib":$DYLD_LIBRARY_PATH
5757
export VK_ICD_FILENAMES="$GITHUB_WORKSPACE/swiftshader-install/vk_swiftshader_icd.json"
5858
cd build && ctest --output-on-failure -j 2
59-
60-
macos-clang-gpu-online-spirv:
61-
runs-on: macos-latest
62-
steps:
63-
- uses: actions/checkout@v2
64-
with:
65-
submodules: 'true'
66-
- name: protobuf
67-
run: brew install protobuf opencv3
68-
- name: cache-vulkansdk
69-
id: cache-vulkansdk
70-
uses: actions/cache@v1
71-
with:
72-
path: "vulkansdk-macos-1.1.114.0"
73-
key: vulkansdk-macos-1.1.114.0
74-
- name: vulkansdk
75-
if: steps.cache-vulkansdk.outputs.cache-hit != 'true'
76-
run: |
77-
wget https://sdk.lunarg.com/sdk/download/1.1.114.0/mac/vulkansdk-macos-1.1.114.0.tar.gz?Human=true -O vulkansdk-macos-1.1.114.0.tar.gz
78-
tar -xf vulkansdk-macos-1.1.114.0.tar.gz
79-
rm -rf vulkansdk-macos-1.1.114.0/Applications
80-
find vulkansdk-macos-1.1.114.0 -type f | grep -v -E 'vulkan|glslang|MoltenVK' | xargs rm
81-
- name: cache-swiftshader
82-
id: cache-swiftshader
83-
uses: actions/cache@v1
84-
with:
85-
path: swiftshader-install
86-
key: swiftshader-macos-install-20200508
87-
- name: checkout-swiftshader
88-
if: steps.cache-swiftshader.outputs.cache-hit != 'true'
89-
uses: actions/checkout@v2
90-
with:
91-
repository: google/swiftshader
92-
path: swiftshader
93-
ref: 2dd864470e310d173d35fa95ca3a14d216734aab
94-
- name: checkout-swiftshader-submodules
95-
if: steps.cache-swiftshader.outputs.cache-hit != 'true'
96-
run: |
97-
cd swiftshader
98-
git submodule update --init --recursive
99-
- name: swiftshader
100-
if: steps.cache-swiftshader.outputs.cache-hit != 'true'
101-
run: |
102-
cd swiftshader
103-
mkdir -p build; cd build
104-
cmake -DCMAKE_INSTALL_PREFIX=install -DSWIFTSHADER_BUILD_EGL=FALSE -DSWIFTSHADER_BUILD_GLESv2=FALSE -DSWIFTSHADER_BUILD_GLES_CM=FALSE -DSWIFTSHADER_BUILD_VULKAN=TRUE -DSWIFTSHADER_BUILD_PVR=FALSE -DSWIFTSHADER_BUILD_TESTS=FALSE -DSWIFTSHADER_ENABLE_ASTC=FALSE -DSWIFTSHADER_WARNINGS_AS_ERRORS=FALSE -DREACTOR_BACKEND=Subzero -DREACTOR_DEFAULT_OPT_LEVEL=Default -DCMAKE_BUILD_TYPE=Release ..
105-
cmake --build . -j 2
106-
mkdir $GITHUB_WORKSPACE/swiftshader-install
107-
cp Darwin/* $GITHUB_WORKSPACE/swiftshader-install
108-
- name: configure
109-
run: export VULKAN_SDK=`pwd`/vulkansdk-macos-1.1.114.0/macOS && mkdir build && cd build && cmake -DNCNN_VULKAN=ON -DNCNN_VULKAN_ONLINE_SPIRV=ON ..
110-
- name: build
111-
run: cmake --build build -j 2
112-
- name: test
113-
run: |
114-
export DYLD_LIBRARY_PATH="vulkansdk-macos-1.1.114.0/macOS/lib":$DYLD_LIBRARY_PATH
115-
export VK_ICD_FILENAMES="$GITHUB_WORKSPACE/swiftshader-install/vk_swiftshader_icd.json"
116-
cd build && ctest --output-on-failure -j 2

0 commit comments

Comments
 (0)