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

Fix conv api name #44636

Merged
merged 101 commits into from
Jul 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
bb4db9b
test sparse model
May 9, 2022
441da36
refactor code structure
EsdeathYZH May 29, 2022
c48e076
add native kernel usage
EsdeathYZH May 29, 2022
0a68ba3
add wellford impl
EsdeathYZH Jun 3, 2022
b3248c9
add shmem impl
EsdeathYZH Jun 4, 2022
78349a2
add dispatch logic
EsdeathYZH Jun 4, 2022
98c66f0
add channel_last impl
EsdeathYZH Jun 4, 2022
570dc55
refine the global space init
EsdeathYZH Jun 6, 2022
aaca04a
impl 2d kernel
EsdeathYZH Jun 7, 2022
29ef723
Merge remote-tracking branch 'paddle/develop' into optim_batchnorm1d
EsdeathYZH Jun 11, 2022
74b792b
rm wellford
EsdeathYZH Jun 11, 2022
a0bd5b6
fix backward
EsdeathYZH Jun 11, 2022
2433ebf
add unit test for batchnorm1d
EsdeathYZH Jun 11, 2022
90c27a6
fix bug
EsdeathYZH Jun 11, 2022
91d83e5
impl channel last 2d
EsdeathYZH Jun 11, 2022
6871dbf
refine
EsdeathYZH Jun 15, 2022
0571ecc
fix memory thpt
EsdeathYZH Jun 15, 2022
97493af
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
Jun 16, 2022
3fc54ad
opt gather
Jun 16, 2022
804ba03
fix threshold
EsdeathYZH Jun 16, 2022
48c6344
fix backward threshold
EsdeathYZH Jun 16, 2022
6785f6f
refine unit test
EsdeathYZH Jun 16, 2022
e46ef54
refine test
EsdeathYZH Jun 16, 2022
938cde3
delete pragma unroll
EsdeathYZH Jun 17, 2022
a24f2aa
opt gather and scatter
Jun 20, 2022
64be38b
opt conv
Jun 20, 2022
c0fce45
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
Jun 21, 2022
26ca7ab
fix batch csr
Jun 21, 2022
11011c0
remove the unused file
Jun 21, 2022
de91d40
opt SparseMaskCopyKernel
Jun 21, 2022
a137947
merge origin
Jun 21, 2022
3625aae
Merge branch 'opt_conv' of https://github.com/zkh2016/Paddle into opt…
Jun 21, 2022
6a92b32
opt subm
Jun 22, 2022
e96f090
opt subm
Jun 22, 2022
7e272fb
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
Jun 22, 2022
dd8e9ca
merge upstream
Jun 22, 2022
c7eddc5
opt copy rulebook
Jun 22, 2022
dd5e4fd
check cache size
Jun 23, 2022
52367a3
check cache size
Jun 23, 2022
345ebb2
correct alloc out values
Jun 23, 2022
d7bb341
merge origin
Jun 23, 2022
a79206f
Merge remote-tracking branch 'paddle/develop' into optim_batchnorm1d
EsdeathYZH Jun 24, 2022
459fd81
save the rulebook of submanifold conv
Jun 24, 2022
596bfbd
fix backward
Jun 24, 2022
c906bdb
opt conv
Jun 25, 2022
823b5c6
Merge branch 'opt_conv' of https://github.com/zkh2016/Paddle into opt…
Jun 25, 2022
6dc1584
opt conv3d
Jun 26, 2022
8202771
opt scatter
Jun 27, 2022
75df1e2
opt SparseMaskCopy
Jun 27, 2022
2745b0e
coalesced is not performed by default
Jun 27, 2022
ad9c2b6
opt rulebook
Jun 27, 2022
214475b
remove a sync
Jun 27, 2022
13f0b93
gatherV2
Jun 28, 2022
c9929a2
opt gather of backward
Jun 28, 2022
32d1e03
merge upstream
Jun 28, 2022
dab4609
resolve conflict
Jun 28, 2022
f66d0c7
opt groups indexs
Jun 28, 2022
44ad03e
refine code
EsdeathYZH Jun 28, 2022
db9792c
replace sort with remove_copy
Jul 1, 2022
6f9d6ea
fix cache
Jul 1, 2022
c295776
unorder the out index of Conv3D
Jul 3, 2022
bf6fabf
unorder the out index of Conv3D
Jul 3, 2022
b92786d
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
Jul 4, 2022
e181b1c
add coalesced
Jul 4, 2022
e2bf43a
add coalesced.py
Jul 4, 2022
0aa457f
coalesced before compare result
Jul 5, 2022
749dcce
the key of conv3d is not required
Jul 5, 2022
d38563b
opt code structure
Jul 5, 2022
d06527f
opt gather/scatter code structure
Jul 6, 2022
842acf7
fix pool
Jul 6, 2022
5751987
rename pool_kernel.cc
Jul 6, 2022
7c2fbf5
add new file
Jul 6, 2022
6684d94
for ci
Jul 6, 2022
4346bbb
fix comment
Jul 6, 2022
3187f52
opt code structure
Jul 6, 2022
aa284f4
rename conv_kernel
Jul 6, 2022
57bb27e
Merge remote-tracking branch 'zihang/optim_batchnorm1d' into opt_conv
Jul 7, 2022
0b5ca0e
fix
EsdeathYZH Jul 8, 2022
33ebaf5
rename table_ptr to indices_dict
Jul 8, 2022
d49a06b
Merge remote-tracking branch 'zihang/optim_batchnorm1d' into opt_conv
Jul 8, 2022
123b16c
fix test_sparse_utils
Jul 8, 2022
8658c28
merge upstream
Jul 13, 2022
c154249
Merge branch 'opt_conv' of https://github.com/zkh2016/Paddle into opt…
Jul 13, 2022
af66998
sparse support amp
Jul 13, 2022
8dcc194
Merge branch 'develop' into opt_conv
Jul 13, 2022
aba1e6e
Merge branch 'develop' into opt_conv
Jul 13, 2022
55b30a3
merge upstream
Jul 15, 2022
1864dfc
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
Jul 18, 2022
3c9ec13
Merge remote-tracking branch 'zkh/opt_conv' into upstream_dev
Jul 18, 2022
91ee01b
resolve conflict
Jul 18, 2022
927e247
resolve conflict
Jul 18, 2022
4480cdf
Merge branch 'opt_conv' of https://github.com/zkh2016/Paddle into opt…
Jul 18, 2022
dbe743b
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
Jul 19, 2022
a51402a
fix codestyle
Jul 19, 2022
0f9827e
merge upstream
Jul 19, 2022
8c442f6
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
Jul 25, 2022
ab996e0
supplement the description of key
Jul 25, 2022
faa4f83
fix conv api name
Jul 26, 2022
a9fb5ae
Merge branch 'develop' into fix_conv_api_name
Jul 26, 2022
fcc5f49
fix conv api name
Jul 26, 2022
f866a4c
Merge branch 'fix_conv_api_name' of https://github.com/zkh2016/Paddle…
Jul 26, 2022
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
2 changes: 1 addition & 1 deletion paddle/phi/api/yaml/sparse_api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
data_type : x
backward : cast_grad

