[2.0 API] add paddle.nn.functional.linear and fix paddle.nn.Linear #26480
Conversation
This file contains hidden or 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! |
donproc
force-pushed
the
Linear
branch
3 times, most recently
from
7092ba4 to
a9dc5bf
Compare
jzhang533
reviewed
Aug 24, 2020
| import numpy as np | ||
| import paddle.fluid.core as core | ||
| from op_test import OpTest | ||
| from scipy.special import expit, erf |
There was a problem hiding this comment.
expit, erf没用到吧？
btw: 现在有去掉scipy依赖的计划。
| @@ -686,3 +690,87 @@ def cosine_similarity(x1, x2, dim=1, eps=1e-8): | |||
| n12 = sqrt(clamp(w1 * w2, min=eps * eps)) | |||
| cos_sim = w12 / n12 | |||
| return cos_sim | |||
|
|
|||
|
|
|||
| def linear(input, weight, bias=None, name=None): | |||
There was a problem hiding this comment.
参数规范应该是用x。
paddle.nn.functional.linear(x,weight,bias=None,name=None)
| """ | ||
|
|
||
| :alias_main: paddle.nn.functional.linear | ||
| :alias: paddle.nn.functional.linear,paddle.nn.functional.common.linear |
| If ``bias`` is not None, a bias will be added to the output. | ||
|
|
||
| Args: | ||
| input(Variable): Input tensor. |
|
|
||
| import numpy as np | ||
| import paddle | ||
| import paddle.fluid as fluid |
| weight = np.ones((2,2), dtype=np.float32) | ||
| bias = np.ones((2), dtype=np.float32) | ||
| place = fluid.CPUPlace() | ||
| with paddle.fluid.dygraph.guard(place): |
There was a problem hiding this comment.
用paddle.disable_static开启动态图
python/paddle/nn/layer/common.py
Outdated
| """ | ||
| :alias_main: paddle.nn.Linear | ||
| :alias: paddle.nn.Linear,paddle.nn.layer.Linear,paddle.nn.layer.common.Linear | ||
| :old_api: paddle.fluid.dygraph.Linear |
|
|
||
| Examples: | ||
| .. code-block:: python | ||
|
|
There was a problem hiding this comment.
更新一下示例代码，开启动态图的方式，和不用fluid。
donproc
force-pushed
the
Linear
branch
5 times, most recently
from
36a0ba5 to
7a3944a
Compare
|
@lanxianghit @jzhang533 may need your approval for api change for PR-CI-CPU-Py2, Thanks. |
zhupengyang
previously approved these changes
Aug 27, 2020
| @@ -40,9 +40,8 @@ def __init__(self, num_classes=10, classifier_activation='softmax'): | |||
| if num_classes > 0: | |||
| self.fc = nn.Sequential( | |||
| nn.Linear(400, 120), | |||
| nn.Linear(120, 84), | |||
| nn.Linear( | |||
| 84, 10, act=classifier_activation)) | |||
There was a problem hiding this comment.
这个地方改为softmax应该没有问题，原来默认就是softmax，调用的地方也没有修改默认值，所以我认为这里这么改没问题。
| np.testing.assert_array_almost_equal(res_f, res_nn) | ||
| np.testing.assert_array_almost_equal(res_nn, res_np) | ||
|
|
||
| def runTest(self): |
There was a problem hiding this comment.
这个会执行到吗？单测框架应该是执行所有test开头的case。这里可以开发机上check下。
There was a problem hiding this comment.
可能有些冗余，后续跟文档一起修复，谢谢。
| x(Tensor): Input tensor. | ||
| weight(Tensor): Weight tensor. | ||
| bias(Tensor|None): Bias tensor, if it is set to None, no bias will be added to the output units. | ||
| name(str|None): For detailed information, please refer to :ref:`api_guide_Name`. Default: None. |
There was a problem hiding this comment.
- x：Input tensor， it's data type is ... 需要将输入的dtype描述加上，weight也是
- bias(Tensor|None) -> bias(Tensor|None, optional)
- name(str|None) -> name(str|None, optional)
donproc
dismissed stale reviews from zhupengyang, LielinJiang, and jzhang533
via
e12eebc
lanxianghit
approved these changes
Aug 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
Others
PR changes
APIs
Describe
add paddle.nn.functional.linear and fix paddle.nn.Linear