refine the concat Op test=develop #25307
Merged
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
zhupengyang
reviewed
Jul 7, 2020
|
Thanks for your contribution! |
1 similar comment
|
Thanks for your contribution! |
GaoWei8
reviewed
Jul 17, 2020
GaoWei8
previously approved these changes
Jul 17, 2020
zhupengyang
previously approved these changes
Jul 17, 2020
zhupengyang
previously approved these changes
Jul 17, 2020
GaoWei8
previously approved these changes
Jul 17, 2020
lanxianghit
reviewed
Jul 21, 2020
| x_2 = fluid.data(shape=[2, 1, 4, 5], dtype='int32', name='x_2') | ||
| x_3 = fluid.data(shape=[2, 2, 4, 5], dtype='int32', name='x_3') | ||
| positive_1_int32 = paddle.fill_constant([1], "int32", 1) | ||
| positive_1_int64 = paddle.fill_constant([1], "int64", 1) |
python/paddle/tensor/manipulation.py
Outdated
| :alias: paddle.concat,paddle.tensor.concat,paddle.tensor.manipulation.concat | ||
| :old_api: paddle.fluid.layers.concat | ||
|
|
||
| **Concat** |
python/paddle/tensor/manipulation.py
Outdated
| x(list): List of input Tensors with data type float32, float64, int32, int64. | ||
| axis(int|Variable, optional): A scalar with type ``int32`` or a ``Tensor`` | ||
| with shape [1] and type ``int32``. Axis to compute indices along. The effective range | ||
| is [-R, R), where R is Rank(x). when axis<0, it works the same way |
There was a problem hiding this comment.
axis<0
这个地方不知道展示效果如何，是否要在运算符两侧加上空格
|
|
lanxianghit
reviewed
Jul 23, 2020
| out_1 = paddle.concat(x=[x_2, x_3], axis=1) | ||
| out_2 = paddle.concat(x=[x_2, x_3], axis=positive_1_int32) | ||
| out_3 = paddle.concat(x=[x_2, x_3], axis=positive_1_int64) | ||
| out_4 = paddle.concat(x=[x_2, x_3], axis=positive_1_int64) |
There was a problem hiding this comment.
copy&paste？忘了改成负数的case了？
python/paddle/tensor/manipulation.py
Outdated
| """ | ||
| :alias_main: paddle.concat | ||
| :alias: paddle.concat,paddle.tensor.concat,paddle.tensor.manipulation.concat | ||
| :old_api: paddle.fluid.layers.concat |
There was a problem hiding this comment.
与 @TCChenlong 确认一下，这里到底是怎么规定的，我看到有写update_api的，还有写old_api的
There was a problem hiding this comment.
蓝翔老师，2.0里API的文档不需要写update_api或old_api，在版本发布时，会在2.0版本里的兼容1.8版本的API统一增加一行Note or Warning
lanxianghit
reviewed
Jul 23, 2020
lanxianghit
reviewed
Jul 24, 2020
python/paddle/fluid/layers/tensor.py
Outdated
| @@ -270,7 +270,7 @@ def concat(input, axis=0, name=None): | |||
|
|
|||
| Args: | |||
| input(list): List of input Tensors with data type float16, float32, float64, int32, | |||
| int64. The data type of ``input`` must be same. | |||
| int64. All tensor in ``input`` must have same data type. | |||
There was a problem hiding this comment.
Suggested change
| int64. All tensor in ``input`` must have same data type. | |
| int64. All Tensors in ``input`` must have the same data type. |
python/paddle/fluid/layers/tensor.py
Outdated
| @@ -332,6 +333,8 @@ def concat(input, axis=0, name=None): | |||
| check_variable_and_dtype( | |||
| x, 'input[' + str(id) + ']', | |||
| ['float16', 'float32', 'float64', 'int32', 'int64'], 'concat') | |||
| if convert_dtype(x.dtype) != convert_dtype(input[0].dtype): | |||
| raise TypeError("All Tensor in the input must has same data type.") | |||
There was a problem hiding this comment.
Suggested change
| raise TypeError("All Tensor in the input must has same data type.") | |
| raise TypeError("All Tensors in the input must have same data type.") |
同样一句话出现在几个位置，每次都不相同，请仔细检查一下是否还有其他问题
python/paddle/tensor/manipulation.py
Outdated
| @@ -69,6 +71,7 @@ def concat(x, axis=0, name=None): | |||
| Raises: | |||
| TypeError: The dtype of `x` must be one of float16, float32, float64, int32 and int64. | |||
| TypeError: The `axis` must be int or Variable. | |||
| TypeError: All the tensor in ``x`` must have the same data type. | |||
lanxianghit
reviewed
Jul 27, 2020
| as axis+R. Default is 0. | ||
| 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`. | ||
| Raises: | ||
| TypeError: The dtype of input must be one of float16, float32, float64, int32 and int64. | ||
| TypeError: The `axis` must be int or Variable. | ||
| TypeError: All the tensor in ``input`` must have the same data type. | ||
| TypeError: The ``axis`` must be int or Variable. The dtype of ``axis`` must be int32 or int64 when it's a Tensor. |
There was a problem hiding this comment.
后面关于2.0共性修改会做统一修改
GaoWei8
approved these changes
Jul 27, 2020
swtkiwi
approved these changes
Jul 27, 2020
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
Function optimization
PR changes
Ops
Describe
old
new
concat
fluid.concat
full
eye
linspace
full_like
index_select
zeros:
