【BUPT】[Paddle Tensor 第二期 API 鲁棒性增强] paddle.atan2 API 鲁棒性增强 #70253

nizne9 · 2024-12-16T12:12:53Z

PR Category

User Experience

PR Types

Bug fixes

Description

删去了大部分检查，添加了 paddle.atan2 的前向广播支持
提供了针对 0-size tensor 的特殊处理，使其支持 0-size tensor 输入
编写了测试，包含前向广播机制的测试和 0-size tensor 输入的测试

经过上述更改后，paddle.atan2 可以通过 'array_api_tests/test_operators_and_elementwise_functions.py::test_atan2' 测试

… fix-atan2

…asting; Revised previous test code for paddle.meshgrid based on feedback from the last PR review

paddle-bot · 2024-12-16T12:12:58Z

你的PR提交成功，感谢你对开源项目的贡献!
请关注后续CI自动化测试结果，详情请参考Paddle-CI手册。
Your PR has been submitted. Thanks for your contribution!
Please wait for the result of CI firstly. See Paddle CI Manual for details.

HydrogenSulfate · 2024-12-17T03:04:54Z

paddle/phi/infermeta/binary.cc

+  auto dim_x = x.dims();
+  auto dim_y = y.dims();


dim_ --> _dims

HydrogenSulfate · 2024-12-17T03:05:22Z

paddle/phi/infermeta/binary.cc

