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.25 add complex support for fold #56914

Merged
merged 2 commits into from
Sep 11, 2023
Merged

【complex op】No.25 add complex support for fold #56914

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d93d832
[complex] add complex support for fold
BeingGod Sep 3, 2023
44b154f
fix ut
BeingGod Sep 7, 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
10 changes: 8 additions & 2 deletions paddle/phi/kernels/cpu/fold_grad_kernel.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,11 @@
#include "paddle/phi/core/kernel_registry.h"
#include "paddle/phi/kernels/impl/fold_grad_kernel_impl.h"

PD_REGISTER_KERNEL(
fold_grad, CPU, ALL_LAYOUT, phi::FoldGradKernel, float, double) {}
PD_REGISTER_KERNEL(fold_grad,
CPU,
ALL_LAYOUT,
phi::FoldGradKernel,
float,
double,
phi::dtype::complex<float>,
phi::dtype::complex<double>) {}
9 changes: 8 additions & 1 deletion paddle/phi/kernels/cpu/fold_kernel.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,11 @@
#include "paddle/phi/core/kernel_registry.h"
#include "paddle/phi/kernels/impl/fold_kernel_impl.h"

PD_REGISTER_KERNEL(fold, CPU, ALL_LAYOUT, phi::FoldKernel, float, double) {}
PD_REGISTER_KERNEL(fold,
CPU,
ALL_LAYOUT,
phi::FoldKernel,
float,
double,
phi::dtype::complex<float>,
phi::dtype::complex<double>) {}
24 changes: 24 additions & 0 deletions paddle/phi/kernels/funcs/im2col.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,12 +160,24 @@ template class Im2ColFunctor<phi::funcs::ColFormat::kCFO,
template class Im2ColFunctor<phi::funcs::ColFormat::kCFO,
phi::CPUContext,
double>;
template class Im2ColFunctor<phi::funcs::ColFormat::kCFO,
phi::CPUContext,
phi::dtype::complex<float>>;
template class Im2ColFunctor<phi::funcs::ColFormat::kCFO,
phi::CPUContext,
phi::dtype::complex<double>>;
template class Col2ImFunctor<phi::funcs::ColFormat::kCFO,
phi::CPUContext,
float>;
template class Col2ImFunctor<phi::funcs::ColFormat::kCFO,
phi::CPUContext,
double>;
template class Col2ImFunctor<phi::funcs::ColFormat::kCFO,
phi::CPUContext,
phi::dtype::complex<float>>;
template class Col2ImFunctor<phi::funcs::ColFormat::kCFO,
phi::CPUContext,
phi::dtype::complex<double>>;

