Refine squeeze, test=develop #25281
Merged
Refine squeeze, test=develop #25281
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thanks for your contribution! |
zhiqiu
force-pushed
the
dev/refine_squeeze
branch
from
21aeb45
to
c77f287
Compare
zhiqiu
force-pushed
the
dev/refine_squeeze
branch
3 times, most recently
from
45ca069
to
3d81973
Compare
zhiqiu
force-pushed
the
dev/refine_squeeze
branch
from
3d81973
to
28cb7b2
Compare
lanxianghit
reviewed
Jul 19, 2020
python/paddle/tensor/manipulation.py
Outdated
| If axes is negative, :math:`axes=axes+rank(input)`. | ||
| axis (int|list, optional): An integer or list of integers, indicating the dimensions to be squeezed. Default is None. | ||
| The range of axis is :math:`[-rank(input), rank(input))`. | ||
| If axis is negative, :math:`axes=axes+rank(input)`. |
python/paddle/tensor/manipulation.py
Outdated
| axes (list): One integer or List of integers, indicating the dimensions to be squeezed. | ||
| Axes range is :math:`[-rank(input), rank(input))`. | ||
| If axes is negative, :math:`axes=axes+rank(input)`. | ||
| axis (int|list, optional): An integer or list of integers, indicating the dimensions to be squeezed. Default is None. |
There was a problem hiding this comment.
之前是不支持的，已经添加了tuple支持。
| @@ -430,83 +431,79 @@ def _get_SectionsTensorList(one_list): | |||
| return outs | |||
|
|
|||
|
|
|||
| def squeeze(input, axes, out=None, name=None): | |||
| def squeeze(x, axis=None, name=None): | |||
There was a problem hiding this comment.
与1.8API同名，但是参数列表发生变化了，应该给出旧版API对应关系，可以联系 @TCChenlong 给一下具体写法
There was a problem hiding this comment.
联系@TCChenlong后，添加了update_api的标识。
|
|
||
| If axis is provided, it will remove the dimension(s) by given axis that of size 1. | ||
| If the dimension of given axis is not of size 1, the dimension remain unchanged. | ||
| If axis is not provided, all dims equal of size 1 will be removed. | ||
|
|
||
| .. code-block:: text | ||
|
|
||
| Case1: |
There was a problem hiding this comment.
每个例子最好加一个简短描述，说明具体对应哪种情况
jzhang533
reviewed
Jul 22, 2020
python/paddle/tensor/manipulation.py
Outdated
|
|
||
| Input: | ||
| X.shape = [1,3,1,5] | ||
| axes = [-2] | ||
| x.shape = [1, 3, 1, 5] # If axis is negative, axis = axis + rank(input) |
There was a problem hiding this comment.
axis = axis + number of dimensions in x
| This OP will squeeze single-dimensional entries of input tensor's shape. If axes is provided, will | ||
| remove the dims by axes, the dims selected by axes should be one. If not provide axes, all dims equal | ||
| to one will be deleted. | ||
| This OP will squeeze the dimension(s) of size 1 of input tensor's shape. | ||
|
|
There was a problem hiding this comment.
input tensor -> input tensor x
python/paddle/tensor/manipulation.py
Outdated
| Output: | ||
| Out.shape = [1,3,5] | ||
| out.shape = [1, 3, 5] | ||
|
|
||
| Args: | ||
| input (Variable): The input Tensor. Support data type: float32, float64, int8, int32, int64. |
There was a problem hiding this comment.
input (Variable) -> x (Tensor)
已经明确了2.0起统一给用户Tensor概念。
python/paddle/tensor/manipulation.py
Outdated
| If axes is negative, :math:`axes=axes+rank(input)`. | ||
| axis (int|list|tuple, optional): An integer or list of integers, indicating the dimensions to be squeezed. Default is None. | ||
| The range of axis is :math:`[-rank(input), rank(input))`. | ||
| If axis is negative, :math:`axis = axis + rank(input)`. |
python/paddle/tensor/manipulation.py
Outdated
| """ | ||
| :alias_main: paddle.squeeze | ||
| :alias: paddle.squeeze,paddle.tensor.squeeze,paddle.tensor.manipulation.squeeze | ||
| :update_api: paddle.fluid.layers.squeeze |
There was a problem hiding this comment.
根据线下讨论，新的API文档当中去掉这个标签，在旧版本的API文档中增加Note来提示用户。
上面的alias列表里的逗号后增加空格。
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR types
Others
PR changes
APIs
Describe
Enhance
paddle.squeezepaddle.squeeze(input, axes, out=None, name=None)->paddle.squeeze(x, axis=None, name=None)None, int, and listforaxisxunchanged if its shape is[A, 1, B, 1]andaxisis0instead of raising exception