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

binary4d, unary4d #3443

Merged
merged 21 commits into from
Dec 28, 2021
Merged

binary4d, unary4d #3443

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
0cb4e52
apply code-format changes
nihui Dec 23, 2021
de54e46
wip
nihui Dec 23, 2021
1fc2e50
fix x86 test
nihui Dec 24, 2021
3a56247
Merge branch 'binary4d' of github.com:nihui/ncnn into binary4d
nihui Dec 24, 2021
f2dd25c
arm binary4d unary4d
nihui Dec 24, 2021
4e0b23c
mips binaryop4d
nihui Dec 24, 2021
1f6d374
fix mips build
nihui Dec 24, 2021
b402e96
fix mips build
nihui Dec 24, 2021
caf42a9
vulkan binaryop4d
nihui Dec 24, 2021
5690980
apply code-format changes
nihui Dec 24, 2021
696b3f8
wip
nihui Dec 25, 2021
504c574
riscv binaryop4d
nihui Dec 26, 2021
06d4e9b
workaround
nihui Dec 28, 2021
83ceb91
ooops
nihui Dec 28, 2021
94c1f1e
apply code-format changes
nihui Dec 28, 2021
65f7838
fix
nihui Dec 28, 2021
482d580
apply code-format changes
nihui Dec 28, 2021
e26e4c3
fix d1 compatibility
nihui Dec 28, 2021
dcd00b0
fix build
nihui Dec 28, 2021
5862c50
Merge branch 'Tencent:master' into binary4d
nihui Dec 28, 2021
9897fcd
fix test on d1
nihui Dec 28, 2021
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
Prev Previous commit
Next Next commit
apply code-format changes
  • Loading branch information
@nihui @actions-user
nihui authored and actions-user committed Dec 24, 2021
commit 5690980f0faa3cff1bcf6fc0baae509202472e71
8 changes: 4 additions & 4 deletions src/layer/vulkan/binaryop_vulkan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,8 +486,8 @@ int BinaryOp_vulkan::forward(const std::vector<VkMat>& bottom_blobs, std::vector
constants[14].i = top_blob.cstep;

const Pipeline* pipeline = out_elempack == 8 ? pipeline_binaryop_pack8
: out_elempack == 4 ? pipeline_binaryop_pack4
: pipeline_binaryop;
: out_elempack == 4 ? pipeline_binaryop_pack4
: pipeline_binaryop;

cmd.record_pipeline(pipeline, bindings, constants, top_blob);
}
Expand Down Expand Up @@ -664,8 +664,8 @@ int BinaryOp_vulkan::forward(const std::vector<VkImageMat>& bottom_blobs, std::v
constants[14].i = 0; //top_blob.cstep;

const Pipeline* pipeline = out_elempack == 8 ? pipeline_binaryop_pack8
: out_elempack == 4 ? pipeline_binaryop_pack4
: pipeline_binaryop;
: out_elempack == 4 ? pipeline_binaryop_pack4
: pipeline_binaryop;

cmd.record_pipeline(pipeline, bindings, constants, top_blob);
}
Expand Down