+  if (dim_x == dim_y) {
+    out->share_meta(x);
+  } else {
+    int max_dim = std::max(dim_x.size(), dim_y.size());


HydrogenSulfate · 2024-12-17T03:09:15Z

test/legacy_test/test_atan2_op.py

+    def test_api_with_dygraph_empty_tensor_input(self):
+        self._test_with_shapes([(100,), (100, 100)])
+        self._test_with_shapes([(), (5, 17, 6)])
+        self._test_with_shapes([(111, 222, 333), (222, 333)])
+
+    def _test_api_with_static_empty_tensor_input(self, place):
+        self._test_with_shapes([(100,), (100, 100)], place)
+        self._test_with_shapes([(), (5, 17, 6)], place)
+        self._test_with_shapes([(111, 222, 333), (222, 333)], place)
+
+    def test_api_with_static_empty_tensor_input(self):
+        for place in self._get_places():
+            self._test_api_with_static_empty_tensor_input(place)
+
+
+class TestAtan2EmptyTensorInput(TestAtan2Broadcasting):
+    def test_api_with_dygraph_empty_tensor_input(self):
+        self._test_with_shapes([(), (0,)])
+        self._test_with_shapes([(0,), (0, 0)])
+        self._test_with_shapes([(0, 0, 0), (0,)])
+
+    def _test_api_with_static_empty_tensor_input(self, place):
+        self._test_with_shapes([(), (0,)], place)
+        self._test_with_shapes([(0,), (0, 0)], place)
+        self._test_with_shapes([(0, 0, 0), (0,)], place)


单测再丰富一些，比如([5, 17, 6], [5, 0, 17, 6])之类的

… fix-atan2

…ity based on feedback from the PR review

HydrogenSulfate · 2024-12-18T07:19:51Z

paddle/phi/infermeta/binary.cc

-  if (x.dtype() == DataType::INT32 || x.dtype() == DataType::INT64 ||
-      y.dtype() == DataType::INT32 || y.dtype() == DataType::INT64) {
-    out->set_dtype(DataType::FLOAT64);
-  } else {
-    out->set_dtype(x.dtype());


这个dtype不要修改，如果输入的x和y都是int，那么输出的dtype也应该是float

HydrogenSulfate · 2024-12-18T07:28:43Z

paddle/phi/kernels/impl/atan2_kernel_impl.h

+  if (x.numel() == 0 || y.numel() == 0) {
+    ctx.template Alloc<typename Atan2Out<T>::type>(out);
+    return;
+  }


这里要计算出out的真实形状，然后进行Resize一下，否则仅靠infermeta可能形状会有-1。

HydrogenSulfate · 2024-12-18T07:36:00Z

paddle/phi/infermeta/binary.cc

+  if (x.numel() == 0 || y.numel() == 0) {
+    std::replace(out_dims_array.begin(), out_dims_array.end(), -1, 0);
  }


这里为什么要将-1替换成0呢？感觉不需要吧？

因为 funcs::GetBroadcastDimsArrays 对 0-size tensor 的处理就是返回 -1，下面是 funcs::GetBroadcastDimsArrays 的相关代码：

if ((x_dims_array[i] > 1 || y_dims_array[i] > 1) || (x_dims_array[i] == 1 && y_dims_array[i] == 1)) { out_dims_array[i] = (std::max)(x_dims_array[i], y_dims_array[i]); } else { out_dims_array[i] = -1; }

因为 funcs::GetBroadcastDimsArrays 对 0-size tensor 的处理就是返回 -1，下面是 funcs::GetBroadcastDimsArrays 的相关代码：

if ((x_dims_array[i] > 1 || y_dims_array[i] > 1) || (x_dims_array[i] == 1 && y_dims_array[i] == 1)) { out_dims_array[i] = (std::max)(x_dims_array[i], y_dims_array[i]); } else { out_dims_array[i] = -1; }

infermeta没必要替换

kernel里-1应该替换成实际值

HydrogenSulfate

LGTM

nizne9 added 3 commits December 16, 2024 08:57

Enhance forward Atan2Kernel to support tensor broadcasting

e04ba6b

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

f2b49c5

… fix-atan2

Add tests for paddle.atan2 including 0-size tensor and forward broadc…

33cb40c

…asting; Revised previous test code for paddle.meshgrid based on feedback from the last PR review

paddle-bot bot added the contributor External developers label Dec 16, 2024

nizne9 changed the title ~~【BUPT】[Paddle Tensor 第二期 API 支持 0-size Tensor] paddle.atan2 API 鲁棒性增强~~ 【BUPT】[Paddle Tensor 第二期 API 鲁棒性增强] paddle.atan2 API 鲁棒性增强 Dec 16, 2024

luotao1 added the HappyOpenSource Pro 进阶版快乐开源活动，更具挑战性的任务 label Dec 17, 2024

luotao1 assigned luotao1 and HydrogenSulfate Dec 17, 2024

HydrogenSulfate reviewed Dec 17, 2024

View reviewed changes

nizne9 added 2 commits December 17, 2024 03:38

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

3dc22d8

… fix-atan2

Optimized Atan2InferMeta and Atan2Kernel function; Enhanced code qual…

563786b

…ity based on feedback from the PR review

HydrogenSulfate reviewed Dec 18, 2024

View reviewed changes

nizne9 and others added 2 commits December 18, 2024 17:08

Merge branch 'PaddlePaddle:develop' into fix-atan2

c33a0b6

Optimized Atan2InferMeta and Atan2Kernel function based on the review

7278c0a

HydrogenSulfate approved these changes Dec 19, 2024

View reviewed changes

HydrogenSulfate merged commit 673c561 into PaddlePaddle:develop Dec 19, 2024
27 of 28 checks passed

This was referenced Dec 23, 2024

【BUPT】[Paddle Tensor 第二期 API 鲁棒性增强] paddle.where API 鲁棒性增强 #70408

Closed

【BUPT】[Paddle Tensor 第二期 API 鲁棒性增强] 修改 paddle.atan2 以减少对 CINN 的影响 #70468

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

【BUPT】[Paddle Tensor 第二期 API 鲁棒性增强] paddle.atan2 API 鲁棒性增强 #70253

【BUPT】[Paddle Tensor 第二期 API 鲁棒性增强] paddle.atan2 API 鲁棒性增强 #70253

Uh oh!

nizne9 commented Dec 16, 2024

Uh oh!

paddle-bot bot commented Dec 16, 2024

Uh oh!

HydrogenSulfate Dec 17, 2024

Uh oh!

HydrogenSulfate Dec 17, 2024

Uh oh!

HydrogenSulfate Dec 17, 2024

Uh oh!

nizne9 Dec 17, 2024

Uh oh!

HydrogenSulfate Dec 18, 2024

Uh oh!

HydrogenSulfate Dec 18, 2024

Uh oh!

HydrogenSulfate Dec 18, 2024

Uh oh!

nizne9 Dec 18, 2024

Uh oh!

HydrogenSulfate Dec 18, 2024

Uh oh!

nizne9 Dec 18, 2024

Uh oh!

HydrogenSulfate left a comment

Uh oh!

Uh oh!

Uh oh!

【BUPT】[Paddle Tensor 第二期 API 鲁棒性增强] paddle.atan2 API 鲁棒性增强 #70253

【BUPT】[Paddle Tensor 第二期 API 鲁棒性增强] paddle.atan2 API 鲁棒性增强 #70253

Uh oh!

Conversation

nizne9 commented Dec 16, 2024

PR Category

PR Types

Description

Uh oh!

paddle-bot bot commented Dec 16, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

HydrogenSulfate left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!