Browse Source

remove support for windows arm32 (#5811)

tags/20241226
Shironana GitHub 1 year ago
parent
commit
3d224f2790
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
3 changed files with 1 additions and 21 deletions
  1. +0
    -9
      .github/workflows/release.yml
  2. +0
    -11
      .github/workflows/windows-arm.yml
  3. +1
    -1
      python/tests/benchmark.py

+ 0
- 9
.github/workflows/release.yml View File

@@ -2101,13 +2101,6 @@ jobs:
cmake ${{ env.NCNN_CMAKE_OPTIONS }} -A x64 -Dprotobuf_DIR="$env:GITHUB_WORKSPACE\protobuf-install\x64\cmake" ..
cmake --build . --config Release -j 4
cmake --build . --config Release --target install
- name: build-arm
if: matrix.opt.toolset-version == 'v142' || matrix.opt.toolset-version == 'v143'
run: |
mkdir build-arm; cd build-arm
cmake ${{ env.NCNN_CMAKE_OPTIONS }} -A arm ..
cmake --build . --config Release -j 4
cmake --build . --config Release --target install
- name: build-arm64
if: matrix.opt.toolset-version == 'v142' || matrix.opt.toolset-version == 'v143'
run: |
@@ -2130,11 +2123,9 @@ jobs:
mkdir ${{ env.PACKAGENAME }}
mkdir ${{ env.PACKAGENAME }}/x86
mkdir ${{ env.PACKAGENAME }}/x64
mkdir ${{ env.PACKAGENAME }}/arm
mkdir ${{ env.PACKAGENAME }}/arm64
Copy-Item -Verbose -Recurse -Path "build-x86\install\*" -Destination "${{ env.PACKAGENAME }}\x86"
Copy-Item -Verbose -Recurse -Path "build-x64\install\*" -Destination "${{ env.PACKAGENAME }}\x64"
Copy-Item -Verbose -Recurse -Path "build-arm\install\*" -Destination "${{ env.PACKAGENAME }}\arm"
Copy-Item -Verbose -Recurse -Path "build-arm64\install\*" -Destination "${{ env.PACKAGENAME }}\arm64"
7z a -r ${{ env.PACKAGENAME }}.zip ${{ env.PACKAGENAME }}
- name: upload-zip


+ 0
- 11
.github/workflows/windows-arm.yml View File

@@ -56,22 +56,11 @@ jobs:
mkdir build-arm64; cd build-arm64
cmake -T ${{ matrix.toolset-version }},host=x64 -A arm64 ${{ env.NCNN_CMAKE_OPTIONS }} ..
cmake --build . --config Release -j 4
- name: arm
run: |
mkdir build-arm; cd build-arm
cmake -T ${{ matrix.toolset-version }},host=x64 -A arm ${{ env.NCNN_CMAKE_OPTIONS }} ..
cmake --build . --config Release -j 4
- name: arm64-shared
run: |
mkdir build-arm64-shared; cd build-arm64-shared
cmake -T ${{ matrix.toolset-version }},host=x64 -A arm64 ${{ env.NCNN_CMAKE_OPTIONS }} -DNCNN_SHARED_LIB=ON ..
cmake --build . --config Release -j 4
- name: arm-shared
run: |
mkdir build-arm-shared; cd build-arm-shared
cmake -T ${{ matrix.toolset-version }},host=x64 -A arm ${{ env.NCNN_CMAKE_OPTIONS }} -DNCNN_SHARED_LIB=ON ..
cmake --build . --config Release -j 4

woa-linux:
name: woa-linux
runs-on: ubuntu-latest


+ 1
- 1
python/tests/benchmark.py View File

@@ -16,7 +16,7 @@ import sys
import time
import ncnn

param_root = "../benchmark/"
param_root = "../../benchmark"

g_warmup_loop_count = 8
g_loop_count = 4


Loading…
Cancel
Save