Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
马赛克医院
Paddle
提交
950b4a31
P
Paddle
项目概览
马赛克医院
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
950b4a31
编写于
2月 23, 2017
作者:
L
liaogang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
change return type Argument
上级
bbfcee20
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
11 addition
and
10 deletion
+11
-10
paddle/api/GradientMachine.cpp
paddle/api/GradientMachine.cpp
+2
-1
paddle/api/Trainer.cpp
paddle/api/Trainer.cpp
+2
-1
paddle/gserver/gradientmachines/GradientMachine.h
paddle/gserver/gradientmachines/GradientMachine.h
+1
-1
paddle/gserver/gradientmachines/MultiGradientMachine.cpp
paddle/gserver/gradientmachines/MultiGradientMachine.cpp
+1
-2
paddle/gserver/gradientmachines/MultiGradientMachine.h
paddle/gserver/gradientmachines/MultiGradientMachine.h
+1
-1
paddle/gserver/gradientmachines/NeuralNetwork.cpp
paddle/gserver/gradientmachines/NeuralNetwork.cpp
+1
-1
paddle/gserver/gradientmachines/NeuralNetwork.h
paddle/gserver/gradientmachines/NeuralNetwork.h
+1
-1
paddle/gserver/layers/CosSimVecMatLayer.cpp
paddle/gserver/layers/CosSimVecMatLayer.cpp
+2
-2
未找到文件。
paddle/api/GradientMachine.cpp
浏览文件 @
950b4a31
...
...
@@ -148,7 +148,8 @@ Arguments* GradientMachine::getLayerOutput(const std::string& layerName) const
throw
(
UnsupportError
)
{
auto
nn
=
m
->
machine
;
if
(
nn
)
{
return
Arguments
::
createByPaddleArgument
(
&
nn
->
getLayerOutput
(
layerName
));
auto
arg
=
nn
->
getLayerOutput
(
layerName
);
return
Arguments
::
createByPaddleArgument
(
&
arg
);
}
else
{
throw
UnsupportError
();
}
...
...
paddle/api/Trainer.cpp
浏览文件 @
950b4a31
...
...
@@ -134,7 +134,8 @@ void Trainer::finishTestPeriod() { m->finishTestPeriod(); }
Arguments
*
Trainer
::
getLayerOutput
(
const
std
::
string
&
layerName
)
const
{
auto
nn
=
this
->
m
->
getGradientMachine
();
CHECK
(
nn
)
<<
"trainerInternal_.getGradientMachine() is not NeuralNetwork"
;
return
Arguments
::
createByPaddleArgument
(
&
nn
->
getLayerOutput
(
layerName
));
auto
arg
=
nn
->
getLayerOutput
(
layerName
);
return
Arguments
::
createByPaddleArgument
(
&
arg
);
}
void
Trainer
::
forwardOneBatch
(
size_t
batchSize
)
{
...
...
paddle/gserver/gradientmachines/GradientMachine.h
浏览文件 @
950b4a31
...
...
@@ -134,7 +134,7 @@ public:
backward
(
callback
);
}
virtual
const
Argument
&
getLayerOutput
(
const
std
::
string
&
layerName
)
{
virtual
Argument
getLayerOutput
(
const
std
::
string
&
layerName
)
{
return
*
((
Argument
*
)
nullptr
);
}
...
...
paddle/gserver/gradientmachines/MultiGradientMachine.cpp
浏览文件 @
950b4a31
...
...
@@ -282,8 +282,7 @@ void MultiGradientMachine::forwardBackward(const std::vector<Argument>& inArgs,
backwardImp
(
callback
);
}
const
Argument
&
MultiGradientMachine
::
getLayerOutput
(
const
std
::
string
&
layerName
)
{
Argument
MultiGradientMachine
::
getLayerOutput
(
const
std
::
string
&
layerName
)
{
std
::
vector
<
Argument
>
args
;
args
.
reserve
(
threads_
.
size
());
...
...
paddle/gserver/gradientmachines/MultiGradientMachine.h
浏览文件 @
950b4a31
...
...
@@ -189,7 +189,7 @@ public:
PassType
passType
,
const
UpdateCallback
&
callback
);
virtual
const
Argument
&
getLayerOutput
(
const
std
::
string
&
layerName
);
virtual
Argument
getLayerOutput
(
const
std
::
string
&
layerName
);
virtual
void
onPassEnd
();
...
...
paddle/gserver/gradientmachines/NeuralNetwork.cpp
浏览文件 @
950b4a31
...
...
@@ -293,7 +293,7 @@ void NeuralNetwork::backward(const UpdateCallback& callback) {
}
}
const
Argument
&
NeuralNetwork
::
getLayerOutput
(
const
std
::
string
&
layerName
)
{
Argument
NeuralNetwork
::
getLayerOutput
(
const
std
::
string
&
layerName
)
{
return
getLayer
(
layerName
)
->
getOutput
();
}
...
...
paddle/gserver/gradientmachines/NeuralNetwork.h
浏览文件 @
950b4a31
...
...
@@ -87,7 +87,7 @@ public:
virtual
void
backward
(
const
UpdateCallback
&
callback
=
nullptr
);
virtual
const
Argument
&
getLayerOutput
(
const
std
::
string
&
layerName
);
virtual
Argument
getLayerOutput
(
const
std
::
string
&
layerName
);
const
LayerPtr
&
getLayer
(
const
std
::
string
&
layerName
)
const
{
auto
it
=
layerMap_
.
find
(
layerName
);
...
...
paddle/gserver/layers/CosSimVecMatLayer.cpp
浏览文件 @
950b4a31
...
...
@@ -112,7 +112,7 @@ bool CosSimVecMatLayer::init(const LayerMap& layerMap,
void
CosSimVecMatLayer
::
forward
(
PassType
passType
)
{
Layer
::
forward
(
passType
);
CHECK_EQ
(
forward_
.
size
(),
1
)
<<
"Only one forward function needed"
;
CHECK_EQ
(
forward_
.
size
(),
1
UL
)
<<
"Only one forward function needed"
;
MatrixPtr
inV0
=
getInputValue
(
0
);
MatrixPtr
inV1
=
getInputValue
(
1
);
...
...
@@ -145,7 +145,7 @@ void CosSimVecMatLayer::forward(PassType passType) {
}
void
CosSimVecMatLayer
::
backward
(
const
UpdateCallback
&
callback
)
{
CHECK_EQ
(
backward_
.
size
(),
1
)
<<
"Only one forward function needed"
;
CHECK_EQ
(
backward_
.
size
(),
1
UL
)
<<
"Only one forward function needed"
;
MatrixPtr
inV0
=
getInputValue
(
0
);
MatrixPtr
inV1
=
getInputValue
(
1
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录