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】 add complex for unzip #58839

Merged
merged 1 commit into from Nov 17, 2023
Merged

【complex op】 add complex for unzip #58839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 14 additions & 4 deletions paddle/fluid/operators/unzip_op.cc
View file
Open in desktop
Expand Up @@ -162,7 +162,17 @@ REGISTER_OPERATOR(unzip,

REGISTER_OPERATOR(unzip_grad, ops::unzipGradientOp);

PD_REGISTER_STRUCT_KERNEL(unzip, CPU, ALL_LAYOUT, ops::unzipOpKernel, int64_t) {
}
PD_REGISTER_STRUCT_KERNEL(
unzip_grad, CPU, ALL_LAYOUT, ops::unzipGradOpKernel, int64_t) {}
PD_REGISTER_STRUCT_KERNEL(unzip,
CPU,
ALL_LAYOUT,
ops::unzipOpKernel,
int64_t,
phi::dtype::complex<float>,
phi::dtype::complex<double>) {}
PD_REGISTER_STRUCT_KERNEL(unzip_grad,
CPU,
ALL_LAYOUT,
ops::unzipGradOpKernel,
int64_t,
phi::dtype::complex<float>,
phi::dtype::complex<double>) {}
8 changes: 6 additions & 2 deletions paddle/fluid/operators/unzip_op.cu
View file
Open in desktop
Expand Up @@ -91,7 +91,9 @@ PD_REGISTER_STRUCT_KERNEL(unzip,
plat::float16,
bool,
int,
int64_t) {}
int64_t,
phi::dtype::complex<float>,
phi::dtype::complex<double>) {}
PD_REGISTER_STRUCT_KERNEL(unzip_grad,
GPU,
ALL_LAYOUT,
Expand All @@ -101,4 +103,6 @@ PD_REGISTER_STRUCT_KERNEL(unzip_grad,
plat::float16,
bool,
int,
int64_t) {}
int64_t,
phi::dtype::complex<float>,
phi::dtype::complex<double>) {}
11 changes: 10 additions & 1 deletion python/paddle/incubate/operators/unzip.py
View file
Open in desktop
Expand Up @@ -66,7 +66,16 @@ def unzip(input, lod):
check_variable_and_dtype(
input,
'input',
['float16', 'float32', 'float64', 'int', 'bool', 'int64'],
[
'float16',
'float32',
'float64',
'int',
'bool',
'int64',
'complex64',
'complex128',
],
'unzip',
)
check_variable_and_dtype(lod, 'lod', ['int', 'int64'], 'unzip')
Expand Down
66 changes: 66 additions & 0 deletions test/legacy_test/test_unzip_op.py
View file
Open in desktop
Expand Up @@ -64,5 +64,71 @@ def test_result(self):
assert (res == out_np).all(), "output is not right"


class TestUnzipOp_Complex(unittest.TestCase):
def test_result(self):
"""
For unzip op
"""
self.dtype = self.get_dtype()
paddle.enable_static()
prog = paddle.static.Program()
startup_prog = paddle.static.Program()
with paddle.static.program_guard(prog, startup_prog):
if core.is_compiled_with_cuda():
place = base.CUDAPlace(0)
x = paddle.static.data(
name='Complex64_X', shape=[3, 4], dtype=self.dtype
)
lod = paddle.static.data(name='lodx', shape=[11], dtype='int64')
output = paddle.incubate.operators.unzip(x, lod)
input = [
[1.0 + 1.0j, 2.0 + 2.0j, 3.0 + 3.0j, 4.0 + 4.0j],
[10.0 + 10.0j, 20.0 + 20.0j, 30.0 + 30.0j, 40.0 + 40.0j],
[
100.0 + 100.0j,
200.0 + 200.0j,
300.0 + 300.0j,
400.0 + 400.0j,
],
]
lod = [0, 4, 4, 8, 8, 8, 8, 12, 12, 12, 12]

feed = {
'Complex64_X': np.array(input).astype(self.dtype),
'lodx': np.array(lod).astype("int64"),
}

exe = base.Executor(place=place)
exe.run(base.default_startup_program())
res = exe.run(prog, feed=feed, fetch_list=[output])
out = [
[1.0 + 1.0j, 2.0 + 2.0j, 3.0 + 3.0j, 4.0 + 4.0j],
[0.0j, 0.0j, 0.0j, 0.0j],
[10.0 + 10.0j, 20.0 + 20.0j, 30.0 + 30.0j, 40.0 + 40.0j],
[0.0j, 0.0j, 0.0j, 0.0j],
[0.0j, 0.0j, 0.0j, 0.0j],
[0.0j, 0.0j, 0.0j, 0.0j],
[
100.0 + 100.0j,
200.0 + 200.0j,
300.0 + 300.0j,
400.0 + 400.0j,
],
[0.0j, 0.0j, 0.0j, 0.0j],
[0.0j, 0.0j, 0.0j, 0.0j],
[0.0j, 0.0j, 0.0j, 0.0j],
]
out_np = np.array(out, dtype=self.dtype)
assert (res == out_np).all(), "output is not right"

def get_dtype(self):
return np.complex64


class TestUnzipOp_Complex128(TestUnzipOp_Complex):
def get_dtype(self):
return np.complex128


if __name__ == '__main__':
unittest.main()