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

Implement SparseConv3d kernel #39784

Merged
merged 16 commits into from
Mar 3, 2022
Merged

Implement SparseConv3d kernel #39784

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
6d4f2fa
fix incorrect dims settings
Feb 17, 2022
ec6eed3
sparse conv3d
Feb 17, 2022
dc8d707
fix out dims
Feb 18, 2022
fa365cb
test performance
Feb 18, 2022
bb1c375
test large shape success
Feb 18, 2022
99c3c41
opt scatter, double performance
Feb 21, 2022
621fae1
test float16
Feb 21, 2022
2832f05
remove profiling code
Feb 21, 2022
c413e96
merge upstream develop
Feb 21, 2022
271eea6
remove pten
Feb 21, 2022
904d664
opt code lines
Feb 22, 2022
2eea16b
correct boundary judgment
Feb 24, 2022
a0c8714
merge upstream
Feb 28, 2022
4798f56
fix:used wrong place
Mar 1, 2022
199f013
adaptive rocm
Mar 2, 2022
4f2291d
add comments to code
Mar 2, 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
1 change: 1 addition & 0 deletions paddle/phi/core/sparse_coo_tensor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ class SparseCooTensor : public TensorBase,
void* AllocateFrom(Allocator* allocator,
DataType dtype,
size_t requested_size = 0) override;
void set_dims(const DDim& dims) { this->dims_ = dims; }

private:
// save the indices of non zero elements in original dense tensor
Expand Down
2 changes: 1 addition & 1 deletion paddle/phi/kernels/sparse/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@

set(SPARSE_KERNEL_DEPS dense_tensor sparse_coo_tensor sparse_csr_tensor kernel_context kernel_factory arg_map_context convert_utils lod_utils)
set(SPARSE_KERNEL_DEPS dense_tensor sparse_coo_tensor sparse_csr_tensor kernel_context kernel_factory arg_map_context convert_utils lod_utils math_function)
register_kernels(DEPS ${SPARSE_KERNEL_DEPS} SUB_DIR "sparse_kernel")
1 change: 1 addition & 0 deletions paddle/phi/kernels/sparse/cpu/convolution.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ limitations under the License. */
#include "paddle/phi/core/sparse_coo_tensor.h"
#include "paddle/phi/core/tensor_meta.h"
#include "paddle/phi/kernels/funcs/blas/blas.h"
#include "paddle/phi/kernels/sparse/convolution_kernel.h"

namespace phi {
namespace sparse {
Expand Down
4 changes: 1 addition & 3 deletions paddle/phi/kernels/sparse/cpu/convolution_kernel.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. */

#include "paddle/phi/kernels/sparse/convolution_kernel.h"
#include "paddle/phi/kernels/sparse/cpu/convolution.h"
#include "paddle/phi/api/lib/utils/allocator.h"
#include "paddle/phi/backends/gpu/gpu_context.h"
#include "paddle/phi/core/kernel_registry.h"
#include "paddle/phi/core/tensor_meta.h"
#include "paddle/phi/kernels/funcs/blas/blas.h"
#include "paddle/phi/kernels/sparse/cpu/convolution.h"

namespace phi {
namespace sparse {
Expand Down Expand Up @@ -55,7 +54,6 @@ void Conv3dKernel(const Context& dev_ctx,
// 1. product rulebook
DenseTensorMeta counter_meta(
DataType::INT32, {kernel_size}, DataLayout::NCHW);
// DenseTensor rulebook = phi::Empty<int, Context>(dev_ctx);
DenseTensor counter_per_kernel = phi::Empty(dev_ctx, std::move(counter_meta));

ProductRuleBook<T, Context>(dev_ctx,
Expand Down
Loading