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

【complex op No.46】sin_coo/sin_csr(sparse) #62663

Merged
merged 20 commits into from
Jun 24, 2024
Merged

【complex op No.46】sin_coo/sin_csr(sparse) #62663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
be1d322
添加sparce 的复数
bapijun Mar 5, 2024
ecbc68a
复数修改2
bapijun Mar 5, 2024
7829874
empty for sparse
bapijun Mar 5, 2024
80e9545
添加了abs进行测试
bapijun Mar 6, 2024
9cc40e4
修改为define
bapijun Mar 6, 2024
8f66273
修正了反向的bug
bapijun Mar 12, 2024
e7654c6
删除了比较用的abs
bapijun Mar 12, 2024
24868de
修改了单元测试 删除了测试单元测试
bapijun Mar 12, 2024
eed83f9
格式修改
bapijun Mar 12, 2024
c935a90
格式修改
bapijun Mar 12, 2024
098688a
change for switch
bapijun Mar 14, 2024
4314d6b
bug fix for sparse sin
bapijun Mar 16, 2024
fd87aec
Merge branch develop into sin_coo_csr
bapijun May 21, 2024
89c4944
add macro
bapijun May 21, 2024
b0ca185
把abs添加到宏里面去
bapijun May 21, 2024
160e6fa
bug fix
bapijun May 22, 2024
34054fa
Remove extraneous code
bapijun May 23, 2024
ef93d75
Merge branch 'develop' into sin_coo_csr
bapijun May 23, 2024
616291b
Merge branch 'develop' into sin_coo_csr
bapijun Jun 5, 2024
c501253
python doc string
bapijun Jun 12, 2024
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: 0 additions & 1 deletion paddle/fluid/eager/grad_node_info.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,7 +795,6 @@ void GradNodeBase::HandleComplexGradToRealGrad(
for (size_t rank_id = 0; rank_id < slot_out_grads.size(); rank_id++) {
if (bwd_out_meta_[slot_id].size() == 0) continue;
const GradSlotMeta& slot_meta = bwd_out_meta_[slot_id][rank_id];

PADDLE_ENFORCE(
slot_meta.HasTensorMeta() > 0,
paddle::platform::errors::Fatal(
Expand Down
2 changes: 1 addition & 1 deletion paddle/phi/kernels/sparse/cpu/unary_grad_kernel.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
kernel->InputAt(0).SetDataLayout(phi::DataLayout::SPARSE_CSR); \
}

PD_REGISTER_SPARSE_UNARY_CPU_GRAD_KERNEL(sin, Sin)
PD_REGISTER_SPARSE_UNARY_CPU_GRAD_KERNEL(tan, Tan)
PD_REGISTER_SPARSE_UNARY_CPU_GRAD_KERNEL(asin, Asin)
PD_REGISTER_SPARSE_UNARY_CPU_GRAD_KERNEL(atan, Atan)
Expand All @@ -77,6 +76,7 @@ PD_REGISTER_SPARSE_UNARY_CPU_GRAD_KERNEL(expm1, Expm1)
PD_REGISTER_SPARSE_UNARY_CPU_GRAD_KERNEL(relu6, Relu6)
PD_REGISTER_SPARSE_UNARY_CPU_GRAD_KERNEL(leaky_relu, LeakyRelu)

PD_REGISTER_SPARSE_UNARY_CPU_GRAD_KERNEL_WITH_COMPLEX(sin, Sin)
PD_REGISTER_SPARSE_UNARY_CPU_GRAD_KERNEL_WITH_COMPLEX(abs, Abs)

PD_REGISTER_KERNEL(cast_coo_grad,
Expand Down
2 changes: 1 addition & 1 deletion paddle/phi/kernels/sparse/cpu/unary_kernel.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ void DivScalarCsrKernel(const Context& dev_ctx,
kernel->InputAt(0).SetDataLayout(phi::DataLayout::SPARSE_CSR); \
}

PD_REGISTER_SPARSE_UNARY_CPU_KERNEL(sin, Sin)
PD_REGISTER_SPARSE_UNARY_CPU_KERNEL(tan, Tan)
PD_REGISTER_SPARSE_UNARY_CPU_KERNEL(asin, Asin)
PD_REGISTER_SPARSE_UNARY_CPU_KERNEL(atan, Atan)
Expand All @@ -119,6 +118,7 @@ PD_REGISTER_SPARSE_UNARY_CPU_KERNEL(expm1, Expm1)
PD_REGISTER_SPARSE_UNARY_CPU_KERNEL(relu6, Relu6)
PD_REGISTER_SPARSE_UNARY_CPU_KERNEL(leaky_relu, LeakyRelu)

PD_REGISTER_SPARSE_UNARY_CPU_KERNEL_WITH_COMPLEX(sin, Sin)
PD_REGISTER_SPARSE_UNARY_CPU_KERNEL_WITH_COMPLEX(abs, Abs)

PD_REGISTER_KERNEL(divide_scalar_coo,
Expand Down
2 changes: 1 addition & 1 deletion paddle/phi/kernels/sparse/gpu/unary_grad_kernel.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
kernel->InputAt(0).SetDataLayout(phi::DataLayout::SPARSE_CSR); \
}

PD_REGISTER_SPARSE_UNARY_GPU_GRAD_KERNEL(sin, Sin)
PD_REGISTER_SPARSE_UNARY_GPU_GRAD_KERNEL(tan, Tan)
PD_REGISTER_SPARSE_UNARY_GPU_GRAD_KERNEL(asin, Asin)
PD_REGISTER_SPARSE_UNARY_GPU_GRAD_KERNEL(atan, Atan)
Expand All @@ -81,6 +80,7 @@ PD_REGISTER_SPARSE_UNARY_GPU_GRAD_KERNEL(expm1, Expm1)
PD_REGISTER_SPARSE_UNARY_GPU_GRAD_KERNEL(relu6, Relu6)
PD_REGISTER_SPARSE_UNARY_GPU_GRAD_KERNEL(leaky_relu, LeakyRelu)

PD_REGISTER_SPARSE_UNARY_GPU_GRAD_KERNEL_WITH_COMPLEX(sin, Sin)
PD_REGISTER_SPARSE_UNARY_GPU_GRAD_KERNEL_WITH_COMPLEX(abs, Abs)

PD_REGISTER_KERNEL(cast_coo_grad,
Expand Down
2 changes: 1 addition & 1 deletion paddle/phi/kernels/sparse/gpu/unary_kernel.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ void DivScalarCsrKernel(const Context& dev_ctx,
kernel->InputAt(0).SetDataLayout(phi::DataLayout::SPARSE_CSR); \
}

PD_REGISTER_SPARSE_UNARY_GPU_KERNEL(sin, Sin)
PD_REGISTER_SPARSE_UNARY_GPU_KERNEL(tan, Tan)
PD_REGISTER_SPARSE_UNARY_GPU_KERNEL(asin, Asin)
PD_REGISTER_SPARSE_UNARY_GPU_KERNEL(atan, Atan)
Expand All @@ -112,6 +111,7 @@ PD_REGISTER_SPARSE_UNARY_GPU_KERNEL(expm1, Expm1)
PD_REGISTER_SPARSE_UNARY_GPU_KERNEL(relu6, Relu6)
PD_REGISTER_SPARSE_UNARY_GPU_KERNEL(leaky_relu, LeakyRelu)

PD_REGISTER_SPARSE_UNARY_GPU_KERNEL_WITH_COMPLEX(sin, Sin)
PD_REGISTER_SPARSE_UNARY_GPU_KERNEL_WITH_COMPLEX(abs, Abs)

PD_REGISTER_KERNEL(divide_scalar_coo,
Expand Down
65 changes: 31 additions & 34 deletions paddle/phi/kernels/sparse/impl/unary_kernel_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,35 @@ namespace sparse {
out->mutable_non_zero_elements()); \
}

DEFINE_SPARSE_UNARY_KERNEL(Sin)
#define DEFINE_SPARSE_UNARY_KERNEL_WITH_COMPLEX(prefix) \
template <typename T, typename Context> \
void prefix##CooKernel(const Context& dev_ctx, \
const SparseCooTensor& x, \
SparseCooTensor* out) { \
*(out->mutable_indices()) = x.indices(); \
DenseTensor* out_values = out->mutable_values(); \
const DenseTensor& x_values = x.values(); \
out_values->Resize(x_values.dims()); \
dev_ctx.template Alloc<T>(out_values); \
phi::prefix##Kernel<T, Context>( \
dev_ctx, x.non_zero_elements(), out->mutable_non_zero_elements()); \
out->SetIndicesDict(x.GetIndicesDict()); \
} \
\
template <typename T, typename Context> \
void prefix##CsrKernel(const Context& dev_ctx, \
const SparseCsrTensor& x, \
SparseCsrTensor* out) { \
*(out->mutable_crows()) = x.crows(); \
*(out->mutable_cols()) = x.cols(); \
DenseTensor* out_values = out->mutable_values(); \
const DenseTensor& x_values = x.values(); \
out_values->Resize(x_values.dims()); \
dev_ctx.template Alloc<T>(out_values); \
phi::prefix##Kernel<T, Context>( \
dev_ctx, x.non_zero_elements(), out->mutable_non_zero_elements()); \
}

DEFINE_SPARSE_UNARY_KERNEL(Tan)
DEFINE_SPARSE_UNARY_KERNEL(Asin)
DEFINE_SPARSE_UNARY_KERNEL(Atan)
Expand All @@ -90,39 +118,8 @@ DEFINE_SPARSE_UNARY_KERNEL(Expm1)
DEFINE_SPARSE_UNARY_KERNEL(Relu6)
DEFINE_SPARSE_UNARY_KERNEL_WITH_ONE_ATTR(Pow, factor)
DEFINE_SPARSE_UNARY_KERNEL_WITH_ONE_ATTR(LeakyRelu, alpha)

template <typename T, typename Context>
void AbsCooKernel(const Context& dev_ctx,
const SparseCooTensor& x,
SparseCooTensor* out) {
*(out->mutable_indices()) = x.indices();

DenseTensor* out_values = out->mutable_values();
const DenseTensor& x_values = x.values();
out_values->Resize(x_values.dims());
dev_ctx.template Alloc<T>(out_values);

phi::AbsKernel<T, Context>(
dev_ctx, x.non_zero_elements(), out->mutable_non_zero_elements());

out->SetIndicesDict(x.GetIndicesDict());
}

template <typename T, typename Context>
void AbsCsrKernel(const Context& dev_ctx,
const SparseCsrTensor& x,
SparseCsrTensor* out) {
*(out->mutable_crows()) = x.crows();
*(out->mutable_cols()) = x.cols();

DenseTensor* out_values = out->mutable_values();
const DenseTensor& x_values = x.values();
out_values->Resize(x_values.dims());
dev_ctx.template Alloc<T>(out_values);

phi::AbsKernel<T, Context>(
dev_ctx, x.non_zero_elements(), out->mutable_non_zero_elements());
}
DEFINE_SPARSE_UNARY_KERNEL_WITH_COMPLEX(Abs)
DEFINE_SPARSE_UNARY_KERNEL_WITH_COMPLEX(Sin)

template <typename T, typename Context>
void ScaleCooKernel(const Context& dev_ctx,
Expand Down
2 changes: 1 addition & 1 deletion python/paddle/sparse/unary.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def sin(x, name=None):
out = sin(x)

Parameters:
x (Tensor): The input Sparse Tensor with data type float32, float64.
x (Tensor): The input Sparse Tensor with data type float32, float64, complex64, complex128.
name (str, optional): Name for the operation (optional, default is None).
For more information, please refer to :ref:`api_guide_Name`.

Expand Down
6 changes: 5 additions & 1 deletion test/legacy_test/test_sparse_unary_op.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,11 @@ def test_sparse_abs(self):
self.compare_with_dense(paddle.abs, paddle.sparse.abs, 'complex128')

def test_sparse_sin(self):
self.compare_with_dense(paddle.sin, paddle.sparse.sin)
self.compare_with_dense(paddle.sin, paddle.sparse.sin, 'float16')
self.compare_with_dense(paddle.sin, paddle.sparse.sin, 'float32')
self.compare_with_dense(paddle.sin, paddle.sparse.sin, 'float64')
self.compare_with_dense(paddle.sin, paddle.sparse.sin, 'complex64')
self.compare_with_dense(paddle.sin, paddle.sparse.sin, 'complex128')

def test_sparse_tan(self):
self.compare_with_dense(paddle.tan, paddle.sparse.tan)
Expand Down