- api : conv3d_coo
- api : conv3d
args : (Tensor x, Tensor kernel, int[] paddings, int[] dilations, int[] strides, int groups, bool subm, str key)
output : Tensor(out), Tensor(rulebook), Tensor(counter)
kernel :
Expand Down
2 changes: 1 addition & 1 deletion paddle/phi/tests/api/test_sparse_conv_api.cc
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ void TestConv3dBase(const std::vector<int>& indices,
kernel.size() * sizeof(T));

if (!std::is_same<T, phi::dtype::float16>::value) {
auto tensor_out = paddle::experimental::sparse::conv3d_coo(
auto tensor_out = paddle::experimental::sparse::conv3d(
x, weight, paddings, dilations, strides, 1, false, "Conv3d");

auto out =
Expand Down
6 changes: 3 additions & 3 deletions python/paddle/incubate/sparse/nn/functional/conv.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ def _conv3d(x,
dilation = convert_to_list(dilation, dims, 'dilation')
op_type = "conv3d"

pre_bias = _C_ops.final_state_sparse_conv3d_coo(
x, weight, padding, dilation, stride, groups, subm,
key if key is not None else "")
pre_bias = _C_ops.final_state_sparse_conv3d(x, weight, padding, dilation,
stride, groups, subm,
key if key is not None else "")
if bias is not None:
values = pre_bias.values()
add_bias = elementwise_add(values, bias, axis=1)
Expand Down