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

pnnx fix macos and windows build, add quick test ci #5838

Merged
merged 16 commits into from
Dec 23, 2024
Merged

pnnx fix macos and windows build, add quick test ci #5838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
65153a0
pnnx fix macos and windows build, add quick test ci
nihui Dec 20, 2024
7017686
setup python
nihui Dec 20, 2024
56ef069
setup python
nihui Dec 20, 2024
83aaf87
setup python
nihui Dec 20, 2024
648a8c9
setup python
nihui Dec 20, 2024
95d2613
setup python
nihui Dec 20, 2024
394831b
setup python
nihui Dec 20, 2024
8adcc82
find python
nihui Dec 20, 2024
f521563
install
nihui Dec 20, 2024
7146287
f
nihui Dec 20, 2024
f28b7ee
ff
nihui Dec 20, 2024
b3dc9df
fff
nihui Dec 20, 2024
cf364b9
Update pnnx.yml
nihui Dec 21, 2024
cf79368
Update pnnx.yml
nihui Dec 21, 2024
9ae721e
Revert "Update pnnx.yml"
nihui Dec 23, 2024
99a17d1
skip windows test
nihui Dec 23, 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
56 changes: 56 additions & 0 deletions .github/workflows/pnnx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: pnnx
on:
push:
branches: [master]
paths:
- '.github/workflows/pnnx.yml'
- 'tools/pnnx/**'
- '!tools/pnnx/README.md'
pull_request:
branches: [master]
paths:
- '.github/workflows/pnnx.yml'
- 'tools/pnnx/**'
- '!tools/pnnx/README.md'
concurrency:
group: pnnx-${{ github.ref }}
cancel-in-progress: true
permissions:
contents: read

jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]

env:
PYTHONUSERBASE: ${{ github.workspace }}/torch
UseMultiToolTask: true
steps:
- uses: actions/checkout@v4
Copy link
Preview

Copilot AI Dec 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The version 'v4' for 'actions/checkout' does not exist. It should be 'v3'.

Suggested change
- uses: actions/checkout@v4
- uses: actions/checkout@v3

Copilot is powered by AI, so mistakes are possible. Review output carefully before use.

Positive Feedback
Negative Feedback

Provide additional feedback

Please help us improve GitHub Copilot by sharing more details about this comment.

Please select one or more of the options

- uses: actions/setup-python@v5
with:
python-version: 3.12

- name: setup-pytorch
run: |
python3 -m pip config set global.break-system-packages true
pip3 install --user torch --index-url https://download.pytorch.org/whl/cpu
pip3 install --user numpy packaging

- name: build-pnnx
run: |
cd tools/pnnx
mkdir build && cd build
cmake -DCMAKE_BUILD_TYPE=Release ..
cmake --build . --config Release -j 4

- name: quick-test
if: matrix.os != 'windows-latest'
run: |
cd tools/pnnx
cd build && ctest -C Release --output-on-failure -R test_nn_Conv
5 changes: 5 additions & 0 deletions tools/pnnx/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ if(MSVC AND NOT CMAKE_VERSION VERSION_LESS "3.15")
endif()
endif()

if(POLICY CMP0094)
cmake_policy(SET CMP0094 NEW) # FindPython should return the first matching Python
endif()
set(Python_FIND_REGISTRY "LAST")
set(Python_FIND_FRAMEWORK "LAST")
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
include(PNNXPyTorch)

Expand Down
4 changes: 4 additions & 0 deletions tools/pnnx/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,6 +625,10 @@ if(PROTOBUF_FOUND)
set_property(TARGET onnxruntime::onnxruntime APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_BINARY_DIR})
set_property(TARGET onnxruntime::onnxruntime APPEND PROPERTY INTERFACE_LINK_LIBRARIES protobuf::libprotobuf)
endif()

if(APPLE)
set_property(TARGET onnxruntime::onnxruntime APPEND PROPERTY INTERFACE_LINK_LIBRARIES "-framework CoreFoundation")
endif()
endif()
endif()

Expand Down
4 changes: 2 additions & 2 deletions tools/pnnx/src/pass_ncnn/torch_istft.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,10 @@ static int detect_window_type(const std::vector<float>& window_data)
if (!NearlyEqual(window_data[i], 1.f, 0.001))
is_one = false;

if (!NearlyEqual(window_data[i], 0.5f * (1 - cos(2 * M_PI * i / winlen)), 0.001))
if (!NearlyEqual(window_data[i], 0.5f * (1 - cos(2 * 3.14159265358979323846 * i / winlen)), 0.001))
is_hann = false;

if (!NearlyEqual(window_data[i], 0.54f - 0.46f * cos(2 * M_PI * i / winlen), 0.001))
if (!NearlyEqual(window_data[i], 0.54f - 0.46f * cos(2 * 3.14159265358979323846 * i / winlen), 0.001))
is_hamming = false;
}

Expand Down
4 changes: 2 additions & 2 deletions tools/pnnx/src/pass_ncnn/torch_stft.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,10 @@ static int detect_window_type(const std::vector<float>& window_data)
if (!NearlyEqual(window_data[i], 1.f, 0.001))
is_one = false;

if (!NearlyEqual(window_data[i], 0.5f * (1 - cos(2 * M_PI * i / winlen)), 0.001))
if (!NearlyEqual(window_data[i], 0.5f * (1 - cos(2 * 3.14159265358979323846 * i / winlen)), 0.001))
is_hann = false;

if (!NearlyEqual(window_data[i], 0.54f - 0.46f * cos(2 * M_PI * i / winlen), 0.001))
if (!NearlyEqual(window_data[i], 0.54f - 0.46f * cos(2 * 3.14159265358979323846 * i / winlen), 0.001))
is_hamming = false;
}

Expand Down
4 changes: 2 additions & 2 deletions tools/pnnx/src/pass_ncnn/torchaudio_F_inverse_spectrogram.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ static int detect_window_type(const std::vector<float>& window_data)
if (!NearlyEqual(window_data[i], 1.f, 0.001))
is_one = false;

if (!NearlyEqual(window_data[i], 0.5f * (1 - cos(2 * M_PI * i / winlen)), 0.001))
if (!NearlyEqual(window_data[i], 0.5f * (1 - cos(2 * 3.14159265358979323846 * i / winlen)), 0.001))
is_hann = false;

if (!NearlyEqual(window_data[i], 0.54f - 0.46f * cos(2 * M_PI * i / winlen), 0.001))
if (!NearlyEqual(window_data[i], 0.54f - 0.46f * cos(2 * 3.14159265358979323846 * i / winlen), 0.001))
is_hamming = false;
}

Expand Down
4 changes: 2 additions & 2 deletions tools/pnnx/src/pass_ncnn/torchaudio_F_spectrogram.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ static int detect_window_type(const std::vector<float>& window_data)
if (!NearlyEqual(window_data[i], 1.f, 0.001))
is_one = false;

if (!NearlyEqual(window_data[i], 0.5f * (1 - cos(2 * M_PI * i / winlen)), 0.001))
if (!NearlyEqual(window_data[i], 0.5f * (1 - cos(2 * 3.14159265358979323846 * i / winlen)), 0.001))
is_hann = false;

if (!NearlyEqual(window_data[i], 0.54f - 0.46f * cos(2 * M_PI * i / winlen), 0.001))
if (!NearlyEqual(window_data[i], 0.54f - 0.46f * cos(2 * 3.14159265358979323846 * i / winlen), 0.001))
is_hamming = false;
}

Expand Down
Loading