/*
* im = [input_channels, input_height, input_width]
Expand Down Expand Up @@ -331,11 +343,23 @@ template class Im2ColFunctor<phi::funcs::ColFormat::kOCF,
template class Im2ColFunctor<phi::funcs::ColFormat::kOCF,
phi::CPUContext,
double>;
template class Im2ColFunctor<phi::funcs::ColFormat::kOCF,
phi::CPUContext,
phi::dtype::complex<float>>;
template class Im2ColFunctor<phi::funcs::ColFormat::kOCF,
phi::CPUContext,
phi::dtype::complex<double>>;
template class Col2ImFunctor<phi::funcs::ColFormat::kOCF,
phi::CPUContext,
float>;
template class Col2ImFunctor<phi::funcs::ColFormat::kOCF,
phi::CPUContext,
double>;
template class Col2ImFunctor<phi::funcs::ColFormat::kOCF,
phi::CPUContext,
phi::dtype::complex<float>>;
template class Col2ImFunctor<phi::funcs::ColFormat::kOCF,
phi::CPUContext,
phi::dtype::complex<double>>;
} // namespace funcs
} // namespace phi
24 changes: 24 additions & 0 deletions paddle/phi/kernels/funcs/im2col.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,12 @@ template class Im2ColFunctor<phi::funcs::ColFormat::kCFO,
template class Im2ColFunctor<phi::funcs::ColFormat::kCFO,
phi::GPUContext,
double>;
template class Im2ColFunctor<phi::funcs::ColFormat::kCFO,
phi::GPUContext,
phi::dtype::complex<float>>;
template class Im2ColFunctor<phi::funcs::ColFormat::kCFO,
phi::GPUContext,
phi::dtype::complex<double>>;
template class Im2ColFunctor<phi::funcs::ColFormat::kCFO,
phi::GPUContext,
phi::dtype::float16>;
Expand All @@ -322,6 +328,12 @@ template class Col2ImFunctor<phi::funcs::ColFormat::kCFO,
template class Col2ImFunctor<phi::funcs::ColFormat::kCFO,
phi::GPUContext,
double>;
template class Col2ImFunctor<phi::funcs::ColFormat::kCFO,
phi::GPUContext,
phi::dtype::complex<float>>;
template class Col2ImFunctor<phi::funcs::ColFormat::kCFO,
phi::GPUContext,
phi::dtype::complex<double>>;
template class Col2ImFunctor<phi::funcs::ColFormat::kCFO,
phi::GPUContext,
phi::dtype::float16>;
Expand Down Expand Up @@ -573,6 +585,12 @@ template class Im2ColFunctor<phi::funcs::ColFormat::kOCF,
template class Im2ColFunctor<phi::funcs::ColFormat::kOCF,
phi::GPUContext,
double>;
template class Im2ColFunctor<phi::funcs::ColFormat::kOCF,
phi::GPUContext,
phi::dtype::complex<float>>;
template class Im2ColFunctor<phi::funcs::ColFormat::kOCF,
phi::GPUContext,
phi::dtype::complex<double>>;
template class Im2ColFunctor<phi::funcs::ColFormat::kOCF,
phi::GPUContext,
phi::dtype::float16>;
Expand All @@ -585,6 +603,12 @@ template class Col2ImFunctor<phi::funcs::ColFormat::kOCF,
template class Col2ImFunctor<phi::funcs::ColFormat::kOCF,
phi::GPUContext,
double>;
template class Col2ImFunctor<phi::funcs::ColFormat::kOCF,
phi::GPUContext,
phi::dtype::complex<float>>;
template class Col2ImFunctor<phi::funcs::ColFormat::kOCF,
phi::GPUContext,
phi::dtype::complex<double>>;
template class Col2ImFunctor<phi::funcs::ColFormat::kOCF,
phi::GPUContext,
phi::dtype::float16>;
Expand Down
10 changes: 8 additions & 2 deletions paddle/phi/kernels/gpu/fold_grad_kernel.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,11 @@
#include "paddle/phi/core/kernel_registry.h"
#include "paddle/phi/kernels/impl/fold_grad_kernel_impl.h"

PD_REGISTER_KERNEL(
fold_grad, GPU, ALL_LAYOUT, phi::FoldGradKernel, float, double) {}
PD_REGISTER_KERNEL(fold_grad,
GPU,
ALL_LAYOUT,
phi::FoldGradKernel,
float,
double,
phi::dtype::complex<float>,
phi::dtype::complex<double>) {}
9 changes: 8 additions & 1 deletion paddle/phi/kernels/gpu/fold_kernel.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,11 @@
#include "paddle/phi/core/kernel_registry.h"
#include "paddle/phi/kernels/impl/fold_kernel_impl.h"

PD_REGISTER_KERNEL(fold, GPU, ALL_LAYOUT, phi::FoldKernel, float, double) {}
PD_REGISTER_KERNEL(fold,
GPU,
ALL_LAYOUT,
phi::FoldKernel,
float,
double,
phi::dtype::complex<float>,
phi::dtype::complex<double>) {}
6 changes: 4 additions & 2 deletions python/paddle/nn/functional/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2280,7 +2280,7 @@ def fold(

Parameters:
x(Tensor): 3-D Tensor, input tensor of format [N, C, L],
data type can be float32 or float64
data type can be float32, float64, complex64 or complex128
output_sizes(int|list|tuple): The size of output size, should be [output_size_h, output_size_w]
or an interger o treated as [o, o].
kernel_sizes(int|list|tuple): The size of convolution kernel, should be [k_h, k_w]
Expand Down Expand Up @@ -2325,7 +2325,9 @@ def fold(

helper = LayerHelper("fold", **locals())

check_variable_and_dtype(x, 'x', ['float32', 'float64'], 'fold')
check_variable_and_dtype(
x, 'x', ['float32', 'float64', 'complex64', 'complex128'], 'fold'
)

assert len(x.shape) == 3, "input should be the format of [N, C, L]"

Expand Down
21 changes: 20 additions & 1 deletion test/legacy_test/test_fold_op.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,14 @@ def init_data(self):
self.output_sizes = [4, 5]
input_shape = [self.batch_size, self.input_channels, self.length]
self.x = np.random.rand(*input_shape).astype(np.float64)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

astype(np.float64) -> astype(self.dtype)

if self.dtype == np.complex64 or self.dtype == np.complex128:
self.x = (
np.random.uniform(-1, 1, input_shape)
+ 1j * np.random.uniform(-1, 1, input_shape)
).astype(self.dtype)

def init_dtype(self):
pass
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pass -> self.dtype = np.float64


def calc_fold(self):
output_shape = [0] * 4
Expand Down Expand Up @@ -75,7 +83,7 @@ def calc_fold(self):
)
+ 1
)
output = np.zeros(output_shape).astype(np.float64)
output = np.zeros(output_shape).astype(self.dtype)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

建议 init_dtype 中给个 self.dtype 的默认值（np.float64）感觉会好些，不然这块在 TestFold 中 self.dtype = None，虽然最终结果没影响，但感觉有点不统一

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

好的

# ------------- calculate output ------------- #
for b in range(output_shape[0]):
for c in range(self.input_channels):
Expand Down Expand Up @@ -106,6 +114,7 @@ def calc_fold(self):
self.outputs = output

def set_data(self):
self.init_dtype()
self.init_data()
self.calc_fold()
self.inputs = {'X': OpTest.np_dtype_to_fluid_dtype(self.x)}
Expand All @@ -130,6 +139,16 @@ def test_check_grad(self):
self.check_grad(['X'], 'Y')


class TestFold_Complex64(TestFoldOp):
def init_dtype(self):
self.dtype = np.complex64


class TestFold_Complex128(TestFoldOp):
def init_dtype(self):
self.dtype = np.complex128


class TestFoldshape(TestFoldOp):
def init_data(self):
self.batch_size = 8
Expand Down