add empty_like op (python, and unit test), use c++ implementation of … #27287

windstamp · 2020-09-14T06:37:52Z

PR types

New features

PR changes

APIs

Describe

add empty_like op.

Returns an uninitialized tensor with the same size as input.

paddle-bot-old · 2020-09-14T06:38:13Z

Thanks for your contribution!
Please wait for the result of CI firstly. See Paddle CI Manual for details.

paddle-bot-old · 2020-09-14T06:38:46Z

✅ This PR's description meets the template requirements!
Please wait for other CI results.

wangchaochaohu · 2020-09-14T08:27:19Z

python/paddle/tensor/creation.py

+        type='empty',
+        inputs={},
+        outputs={'Out': [out]},
+        attrs={'shape': x.shape,


x.shape在如果输入shape存在负数的时候是否在empty的代码考虑了？

thanks. 对于参数 shape，目前 empty op 的 C++ 实现有问题，没有校验里面的值是否为负数，不过 review 意见已经指出来了，会在这个 op 里面修复。

只是这里我有个疑问，假设 x 校验通过后，x.shape 是不是应该是没有问题的。

需要用过输入ShapeTensor来设置输出的shape。

thanks。已经修改。通过 paddle.shape(x) 可以返回正确的 shape，这个 shape 是一个 tensor，然后作为 empty op 的 ShapeTensor 传入。

这里同时修改了一下 shape op，之前不支持 bool 类型，现在支持。同时添加了 shape op 的文档预览。

添加一个这种情况静态图的单测吧

thanks。已添加对应单侧。

Xreki · 2020-09-14T13:01:47Z

paddle/fluid/operators/empty_op.cc

-            "is [%s]",
-            dims);
+            platform::errors::InvalidArgument(
+                "ShapeError: The shape of Tensor in list must be [1]. "


去掉ShapeError:

thanks。已修改。

windstamp · 2020-09-15T07:31:09Z

Xreki · 2020-09-15T12:16:19Z

paddle/fluid/operators/shape_op.cc

-REGISTER_OP_CPU_KERNEL(shape, ops::ShapeKernel<int>, ops::ShapeKernel<int32_t>,
-                       ops::ShapeKernel<int64_t>, ops::ShapeKernel<float>,
-                       ops::ShapeKernel<double>);
+REGISTER_OP_CPU_KERNEL(shape, ops::ShapeKernel<bool>, ops::ShapeKernel<int>,


这shape_op咋同时注册了int和int32_t类型的kernel啊。不过这个与你这个PR的功能无关了。

thanks。我把 int32_t 去除吧。

已去除 int32_t

Xreki · 2020-09-15T12:50:48Z

python/paddle/fluid/tests/unittests/test_empty_like_op.py

+
+class TestEmptyLikeAPI_Static(unittest.TestCase):
+    def __check_out__(self, out):
+        data_type = convert_dtype(out.dtype)


这个函数的实现，看起来和上一个类里面的__check__out__实现有很多重复的代码

thanks。我优化一下。

Xreki · 2020-09-15T12:51:28Z

python/paddle/fluid/tests/unittests/test_empty_like_op.py

+
+        self.dst_dtype = dtype
+        self.dst_shape = x.shape
+        self.__check_out__(res[0])


封装一下，避免引入这么多重复的代码

thanks。我优化一下。

wangchaochaohu

LGTM

Xreki

LGTM

jzhang533 · 2020-09-17T02:44:11Z

python/paddle/fluid/layers/nn.py

@@ -11229,7 +11229,7 @@ def shape(input):
                input.shape = [3, 2]

    Args:
-        input (Variable): The input can be N-D Tensor or SelectedRows with data type float16, float32, float64, int32, int64.
+        input (Variable): The input can be N-D Tensor or SelectedRows with data type bool, float16, float32, float64, int32, int64.


跟这个PR无关。
这个API现在直接以paddle.shape的形式暴露给用户了，相应的，文档和示例代码需要更新

thanks. 这个我要怎么改呢，因为我里面需要用到 paddle.shape(x) 这个 op 来返回 x 的 shape。这里，x 支持 bool 类型，而 paddle.shape(x) 并不支持 bool 类型，所以想在这个 PR 中直接修改掉。

要不这个 PR 中先保留这些修改，涉及文档和示例的地方后面再提一个 PR？你看这样可以吗。

jzhang533 · 2020-09-17T02:45:41Z

python/paddle/tensor/creation.py

+    If the ``dtype`` is None, the data type of Tensor is same with ``x``.
+
+    Args:
+        x(Tensor): The input tensor which specifies shape and data type. The data type can be bool, float32, float64, int32, int64.


说明x的时候不需要说明data type吧？

thanks。我修改一下。

我看了一下 full_like，也是这样描述 x 的，要不这里维持原样，不修改？

jzhang533 · 2020-09-17T02:46:30Z

python/paddle/tensor/creation.py

+
+    Args:
+        x(Tensor): The input tensor which specifies shape and data type. The data type can be bool, float32, float64, int32, int64.
+        dtype(np.dtype|str, optional): Data type of the output Tensor


说明一下default value

thanks. 我修改一下。

已修改，参考 full_like 改成如下：

dtype(np.dtype|str, optional): The data type of output. The data type can be one of bool, float16, float32, float64, int32, int64. The default value is None, which means the output data type is the same as input.

jzhang533 · 2020-09-17T02:47:26Z

python/paddle/tensor/creation.py

+          paddle.set_device("cpu")  # and use cpu device
+
+          x_data = np.random.random((2, 3)).astype("float32")
+          x = paddle.to_tensor(x_data)


x可以直接用paddle.randn创建。

thanks. 我修改一下。

已修改。

…empty op, and optimize the c++ implmentation of empty op as PR#26659 reviews, and add bool for shape op.

windstamp · 2020-09-17T05:41:20Z

jzhang533

lgtm

wangchaochaohu reviewed Sep 14, 2020

View reviewed changes

windstamp force-pushed the empty_like_op_3 branch from a55ab34 to ce492cf Compare September 14, 2020 09:35

Xreki reviewed Sep 14, 2020

View reviewed changes

windstamp force-pushed the empty_like_op_3 branch 2 times, most recently from ab04e59 to bbb1bf9 Compare September 15, 2020 07:27

This was referenced Sep 15, 2020

add empty op (c++, python, unit test) #26659

Merged

add new empty_like op (PR #27287) doc PaddlePaddle/docs#2636

Merged

windstamp force-pushed the empty_like_op_3 branch from bbb1bf9 to 307857b Compare September 15, 2020 09:31

Xreki reviewed Sep 15, 2020

View reviewed changes

windstamp force-pushed the empty_like_op_3 branch from 307857b to 8e6482b Compare September 16, 2020 01:40

wangchaochaohu previously approved these changes Sep 16, 2020

View reviewed changes

Xreki previously approved these changes Sep 16, 2020

View reviewed changes

jzhang533 reviewed Sep 17, 2020

View reviewed changes

add empty_like op (python, and unit test), use c++ implementation of …

7ad4ffb

…empty op, and optimize the c++ implmentation of empty op as PR#26659 reviews, and add bool for shape op.

windstamp dismissed stale reviews from Xreki and wangchaochaohu via 7ad4ffb September 17, 2020 04:37

windstamp force-pushed the empty_like_op_3 branch from 8e6482b to 7ad4ffb Compare September 17, 2020 04:37

jzhang533 approved these changes Sep 17, 2020

View reviewed changes

zhiqiu self-requested a review September 17, 2020 10:44

zhiqiu approved these changes Sep 17, 2020

View reviewed changes

lanxianghit approved these changes Sep 17, 2020

View reviewed changes

Xreki merged commit 515efe4 into PaddlePaddle:develop Sep 17, 2020

windstamp deleted the empty_like_op_3 branch April 8, 2021 03:14

add empty_like op (python, and unit test), use c++ implementation of … #27287

add empty_like op (python, and unit test), use c++ implementation of … #27287

Conversation

windstamp commented Sep 14, 2020 • edited Loading

PR types

PR changes

Describe

paddle-bot-old bot commented Sep 14, 2020

paddle-bot-old bot commented Sep 14, 2020 • edited Loading

Choose a reason for hiding this comment

windstamp Sep 14, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

windstamp Sep 15, 2020 • edited Loading

Choose a reason for hiding this comment

wangchaochaohu Sep 15, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

windstamp commented Sep 15, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

wangchaochaohu left a comment

Choose a reason for hiding this comment

Xreki left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

windstamp Sep 17, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

windstamp commented Sep 17, 2020

jzhang533 left a comment

Choose a reason for hiding this comment

windstamp commented Sep 14, 2020 •

edited

Loading

paddle-bot-old bot commented Sep 14, 2020 •

edited

Loading

windstamp Sep 14, 2020 •

edited

Loading

windstamp Sep 15, 2020 •

edited

Loading

wangchaochaohu Sep 15, 2020 •

edited

Loading

windstamp Sep 17, 2020 •

edited

Loading