refine adam/strided_slice && fix doc for rmsprop/unstack #27740

MRXLT · 2020-09-30T06:57:29Z

PR types

Others

PR changes

APIs

Describe

修改adam和adamw op参数顺序，name放在最后

迁移stride_slice op，参数input 改为 x

修改rmsprop、unstack op文档中的示例代码

中文文档PR PaddlePaddle/docs#2748

paddle-bot-old · 2020-09-30T06:57:37Z

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

TCChenlong · 2020-10-10T06:20:49Z

python/paddle/tensor/manipulation.py

@@ -1461,3 +1460,92 @@ def gather_nd(x, index, name=None):
    """

    return paddle.fluid.layers.gather_nd(input=x, index=index, name=name)
+
+
+def strided_slice(x, axes, starts, ends, strides):


需要加个 name 参数

TCChenlong · 2020-10-10T06:27:06Z

python/paddle/optimizer/adam.py


    Examples:
        .. code-block:: python

            import paddle
-            import numpy as np

            paddle.disable_static()


这行可以删除，默认开启动态图了然后下面function的示例代码也需要更新下

TCChenlong · 2020-10-10T06:27:54Z

python/paddle/optimizer/adam.py

@@ -105,12 +103,10 @@ class Adam(Optimizer):

            # Adam with beta1/beta2 as Tensor and weight_decay as float
            import paddle
-            import numpy as np

            paddle.disable_static()


TCChenlong · 2020-10-10T06:28:12Z

python/paddle/optimizer/adam.py

        Returns:
            None

        Examples:
            .. code-block:: python

                import paddle
-                import numpy as np
                paddle.disable_static()


TCChenlong · 2020-10-10T06:28:32Z

python/paddle/optimizer/adamw.py

    **Notes**:
        **Currently, AdamW doesn't support sparse parameter optimization.**

    Examples:
        .. code-block:: python
            import paddle
-            import numpy as np

            paddle.disable_static()


TCChenlong · 2020-10-10T06:28:52Z

python/paddle/optimizer/rmsprop.py

@@ -104,24 +104,19 @@ class RMSProp(Optimizer):
          .. code-block:: python

            import paddle
-            import numpy as np

            paddle.disable_static()


TCChenlong · 2020-10-12T03:04:39Z

python/paddle/tensor/manipulation.py

+            Then:
+                result = [ [2], ]
+    Args:
+        x (Variable): An N-D ``Tensor`` or ``LoDTensor`` . The data type is ``float32``, ``float64``, ``int32`` or ``int64``.


Variable -> Tensor，不暴露LoDTensor概念

TCChenlong · 2020-10-12T03:04:59Z

python/paddle/tensor/manipulation.py

+        x (Variable): An N-D ``Tensor`` or ``LoDTensor`` . The data type is ``float32``, ``float64``, ``int32`` or ``int64``.
+        axes (list|tuple): The data type is ``int32`` . Axes that `starts` and `ends` apply to.
+                            It's optional. If it is not provides, it will be treated as :math:`[0,1,...,len(starts)-1]`.
+        starts (list|tuple|Variable): The data type is ``int32`` . If ``starts`` is a list or tuple, the elements of                                                                                          it should be integers or Tensors with shape [1]. If ``starts`` is an Variable, it should be an 1-D Tensor.                                                                                    It represents starting indices of corresponding axis in ``axes``.


TCChenlong · 2020-10-12T03:05:05Z

python/paddle/tensor/manipulation.py

+        axes (list|tuple): The data type is ``int32`` . Axes that `starts` and `ends` apply to.
+                            It's optional. If it is not provides, it will be treated as :math:`[0,1,...,len(starts)-1]`.
+        starts (list|tuple|Variable): The data type is ``int32`` . If ``starts`` is a list or tuple, the elements of                                                                                          it should be integers or Tensors with shape [1]. If ``starts`` is an Variable, it should be an 1-D Tensor.                                                                                    It represents starting indices of corresponding axis in ``axes``.
+        ends (list|tuple|Variable): The data type is ``int32`` . If ``ends`` is a list or tuple, the elements of


TCChenlong · 2020-10-12T03:05:11Z

python/paddle/tensor/manipulation.py

+        starts (list|tuple|Variable): The data type is ``int32`` . If ``starts`` is a list or tuple, the elements of                                                                                          it should be integers or Tensors with shape [1]. If ``starts`` is an Variable, it should be an 1-D Tensor.                                                                                    It represents starting indices of corresponding axis in ``axes``.
+        ends (list|tuple|Variable): The data type is ``int32`` . If ``ends`` is a list or tuple, the elements of
+                it should be integers or Tensors with shape [1]. If ``ends`` is an Variable, it should be an 1-D Tensor .                                                                                     It represents ending indices of corresponding axis in ``axes``.
+        strides (list|tuple|Variable): The data type is ``int32`` . If ``strides`` is a list or tuple, the elements of


TCChenlong · 2020-10-12T03:05:18Z

python/paddle/tensor/manipulation.py

+        name(str, optional): The default value is None.  Normally there is no need for user to set this property.
+                        For more information, please refer to :ref:`api_guide_Name` .
+
+    Returns:


TCChenlong

LGTM

zhiqiu

LGTM. Please add core.ops for unstack in next PR.

…e#27740) * refine parameters order && doc * update rmsprop doc * refine adam/transpose/unstack/stride_slice * fix bug && doc * fix doc * bug fix * bug fix * fix doc * fix doc * fix doc * fix doc * depercate old strided_slice * update doc * set default value for name * update doc

MRXLT added 3 commits September 28, 2020 17:45

refine parameters order && doc

c5c1d3d

update rmsprop doc

e7fd4f9

refine adam/transpose/unstack/stride_slice

67a1d6c

MRXLT added 10 commits September 30, 2020 16:18

fix bug && doc

4fc81aa

fix doc

806346a

bug fix

5f0a013

bug fix

02ca478

fix doc

a4469e8

fix doc

f49f69f

fix doc

6cb3c85

fix doc

7cf81cc

Merge remote-tracking branch 'upstream/develop' into 2.0-op

1247980

depercate old strided_slice

e3646c4

TCChenlong reviewed Oct 10, 2020

View reviewed changes

MRXLT added 2 commits October 10, 2020 18:04

update doc

657bca6

set default value for name

b3eb0c5

TCChenlong reviewed Oct 12, 2020

View reviewed changes

update doc

4ff2e20

TCChenlong approved these changes Oct 12, 2020

View reviewed changes

lanxianghit approved these changes Oct 12, 2020

View reviewed changes

zhiqiu approved these changes Oct 12, 2020

View reviewed changes

MRXLT merged commit 84d8e49 into PaddlePaddle:develop Oct 12, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refine adam/strided_slice && fix doc for rmsprop/unstack #27740

refine adam/strided_slice && fix doc for rmsprop/unstack #27740

MRXLT commented Sep 30, 2020 •

edited

Loading

paddle-bot-old bot commented Sep 30, 2020

TCChenlong Oct 10, 2020

MRXLT Oct 12, 2020

TCChenlong Oct 10, 2020

MRXLT Oct 12, 2020

TCChenlong Oct 10, 2020

MRXLT Oct 12, 2020

TCChenlong Oct 10, 2020

MRXLT Oct 12, 2020

TCChenlong Oct 10, 2020

MRXLT Oct 12, 2020

TCChenlong Oct 10, 2020

MRXLT Oct 12, 2020

TCChenlong Oct 12, 2020

MRXLT Oct 12, 2020

TCChenlong Oct 12, 2020

MRXLT Oct 12, 2020

TCChenlong Oct 12, 2020

MRXLT Oct 12, 2020

TCChenlong Oct 12, 2020

MRXLT Oct 12, 2020

TCChenlong Oct 12, 2020

MRXLT Oct 12, 2020

TCChenlong left a comment

zhiqiu left a comment

refine adam/strided_slice && fix doc for rmsprop/unstack #27740

refine adam/strided_slice && fix doc for rmsprop/unstack #27740

Conversation

MRXLT commented Sep 30, 2020 • edited Loading

PR types

PR changes

Describe

paddle-bot-old bot commented Sep 30, 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

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

Choose a reason for hiding this comment

TCChenlong left a comment

Choose a reason for hiding this comment

zhiqiu left a comment

Choose a reason for hiding this comment

MRXLT commented Sep 30, 2020 •

edited

Loading