Skip to content

Commit 3d224f2

Browse files
authored
remove support for windows arm32 (#5811)
1 parent 0611ca7 commit 3d224f2

File tree

3 files changed

+1
-21
lines changed

3 files changed

+1
-21
lines changed

.github/workflows/release.yml

-9
Original file line numberDiff line numberDiff line change
@@ -2101,13 +2101,6 @@ jobs:
21012101
cmake ${{ env.NCNN_CMAKE_OPTIONS }} -A x64 -Dprotobuf_DIR="$env:GITHUB_WORKSPACE\protobuf-install\x64\cmake" ..
21022102
cmake --build . --config Release -j 4
21032103
cmake --build . --config Release --target install
2104-
- name: build-arm
2105-
if: matrix.opt.toolset-version == 'v142' || matrix.opt.toolset-version == 'v143'
2106-
run: |
2107-
mkdir build-arm; cd build-arm
2108-
cmake ${{ env.NCNN_CMAKE_OPTIONS }} -A arm ..
2109-
cmake --build . --config Release -j 4
2110-
cmake --build . --config Release --target install
21112104
- name: build-arm64
21122105
if: matrix.opt.toolset-version == 'v142' || matrix.opt.toolset-version == 'v143'
21132106
run: |
@@ -2130,11 +2123,9 @@ jobs:
21302123
mkdir ${{ env.PACKAGENAME }}
21312124
mkdir ${{ env.PACKAGENAME }}/x86
21322125
mkdir ${{ env.PACKAGENAME }}/x64
2133-
mkdir ${{ env.PACKAGENAME }}/arm
21342126
mkdir ${{ env.PACKAGENAME }}/arm64
21352127
Copy-Item -Verbose -Recurse -Path "build-x86\install\*" -Destination "${{ env.PACKAGENAME }}\x86"
21362128
Copy-Item -Verbose -Recurse -Path "build-x64\install\*" -Destination "${{ env.PACKAGENAME }}\x64"
2137-
Copy-Item -Verbose -Recurse -Path "build-arm\install\*" -Destination "${{ env.PACKAGENAME }}\arm"
21382129
Copy-Item -Verbose -Recurse -Path "build-arm64\install\*" -Destination "${{ env.PACKAGENAME }}\arm64"
21392130
7z a -r ${{ env.PACKAGENAME }}.zip ${{ env.PACKAGENAME }}
21402131
- name: upload-zip

.github/workflows/windows-arm.yml

-11
Original file line numberDiff line numberDiff line change
@@ -56,22 +56,11 @@ jobs:
5656
mkdir build-arm64; cd build-arm64
5757
cmake -T ${{ matrix.toolset-version }},host=x64 -A arm64 ${{ env.NCNN_CMAKE_OPTIONS }} ..
5858
cmake --build . --config Release -j 4
59-
- name: arm
60-
run: |
61-
mkdir build-arm; cd build-arm
62-
cmake -T ${{ matrix.toolset-version }},host=x64 -A arm ${{ env.NCNN_CMAKE_OPTIONS }} ..
63-
cmake --build . --config Release -j 4
6459
- name: arm64-shared
6560
run: |
6661
mkdir build-arm64-shared; cd build-arm64-shared
6762
cmake -T ${{ matrix.toolset-version }},host=x64 -A arm64 ${{ env.NCNN_CMAKE_OPTIONS }} -DNCNN_SHARED_LIB=ON ..
6863
cmake --build . --config Release -j 4
69-
- name: arm-shared
70-
run: |
71-
mkdir build-arm-shared; cd build-arm-shared
72-
cmake -T ${{ matrix.toolset-version }},host=x64 -A arm ${{ env.NCNN_CMAKE_OPTIONS }} -DNCNN_SHARED_LIB=ON ..
73-
cmake --build . --config Release -j 4
74-
7564
woa-linux:
7665
name: woa-linux
7766
runs-on: ubuntu-latest

python/tests/benchmark.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import time
1717
import ncnn
1818

19-
param_root = "../benchmark/"
19+
param_root = "../../benchmark"
2020

2121
g_warmup_loop_count = 8
2222
g_loop_count = 4

0 commit comments

Comments
 (0)