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

Jump to bottom

Grid sample op #4373

Merged
merged 161 commits into from
Oct 20, 2023
Merged

Grid sample op #4373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
161 commits
Select commit Hold shift + click to select a range
57adab6
pnnx support grid_sample op
Yoh-Z Oct 18, 2022
14b1d3b
apply code-format changes
Yoh-Z Oct 18, 2022
4f6ebda
[WIP]add naive gridsample
Yoh-Z Oct 20, 2022
1b9c709
apply code-format changes
Yoh-Z Oct 20, 2022
73ff510
[WIP]add gridsample, add bilinear interpolation
Yoh-Z Oct 21, 2022
8ec2edb
add bilinear interp and solve code-format conflict
Yoh-Z Oct 21, 2022
390bbfb
apply code-format changes
Yoh-Z Oct 21, 2022
e16a3f4
add bilinear
Yoh-Z Oct 27, 2022
c39a35c
add bilinear
Yoh-Z Oct 27, 2022
54f3bd7
apply code-format changes
Yoh-Z Oct 27, 2022
bc1967f
add nearest interpolation
Yoh-Z Oct 28, 2022
973b80b
apply code-format changes
Yoh-Z Oct 28, 2022
ee9261c
merge
Yoh-Z Oct 30, 2022
9596982
add x86 optimize
Yoh-Z Nov 2, 2022
697f32d
apply code-format changes
Yoh-Z Nov 2, 2022
ea336f0
add x86 bilinear
Yoh-Z Nov 4, 2022
be7d02d
apply code-format changes
Yoh-Z Nov 4, 2022
3c2636d
support dims=3 mode=bilinear&nearest
Yoh-Z Nov 8, 2022
1dba62e
apply code-format changes
Yoh-Z Nov 8, 2022
13482cc
finish dims=3 pack=8
Yoh-Z Nov 9, 2022
11d4c36
apply code-format changes
Yoh-Z Nov 9, 2022
7f6193a
x86 optimize, mode=nearest(cmath&avx2 round diff)
Yoh-Z Nov 10, 2022
1e32b45
apply code-format changes
Yoh-Z Nov 10, 2022
b13d59f
merge
Yoh-Z Nov 10, 2022
f7b274b
merge master to grid_sample_op
Yoh-Z Nov 12, 2022
f4e0e3c
gather function need avx2
Yoh-Z Nov 13, 2022
0d1e403
apply code-format changes
Yoh-Z Nov 13, 2022
7c2ae50
solve round can't align and strongthen unit test
Yoh-Z Nov 18, 2022
f13130c
optimize code [WIP]
Yoh-Z Nov 21, 2022
109d637
optimize dims = 3 pack8
Yoh-Z Nov 22, 2022
f6a457a
finish pack4 and pack8 [WIP]
Yoh-Z Nov 23, 2022
190b66e
apply code-format changes
Yoh-Z Nov 23, 2022
f7ef656
finish pack16 and support c++03
Yoh-Z Nov 23, 2022
f32bf34
apply code-format changes
Yoh-Z Nov 23, 2022
248cf86
finish pack1 dims=3 [WIP]
Yoh-Z Nov 24, 2022
36ae964
apply code-format changes
Yoh-Z Nov 24, 2022
d3a97f8
solve conflict
Yoh-Z Nov 25, 2022
43690ad
apply code-format changes
Yoh-Z Nov 25, 2022
b4ff40e
fix sse pack4 bug and pack1 naive bug
Yoh-Z Nov 25, 2022
c37f9b9
apply code-format changes
Yoh-Z Nov 25, 2022
cc8f046
fix sample_type=2 padding_mode=1 align_corner=1 and compile bug
Yoh-Z Dec 1, 2022
89d8344
slove the sse2 complier problem
Yoh-Z Dec 5, 2022
cd0878b
apply code-format changes
Yoh-Z Dec 5, 2022
24f0351
fix compile bug and optimize avx sse [WIP]
Yoh-Z Dec 6, 2022
84ad8d3
Merge branch 'grid_sample_op' of github.com:Yoh-Z/ncnn into grid_samp…
Yoh-Z Dec 6, 2022
6569f45
apply code-format changes
Yoh-Z Dec 6, 2022
89d822f
fix compile bug and optimize [WIP]
Yoh-Z Dec 6, 2022
b5f9dd4
apply code-format changes
Yoh-Z Dec 6, 2022
0367cca
fix compile bug and optimize [WIP]
Yoh-Z Dec 6, 2022
ec80138
Merge branch 'grid_sample_op' of github.com:Yoh-Z/ncnn into grid_samp…
Yoh-Z Dec 6, 2022
6de7832
apply code-format changes
Yoh-Z Dec 6, 2022
1a6e65b
finish pack1 dims=4 and optimize
Yoh-Z Dec 7, 2022
04dfc77
apply code-format changes
Yoh-Z Dec 7, 2022
39264e0
fix macro typo
Yoh-Z Dec 7, 2022
0aab347
Merge branch 'grid_sample_op' of github.com:Yoh-Z/ncnn into grid_samp…
Yoh-Z Dec 7, 2022
33e066a
fix avx register copy bug
Yoh-Z Dec 7, 2022
301f695
optimize unused variable and fix floor&ceil macro in sse_mathfun
Yoh-Z Dec 8, 2022
51cc044
apply code-format changes
Yoh-Z Dec 8, 2022
223544e
fix cmake -DNCNN_SSE2=OFF bug
Yoh-Z Dec 9, 2022
a7eeca4
Merge branch 'grid_sample_op' of github.com:Yoh-Z/ncnn into grid_samp…
Yoh-Z Dec 9, 2022
afe37be
Merge remote-tracking branch 'upstream/master' into grid_sample_op
nihui Dec 16, 2022
014ea8e
separate pack1 to file
Yoh-Z Dec 19, 2022
9d283a8
Merge branch 'grid_sample_op' of github.com:Yoh-Z/ncnn into grid_samp…
Yoh-Z Dec 19, 2022
b492ec6
apply code-format changes
Yoh-Z Dec 19, 2022
6c12fc1
Merge branch 'master' into grid_sample_op
Yoh-Z Jan 24, 2023
3f79b97
complete the permute and gridsample operator fusion
Yoh-Z Jan 30, 2023
c88d1a2
spilt calculation into two stages and support permute fusion
Yoh-Z Jan 30, 2023
e29fd7e
apply code-format changes
Yoh-Z Jan 30, 2023
16a6ada
Merge branch 'master' into grid_sample_op
nihui Feb 8, 2023
4e6e9a9
add pnnx_fuse_permute_gridsample unittest
Yoh-Z Feb 9, 2023
4a544f1
add ncnn fuse_permute_grdisample unittest
Yoh-Z Feb 10, 2023
d6a5851
[WIP] x86 support, spilt calculation into two stages and finish bilin…
Yoh-Z Feb 14, 2023
4fa3478
apply code-format changes
Yoh-Z Feb 14, 2023
2576f89
[WIP] finish 2d_compute_blob and pack8_interpolation
Yoh-Z Feb 16, 2023
44b56b8
Merge branch 'grid_sample_op' of github.com:Yoh-Z/ncnn into grid_samp…
Yoh-Z Feb 16, 2023
5bd541c
apply code-format changes
Yoh-Z Feb 16, 2023
a660759
[WIP]fix bug
Yoh-Z Feb 16, 2023
49658e7
apply code-format changes
Yoh-Z Feb 16, 2023
ddce5d8
[WIP]finish 3d_compute_blob and 3d_interpolation_pack8
Yoh-Z Feb 23, 2023
54aa553
[WIP]finish interpolation_pack4
Yoh-Z Feb 23, 2023
7f38289
[WIP]finish interpolation_pack4 and interpolation_pack1
Yoh-Z Feb 23, 2023
246e344
apply code-format changes
Yoh-Z Feb 23, 2023
016dbb5
finish interpolation_pac16
Yoh-Z Feb 23, 2023
51a1fd5
apply code-format changes
Yoh-Z Feb 23, 2023
04db6f5
Merge branch 'master' into grid_sample_op
Yoh-Z Feb 23, 2023
56fb232
fix compile bug
Yoh-Z Feb 24, 2023
0158acd
apply code-format changes
Yoh-Z Feb 24, 2023
765ca73
delete test code
Yoh-Z Feb 24, 2023
451ddb3
Merge branch 'grid_sample_op' of github.com:Yoh-Z/ncnn into grid_samp…
Yoh-Z Feb 24, 2023
5e2670a
fix sse2 'Access violation'
Yoh-Z Feb 24, 2023
d2877cd
move permute_gridsample_fusion into pass_ncnn/F_grid_sample.cpp
Yoh-Z Feb 26, 2023
f091bb8
apply code-format changes
Yoh-Z Feb 26, 2023
c2476c9
fix pnnx gridsample unittest
Yoh-Z Feb 27, 2023
b5e70f6
[WIP]support cpp03 and code test
Yoh-Z Feb 27, 2023
e5f35e6
remove the namespace of enum
Yoh-Z Feb 27, 2023
54749a2
move enum into gridsample class
Yoh-Z Feb 28, 2023
b0924cd
fix nearest accuracy problem
Yoh-Z Mar 2, 2023
51580b0
apply code-format changes
Yoh-Z Mar 2, 2023
9b888b1
fix bug
Yoh-Z Mar 2, 2023
5928f4c
Merge branch 'grid_sample_op' of github.com:Yoh-Z/ncnn into grid_samp…
Yoh-Z Mar 2, 2023
a2ad5d3
simplify unittest
Yoh-Z Mar 11, 2023
510f1c8
Merge branch 'master' into grid_sample_op
Yoh-Z Mar 11, 2023
c3891fa
include the correct header
Yoh-Z Mar 11, 2023
34b7828
fix code dump(illegal instruction)
Yoh-Z Mar 13, 2023
389e5c8
Merge branch 'grid_sample_op' of github.com:Yoh-Z/ncnn into grid_samp…
Yoh-Z Mar 13, 2023
6091955
apply code-format changes
Yoh-Z Mar 13, 2023
531a881
fix unittest
Yoh-Z Mar 13, 2023
aa54cd2
fix cpp-03-simplestl bug
Yoh-Z Mar 13, 2023
9e685f2
fix some bugs
Yoh-Z Mar 20, 2023
b0bcc3a
fix unittest
Yoh-Z Mar 22, 2023
055b750
fix unittest
Yoh-Z Mar 25, 2023
d3342a8
fix torch permute in torch=1.8
Yoh-Z Apr 14, 2023
8af891d
Merge remote-tracking branch 'upstream/master' into grid_sample_op
nihui Apr 17, 2023
ca6c045
optimize code and apply code-format
Yoh-Z Apr 20, 2023
2d6b78e
Merge branch 'grid_sample_op' of github.com:Yoh-Z/ncnn into grid_samp…
Yoh-Z Apr 20, 2023
cc82c01
Merge remote-tracking branch 'upstream/master' into grid_sample_op
nihui Apr 21, 2023
f2f2107
Merge branch 'master' into grid_sample_op
Yoh-Z Apr 21, 2023
b8de0cc
use abs avx_mathfun
Yoh-Z Apr 21, 2023
eca5167
fix vs2017 test failed
Yoh-Z Apr 21, 2023
f59091a
[WIP]disable avx512, test vs2017 CI
Yoh-Z Apr 24, 2023
7dd84dc
use volatile to fix swiftshader bugs
Yoh-Z Apr 24, 2023
78113c4
apply code-format changes
Yoh-Z Apr 24, 2023
10aa2e8
remove partial specialization and optimize memory usage
Yoh-Z Apr 28, 2023
1efa0ee
fix master merge conflict
Yoh-Z Apr 28, 2023
f13cc48
apply code-format changes
Yoh-Z Apr 28, 2023
3ff54a5
apply avx2
Yoh-Z May 4, 2023
41ab29a
solve code-format conflict
Yoh-Z May 4, 2023
0cca827
apply code-format changes
Yoh-Z May 4, 2023
67300e1
remove unused code and fix vs2015 build-shared
Yoh-Z May 5, 2023
e8f1c22
Merge remote-tracking branch 'upstream/master' into grid_sample_op
nihui May 8, 2023
5c1d5ed
fix avx512 build bug
Yoh-Z May 8, 2023
ce425ec
Merge branch 'grid_sample_op' of github.com:Yoh-Z/ncnn into grid_samp…
Yoh-Z May 8, 2023
69ccc80
Merge remote-tracking branch 'origin' into grid_sample_op
nihui May 15, 2023
68e04b8
Merge branch 'master' into grid_sample_op
Yoh-Z May 15, 2023
0633218
fix permute_fusion rule in gridsample and add permute_fusion paramete…
Yoh-Z May 15, 2023
10ce44e
optimize code
Yoh-Z May 23, 2023
8a7da03
apply code-format changes
Yoh-Z May 23, 2023
e2b8807
remove OPT_2 macro definition
Yoh-Z May 23, 2023
4405c57
Merge remote-tracking branch 'upstream/master' into grid_sample_op
nihui May 29, 2023
0ca97ed
optimize unittest and apply OMP in xxx_compute_blob
Yoh-Z May 31, 2023
fdc15ac
apply code-format changes
Yoh-Z May 31, 2023
22e4fe4
fix mutithread data race bug
Yoh-Z Jun 17, 2023
e4efa76
Merge remote-tracking branch 'upstream/master' into grid_sample_op
nihui Jun 25, 2023
1f88b4a
Merge branch 'Tencent:master' into grid_sample_op
Yoh-Z Jun 29, 2023
875cb2a
pack compute_value blob
Yoh-Z Jul 17, 2023
4754ea0
apply code-format changes
Yoh-Z Jul 17, 2023
1a24719
optimize gather
Yoh-Z Jul 21, 2023
bf224d3
apply code-format changes
Yoh-Z Jul 21, 2023
64868ef
fix bug and optimize code
Yoh-Z Jul 21, 2023
429d5b8
fix vs2017 bug and optimize code
Yoh-Z Aug 6, 2023
6a773c5
apply code-format changes
Yoh-Z Aug 6, 2023
d5575f7
fix msvc-v141-toolkits mm512_maskz_load bug
Yoh-Z Aug 13, 2023
8eb034a
apply code-format changes
Yoh-Z Aug 13, 2023
6708bb3
fix Segmentation fault bug
Yoh-Z Aug 13, 2023
34802ee
apply code-format changes
Yoh-Z Aug 13, 2023
ba1c240
fix data unaligned
Yoh-Z Aug 13, 2023
ec7ee8d
Merge branch 'grid_sample_op' of github.com:Yoh-Z/ncnn into grid_samp…
Yoh-Z Aug 13, 2023
2ca7c7d
fix data store bug
Yoh-Z Aug 13, 2023
73bd9a7
fix unaligned data load and store
Yoh-Z Aug 13, 2023
f5cae37
Merge branch 'master' into grid_sample_op
nihui Oct 20, 2023
e97c97a
fix build
nihui Oct 20, 2023
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
1 change: 1 addition & 0 deletions docs/developer-guide/operators.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,6 +914,7 @@ This function is often used in conjunction with affine_grid() to build Spatial T
| 0 | sample_type | int | 1 | |
| 1 | padding_mode | int | 1 | |
| 2 | align_corner | int | 0 | |
| 3 | permute_fusion| int | 0 | fuse with permute |


Sample type:
Expand Down
Loading
Loading