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.

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

add diag layer and its converter #4935

Merged
merged 14 commits into from Sep 8, 2023
Merged

Conversation

wnqn1597
Copy link
Contributor

No description provided.

@wnqn1597 wnqn1597 changed the title pnnx convert diag add diag layer and its converter Aug 13, 2023
@wnqn1597 wnqn1597 marked this pull request as ready for review August 13, 2023 12:54
src/CMakeLists.txt Outdated Show resolved Hide resolved
tools/pnnx/src/pass_level2/torch_diag.cpp Outdated Show resolved Hide resolved
tools/pnnx/src/pass_level2/torch_diag.cpp Outdated Show resolved Hide resolved
tools/pnnx/src/pass_ncnn/torch_diag.cpp Outdated Show resolved Hide resolved
Copy link
Member

@nihui nihui left a comment

Choose a reason for hiding this comment

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

add pnnx ncnn tests
update docs operators.md

@wnqn1597 wnqn1597 requested a review from nihui August 15, 2023 12:30
@codecov-commenter
Copy link

codecov-commenter commented Aug 15, 2023

Codecov Report

Merging #4935 (9f9040b) into master (695f770) will decrease coverage by 0.01%.
The diff coverage is 95.34%.

@@            Coverage Diff             @@
##           master    #4935      +/-   ##
==========================================
- Coverage   94.72%   94.72%   -0.01%     
==========================================
  Files         770      771       +1     
  Lines      228715   228758      +43     
==========================================
+ Hits       216645   216685      +40     
- Misses      12070    12073       +3     
Files Changed Coverage Δ
src/layer/diag.cpp 95.34% <95.34%> (ø)

... and 1 file with indirect coverage changes

📢 Have feedback on the report? Share it here.

@nihui
Copy link
Member

nihui commented Aug 24, 2023

pass_ncnn/torch_diag.cpp doesn't seem to work for some reasons, see pnnx ci errors

@wnqn1597
Copy link
Contributor Author

pass_ncnn/torch_diag.cpp doesn't seem to work for some reasons, see pnnx ci errors

Can I take a look at the logs of pnnx ci?

@nihui
Copy link
Member

nihui commented Aug 28, 2023

pass_ncnn/torch_diag.cpp doesn't seem to work for some reasons, see pnnx ci errors

Can I take a look at the logs of pnnx ci?

click into pnnx ci, login with your github, and you could see the log there

@nihui
Copy link
Member

nihui commented Aug 28, 2023

 446/507 Test #450: test_ncnn_torch_diag ..........................***Failed    5.55 sec
pnnxparam = test_torch_diag.pnnx.param
pnnxbin = test_torch_diag.pnnx.bin
pnnxpy = test_torch_diag_pnnx.py
pnnxonnx = test_torch_diag.pnnx.onnx
ncnnparam = test_torch_diag.ncnn.param
ncnnbin = test_torch_diag.ncnn.bin
ncnnpy = test_torch_diag_ncnn.py
fp16 = 1
optlevel = 2
device = cpu
inputshape = [7]f32,[5,5]f32,[4,8]f32
inputshape2 = 
customop = 
moduleop = 
############# pass_level0

----------------

############# pass_level1
############# pass_level2
############# pass_level3
############# pass_level4
############# pass_level5
############# pass_ncnn
force batch axis 233 for operand 0
force batch axis 233 for operand 4
force batch axis 233 for operand 3
fallback batch axis 233 for operand 1
fallback batch axis 233 for operand 2
fallback batch axis 233 for operand 5
ignore torch.diag torch.diag_2 param diagonal=3
ignore torch.diag torch.diag_1 param diagonal=0
ignore torch.diag torch.diag_0 param diagonal=-1
layer torch.diag not exists or registered
CMake Error at /data/devops/workspace/tools/pnnx/tests/run_test.cmake:5 (message):
  Test failed with return value 'Segmentation fault'

@wnqn1597 wnqn1597 closed this Sep 5, 2023
@wnqn1597 wnqn1597 reopened this Sep 6, 2023
@nihui
Copy link
Member

nihui commented Sep 8, 2023

lgtm

@nihui nihui merged commit c851231 into Tencent:master Sep 8, 2023
94 checks passed
@nihui
Copy link
Member

nihui commented Sep 8, 2023

Thanks for your contribution !

@wnqn1597 wnqn1597 deleted the pnnx-convert-diag branch September 9, 2023 09:21
shlyamster pushed a commit to shlyamster/ncnn that referenced this pull request Sep 11, 2023
add diag layer and its converter (Tencent#4935)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants