Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove support for arm32 #5811

Merged
merged 4 commits into from
Dec 3, 2024
Merged

remove support for arm32 #5811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd200c6
Update benchmark.py
Shironana817 Nov 12, 2024
18a55b2
Update windows-arm.yml
Shironana817 Nov 28, 2024
9c16ca7
Update release.yml
Shironana817 Nov 28, 2024
dd45fbb
Update release.yml
Shironana817 Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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
Expand Down
11 changes: 0 additions & 11 deletions .github/workflows/windows-arm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion python/tests/benchmark.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import time
import ncnn

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

g_warmup_loop_count = 8
g_loop_count = 4
Expand Down
Loading