Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
机器未来
Paddle
提交
e811c865
P
Paddle
项目概览
机器未来
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
e811c865
编写于
12月 22, 2017
作者:
S
sweetsky0901
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
for epsilon dataType
上级
8a7c309d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
10 addition
and
8 deletion
+10
-8
paddle/operators/norm_op.cc
paddle/operators/norm_op.cc
+6
-4
paddle/operators/norm_op.h
paddle/operators/norm_op.h
+4
-4
未找到文件。
paddle/operators/norm_op.cc
浏览文件 @
e811c865
...
@@ -16,6 +16,7 @@ limitations under the License. */
...
@@ -16,6 +16,7 @@ limitations under the License. */
namespace
paddle
{
namespace
paddle
{
namespace
operators
{
namespace
operators
{
template
<
typename
AttrType
>
class
NormOpMaker
:
public
framework
::
OpProtoAndCheckerMaker
{
class
NormOpMaker
:
public
framework
::
OpProtoAndCheckerMaker
{
public:
public:
NormOpMaker
(
OpProto
*
proto
,
OpAttrChecker
*
op_checker
)
NormOpMaker
(
OpProto
*
proto
,
OpAttrChecker
*
op_checker
)
...
@@ -28,9 +29,9 @@ class NormOpMaker : public framework::OpProtoAndCheckerMaker {
...
@@ -28,9 +29,9 @@ class NormOpMaker : public framework::OpProtoAndCheckerMaker {
AddInput
(
"Scale"
,
AddInput
(
"Scale"
,
"(Tensor) The input tensor of norm operator. "
"(Tensor) The input tensor of norm operator. "
"The format of input tensor is C * 1."
);
"The format of input tensor is C * 1."
);
AddAttr
<
float
>
(
"epsilon"
,
AddAttr
<
AttrType
>
(
"epsilon"
,
"(float, default 1e-10) Constant "
"(float, default 1e-10) Constant "
"for numerical stability."
)
"for numerical stability."
)
.
SetDefault
(
1.0e-10
f
);
.
SetDefault
(
1.0e-10
f
);
AddOutput
(
"Out"
,
AddOutput
(
"Out"
,
"(Tensor) The output tensor of norm operator."
"(Tensor) The output tensor of norm operator."
...
@@ -100,7 +101,8 @@ class NormOpGrad : public framework::OperatorWithKernel {
...
@@ -100,7 +101,8 @@ class NormOpGrad : public framework::OperatorWithKernel {
}
// namespace paddle
}
// namespace paddle
namespace
ops
=
paddle
::
operators
;
namespace
ops
=
paddle
::
operators
;
REGISTER_OP
(
norm
,
ops
::
NormOp
,
ops
::
NormOpMaker
,
norm_grad
,
ops
::
NormOpGrad
);
REGISTER_OP
(
norm
,
ops
::
NormOp
,
ops
::
NormOpMaker
<
float
>
,
norm_grad
,
ops
::
NormOpGrad
);
REGISTER_OP_CPU_KERNEL
(
REGISTER_OP_CPU_KERNEL
(
norm
,
ops
::
NormKernel
<
paddle
::
platform
::
CPUDeviceContext
,
float
>
,
norm
,
ops
::
NormKernel
<
paddle
::
platform
::
CPUDeviceContext
,
float
>
,
ops
::
NormKernel
<
paddle
::
platform
::
CPUDeviceContext
,
double
>
);
ops
::
NormKernel
<
paddle
::
platform
::
CPUDeviceContext
,
double
>
);
...
...
paddle/operators/norm_op.h
浏览文件 @
e811c865
...
@@ -26,14 +26,14 @@ template <typename T, int MajorType = Eigen::RowMajor,
...
@@ -26,14 +26,14 @@ template <typename T, int MajorType = Eigen::RowMajor,
typename
IndexType
=
Eigen
::
DenseIndex
>
typename
IndexType
=
Eigen
::
DenseIndex
>
using
EigenMatrix
=
framework
::
EigenMatrix
<
T
,
MajorType
,
IndexType
>
;
using
EigenMatrix
=
framework
::
EigenMatrix
<
T
,
MajorType
,
IndexType
>
;
template
<
typename
DeviceContext
,
typename
T
>
template
<
typename
DeviceContext
,
typename
T
,
typename
AttrType
=
T
>
class
NormKernel
:
public
framework
::
OpKernel
<
T
>
{
class
NormKernel
:
public
framework
::
OpKernel
<
T
>
{
public:
public:
void
Compute
(
const
framework
::
ExecutionContext
&
context
)
const
override
{
void
Compute
(
const
framework
::
ExecutionContext
&
context
)
const
override
{
const
framework
::
Tensor
*
in_x
=
context
.
Input
<
framework
::
Tensor
>
(
"X"
);
const
framework
::
Tensor
*
in_x
=
context
.
Input
<
framework
::
Tensor
>
(
"X"
);
const
framework
::
Tensor
*
scale
=
context
.
Input
<
framework
::
Tensor
>
(
"Scale"
);
const
framework
::
Tensor
*
scale
=
context
.
Input
<
framework
::
Tensor
>
(
"Scale"
);
auto
*
out
=
context
.
Output
<
framework
::
Tensor
>
(
"Out"
);
auto
*
out
=
context
.
Output
<
framework
::
Tensor
>
(
"Out"
);
T
epsilon
=
context
.
Attr
<
T
>
(
"epsilon"
);
auto
epsilon
=
static_cast
<
T
>
(
context
.
Attr
<
AttrType
>
(
"epsilon"
)
);
out
->
mutable_data
<
T
>
(
context
.
GetPlace
());
out
->
mutable_data
<
T
>
(
context
.
GetPlace
());
int
batch_size
=
in_x
->
dims
()[
0
];
int
batch_size
=
in_x
->
dims
()[
0
];
int
channels
=
in_x
->
dims
()[
1
];
int
channels
=
in_x
->
dims
()[
1
];
...
@@ -82,7 +82,7 @@ class NormKernel : public framework::OpKernel<T> {
...
@@ -82,7 +82,7 @@ class NormKernel : public framework::OpKernel<T> {
}
}
}
}
};
};
template
<
typename
DeviceContext
,
typename
T
>
template
<
typename
DeviceContext
,
typename
T
,
typename
AttrType
=
T
>
class
NormGradKernel
:
public
framework
::
OpKernel
<
T
>
{
class
NormGradKernel
:
public
framework
::
OpKernel
<
T
>
{
public:
public:
void
Compute
(
const
framework
::
ExecutionContext
&
context
)
const
override
{
void
Compute
(
const
framework
::
ExecutionContext
&
context
)
const
override
{
...
@@ -90,7 +90,7 @@ class NormGradKernel : public framework::OpKernel<T> {
...
@@ -90,7 +90,7 @@ class NormGradKernel : public framework::OpKernel<T> {
const
framework
::
Tensor
*
scale
=
context
.
Input
<
framework
::
Tensor
>
(
"Scale"
);
const
framework
::
Tensor
*
scale
=
context
.
Input
<
framework
::
Tensor
>
(
"Scale"
);
const
framework
::
Tensor
*
out_grad
=
const
framework
::
Tensor
*
out_grad
=
context
.
Input
<
framework
::
Tensor
>
(
framework
::
GradVarName
(
"Out"
));
context
.
Input
<
framework
::
Tensor
>
(
framework
::
GradVarName
(
"Out"
));
T
epsilon
=
context
.
Attr
<
T
>
(
"epsilon"
);
auto
epsilon
=
static_cast
<
T
>
(
context
.
Attr
<
AttrType
>
(
"epsilon"
)
);
framework
::
Tensor
*
in_x_grad
=
framework
::
Tensor
*
in_x_grad
=
context
.
Output
<
framework
::
Tensor
>
(
framework
::
GradVarName
(
"X"
));
context
.
Output
<
framework
::
Tensor
>
(
framework
::
GradVarName
(
"X"
));
in_x_grad
->
mutable_data
<
T
>
(
context
.
GetPlace
());
in_x_grad
->
mutable_data
<
T
>
(
context
.
GetPlace
());
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录