【PaddlePaddle Hackathon 2】9、为 Paddle 新增 logspace API #41261

BrilliantYuKaimin · 2022-04-01T07:34:19Z

PR types

New features

PR changes

APIs

Describe

增加了paddle.logspace。具体地，paddle.logspace(start, stop, num, base)能产生一个以base**start为首项、以base**end为末项、共有num项的等比数列。
Issue：#40326
设计文档：PaddlePaddle/community#56
中文文档：PaddlePaddle/docs#4497

paddle-bot-old · 2022-04-01T08:45:23Z

PR格式检查通过，你的PR将接受Paddle专家以及开源社区的review，请及时关注PR动态。
The format inspection passed. Your PR will be reviewed by experts of Paddle and developers from the open-source community. Stay tuned.

Ligoml · 2022-04-02T02:22:05Z

CI挂了很多，需要调整代码，待CI大部分通过后开启review

betterpig

代码规范，单测case考虑周全。几处细节改一下即可。

betterpig · 2022-04-06T12:05:41Z

paddle/fluid/operators/logspace_op.cc

+  framework::OpKernelType GetKernelTypeForVar(
+      const std::string &var_name, const framework::Tensor &tensor,
+      const framework::OpKernelType &expected_kernel_type) const override {
+    return expected_kernel_type;


返回的OpKernelType应该是由expected_kernel_type.data_type_和tensor的place、layout所构造的，不能直接返回expected_kernel_type。

betterpig · 2022-04-06T12:07:15Z

paddle/fluid/operators/logspace_op.cc

+limitations under the License. */
+
+#include <string>
+#include "paddle/fluid/framework/infershape_utils.h"


C++基础头文件和项目自身的头文件之间空一行，方便区分。

betterpig · 2022-04-06T12:07:50Z

paddle/phi/kernels/cpu/logspace_kernel.cc

+// limitations under the License.
+
+#include <cmath>
+#include "paddle/phi/kernels/logspace_kernel.h"


C++基础头文件和项目自身的头文件之间空一行，方便区分。

betterpig · 2022-04-06T12:09:13Z

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

+
+
+if __name__ == "__main__":
+    unittest.main()


文件末尾要加一空行，不然会报格式错误。

betterpig · 2022-04-06T12:17:47Z

paddle/phi/kernels/cpu/logspace_kernel.cc

+        out_data[i] = static_cast<T>(std::pow(
+          base_data, start_data + step * i));
+      } else {
+        out_data[i] = static_cast<T>(std::pow(


这里注明一下：当pow的结果非整数，dytpe为int时，会采用去尾法，对齐numpy。

我在paddle/fluid/operators/logspace_op.cc中增加了相关说明，这样可以吗？

betterpig

LGTM

dingjiaweiww · 2022-04-11T08:52:24Z

python/paddle/fluid/layers/tensor.py

+def logspace(start, stop, num, base=10.0, dtype=None, name=None):
+    r"""
+    This OP return fixed number of logarithmical-evenly spaced values within a given interval.
+    Args:


此处用Parameters 较好

args也可以，不需要重新跑CI。

英文模板中是args，这边应该不需要改。但是英文文档预览报错，这里需要检查一下~

betterpig · 2022-04-12T02:31:36Z

需要添加对应的中文文档，提交PR到PaddlePaddle/docs仓库。并参考文档预览方法，生成该API的中英文文档预览链接，以供检查。

BrilliantYuKaimin · 2022-04-12T03:30:22Z

需要添加对应的中文文档，提交PR到PaddlePaddle/docs仓库。并参考文档预览方法，生成该API的中英文文档预览链接，以供检查。

已经在此PR的描述中提到中文文档的PR。

paddle-bot-old · 2022-04-12T03:35:15Z

你的PR有最新反馈，请及时修改。
There’s the latest feedback about your PR. Please check.

Ligoml · 2022-04-12T03:48:19Z

python/paddle/fluid/layers/tensor.py

@@ -1583,6 +1584,121 @@ def linspace(start, stop, num, dtype=None, name=None):
    return out


+def logspace(start, stop, num, base=10.0, dtype=None, name=None):
+    r"""
+    This OP return fixed number of logarithmical-evenly spaced values within a given interval.


与中文文档保持一致，去掉 this OP的描述，尽量在第一句话里描述清楚这个API的作用

若中文文档要加note，则英文也需要增加

Ligoml · 2022-04-12T03:49:04Z

python/paddle/fluid/layers/tensor.py

+def logspace(start, stop, num, base=10.0, dtype=None, name=None):
+    r"""
+    This OP return fixed number of logarithmical-evenly spaced values within a given interval.
+    Args:


英文模板中是args，这边应该不需要改。但是英文文档预览报错，这里需要检查一下~

Ligoml · 2022-04-12T03:53:33Z

python/paddle/fluid/layers/tensor.py

+        Tensor: the output data type will be float32, float64. The 1-D tensor with 
+            fixed number of evenly spaced values, the data shape of this tensor 
+            is :math:`[num]` . If the :attr:`num` is set 1, the output tensor just 
+            has the value with exponential of :attr:`start` with base :attr:`base`. 


这里显示乱掉了，建议在关键字段前后增加空行，保证官网文档的正确解析

Ligoml

LGTM for docs

chenwhql · 2022-04-15T04:56:09Z

paddle/fluid/operators/logspace_op.cc

@@ -0,0 +1,80 @@
+/* Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.


license的格式有点问题，缺失空行和缩进，可以参考其他文件修改一下

chenwhql · 2022-04-15T04:58:01Z

paddle/fluid/operators/logspace_op.cc

+        ctx.GetPlace());
+  }
+
+  framework::OpKernelType GetKernelTypeForVar(


这个函数移除就好，默认就是这样，不用写多余的

chenwhql · 2022-04-15T04:59:16Z

paddle/phi/kernels/cpu/logspace_kernel.cc

+#include "paddle/phi/backends/cpu/cpu_context.h"
+#include "paddle/phi/core/kernel_registry.h"
+#include "paddle/phi/kernels/funcs/data_type_transform.h"
+#include "paddle/phi/kernels/logspace_kernel.h"


头文件的include顺序需要调整下，可以参考说明：https://zh-google-styleguide.readthedocs.io/en/latest/google-cpp-styleguide/headers/#include

chenwhql · 2022-04-15T05:00:02Z

paddle/phi/kernels/gpu/logspace_kernel.cu

+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "paddle/fluid/platform/device/gpu/gpu_primitives.h"


同上哈，麻烦也调整下，#include "paddle/phi/kernels/logspace_kernel.h"在最前面，用空行隔开

chenwhql · 2022-04-15T05:02:44Z

python/paddle/fluid/layers/tensor.py

@@ -1614,6 +1615,130 @@ def linspace(start, stop, num, dtype=None, name=None):
    return out


+def logspace(start, stop, num, base=10.0, dtype=None, name=None):


为什么新增API是在fluid下面的，fluid后面是要移除的，这个是不是加到python/paddle/tensor目录下比较好？

任务的issue #40326 说放在这里。我看linspace已经被移到了python/paddle/tensor/creation.py，那就把logspace也放到这里吗？

是的，任务issue描述有误，已更新

chenwhql · 2022-04-15T05:05:58Z

paddle/phi/kernels/gpu/logspace_kernel.cu

+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "paddle/fluid/platform/device/gpu/gpu_primitives.h"


这里gpu_primitives.h看起来好像没有使用？是否可以移除？

chenwhql

LGTM

chenwhql · 2022-04-18T11:40:06Z

paddle/phi/kernels/logspace_kernel.h

@@ -0,0 +1,27 @@
+/* Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.


这里的license格式好像还是有点问题，可以后续再完善下

XiaoguangHu01

LGTM

BrilliantYuKaimin added 7 commits April 1, 2022 13:59

增加logspace的算子描述

4007615

增加logspace的形状推断

abc377f

增加logspace核函数实现

18f7ac3

在python中增加logspace接口

14823ed

增加logspace单测

7e33b85

增加logspace

7fb1d2e

Merge branch 'develop' into logspace_2

fa4bac2

BrilliantYuKaimin mentioned this pull request Apr 1, 2022

【PaddlePaddle Hackathon 2】9、为 Paddle 新增 logspace API #40777

Closed

dingjiaweiww added contributor External developers status: proposed and removed status: proposed labels Apr 1, 2022

Ligoml added status: proposed and removed status: open review labels Apr 2, 2022

Update logspace_kernel.cu

efe5577

TCChenlong mentioned this pull request Apr 6, 2022

【PaddlePaddle Hackathon 第二期】任务总览 #40234

Closed

betterpig requested changes Apr 6, 2022

View reviewed changes

betterpig reviewed Apr 6, 2022

View reviewed changes

BrilliantYuKaimin added 2 commits April 7, 2022 10:33

Merge branch 'develop' into logspace_2

30d067f

Update logspace_op.cc

7b9c8ed

调整代码格式

3e2e62a

BrilliantYuKaimin force-pushed the logspace_2 branch from e3992c9 to 3e2e62a Compare April 7, 2022 06:01

BrilliantYuKaimin mentioned this pull request Apr 8, 2022

【PaddlePaddle Hackathon 2】9、为 Paddle 新增 logspace API PaddlePaddle/docs#4497

Merged

betterpig previously approved these changes Apr 11, 2022

View reviewed changes

dingjiaweiww reviewed Apr 11, 2022

View reviewed changes

dingjiaweiww previously approved these changes Apr 11, 2022

View reviewed changes

Ligoml assigned betterpig Apr 12, 2022

Ligoml added status: revision and removed status: proposed labels Apr 12, 2022

Ligoml reviewed Apr 12, 2022

View reviewed changes

BrilliantYuKaimin dismissed stale reviews from dingjiaweiww and betterpig via e72bcfd April 13, 2022 07:28

Update doc of logspace

fee242f

BrilliantYuKaimin force-pushed the logspace_2 branch from e72bcfd to fee242f Compare April 13, 2022 12:07

BrilliantYuKaimin added 2 commits April 13, 2022 20:15

Merge branch 'develop' into logspace_2

05ffd43

Update tensor.py

f0862ad

Ligoml previously approved these changes Apr 15, 2022

View reviewed changes

DDDivano previously approved these changes Apr 15, 2022

View reviewed changes

chenwhql reviewed Apr 15, 2022

View reviewed changes

BrilliantYuKaimin added 5 commits April 16, 2022 18:24

Update logspace_op.cc

ec204b6

Update logspace_kernel.cc

15ef372

Update logspace_kernel.cu

88a7446

Update test_logspace.py

7cc079f

调整 logspace 的位置

3530acf

BrilliantYuKaimin dismissed stale reviews from DDDivano and Ligoml via 3530acf April 16, 2022 10:28

BrilliantYuKaimin added 2 commits April 17, 2022 18:28

调整代码格式

407c2a6

Merge branch 'develop' into logspace_2

8d04f59

chenwhql approved these changes Apr 18, 2022

View reviewed changes

Ligoml approved these changes Apr 19, 2022

View reviewed changes

jeff41404 approved these changes Apr 19, 2022

View reviewed changes

XiaoguangHu01 approved these changes Apr 20, 2022

View reviewed changes

jeff41404 merged commit a3c50c4 into PaddlePaddle:develop Apr 20, 2022

		@@ -0,0 +1,80 @@
		/* Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.

		@@ -1614,6 +1615,130 @@ def linspace(start, stop, num, dtype=None, name=None):
		return out


		def logspace(start, stop, num, base=10.0, dtype=None, name=None):

		@@ -0,0 +1,27 @@
		/* Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.

【PaddlePaddle Hackathon 2】9、为 Paddle 新增 logspace API #41261

【PaddlePaddle Hackathon 2】9、为 Paddle 新增 logspace API #41261

Conversation

BrilliantYuKaimin commented Apr 1, 2022 • edited

PR types

PR changes

Describe

paddle-bot-old bot commented Apr 1, 2022

Ligoml commented Apr 2, 2022

betterpig 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

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

betterpig 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

betterpig commented Apr 12, 2022

BrilliantYuKaimin commented Apr 12, 2022

paddle-bot-old bot commented Apr 12, 2022

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

Ligoml left a comment

Choose a reason for hiding this comment

chenwhql Apr 15, 2022 • edited

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

BrilliantYuKaimin Apr 15, 2022 • edited

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

chenwhql left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

XiaoguangHu01 left a comment

Choose a reason for hiding this comment

BrilliantYuKaimin commented Apr 1, 2022 •

edited

chenwhql Apr 15, 2022 •

edited

BrilliantYuKaimin Apr 15, 2022 •

edited