Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
夏有凉风,冬有雪
Paddle
提交
eaba2e2e
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
eaba2e2e
编写于
12月 21, 2016
作者:
Y
Yu Yang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Expose Evaluator API
上级
1e6c87bd
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
90 addition
and
7 deletion
+90
-7
demo/mnist/api_train.py
demo/mnist/api_train.py
+3
-3
paddle/api/CMakeLists.txt
paddle/api/CMakeLists.txt
+10
-0
paddle/api/Evaluator.cpp
paddle/api/Evaluator.cpp
+29
-0
paddle/api/GradientMachine.cpp
paddle/api/GradientMachine.cpp
+10
-0
paddle/api/Paddle.swig
paddle/api/Paddle.swig
+2
-0
paddle/api/PaddleAPI.h
paddle/api/PaddleAPI.h
+26
-1
paddle/api/PaddleAPIPrivate.h
paddle/api/PaddleAPIPrivate.h
+9
-2
paddle/api/ParameterUpdater.cpp
paddle/api/ParameterUpdater.cpp
+1
-1
未找到文件。
demo/mnist/api_train.py
浏览文件 @
eaba2e2e
...
...
@@ -62,14 +62,14 @@ def main():
train_data_generator
=
input_order_converter
(
read_from_mnist
(
train_file
))
for
batch_id
,
data_batch
in
enumerate
(
generator_to_batch
(
train_data_generator
,
2
56
)):
generator_to_batch
(
train_data_generator
,
2
048
)):
trainRole
=
updater
.
startBatch
(
len
(
data_batch
))
def
update_callback
(
param
):
def
update
r
_callback
(
param
):
updater
.
update
(
param
)
m
.
forwardBackward
(
converter
(
data_batch
),
outArgs
,
trainRole
,
update_callback
)
converter
(
data_batch
),
outArgs
,
trainRole
,
update
r
_callback
)
cost_vec
=
outArgs
.
getSlotValue
(
0
)
cost_vec
=
cost_vec
.
copyToNumpyMat
()
...
...
paddle/api/CMakeLists.txt
浏览文件 @
eaba2e2e
set
(
API_SOURCES
Arguments.cpp
ConfigParser.cpp
Evaluator.cpp
GradientMachine.cpp
Matrix.cpp
Parameter.cpp
...
...
@@ -63,6 +64,15 @@ install(DIRECTORY ${PROJ_ROOT}/paddle/dist/
add_custom_target
(
python_api_wheel ALL DEPENDS
${
PROJ_ROOT
}
/paddle/dist/.timestamp
)
add_dependencies
(
python_api_wheel python_swig_sources
paddle_parameter
paddle_math
paddle_utils
paddle_gserver
paddle_pserver
paddle_trainer
paddle_api
paddle_cuda
)
if
(
WITH_TESTING
)
add_subdirectory
(
test
)
...
...
paddle/api/Evaluator.cpp
0 → 100644
浏览文件 @
eaba2e2e
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. */
#include <sstream>
#include "PaddleAPI.h"
#include "PaddleAPIPrivate.h"
Evaluator
::
Evaluator
()
:
m
(
new
EvaluatorPrivate
())
{}
Evaluator
::~
Evaluator
()
{
delete
m
;
}
void
Evaluator
::
start
()
{
m
->
rawPtr
->
start
();
}
void
Evaluator
::
finish
()
{
m
->
rawPtr
->
finish
();
}
std
::
string
Evaluator
::
toString
()
{
std
::
ostringstream
sout
;
m
->
rawPtr
->
printStats
(
sout
);
return
sout
.
str
();
}
paddle/api/GradientMachine.cpp
浏览文件 @
eaba2e2e
...
...
@@ -162,3 +162,13 @@ SequenceGenerator* GradientMachine::asSequenceGenerator(
r
->
setBeamSize
(
beam_size
);
return
r
;
}
Evaluator
*
GradientMachine
::
makeEvaluator
()
{
auto
ev
=
new
Evaluator
();
ev
->
m
->
rawPtr
=
m
->
machine
->
makeEvaluator
();
return
ev
;
}
void
GradientMachine
::
eval
(
Evaluator
*
evaluator
)
{
m
->
machine
->
eval
(
evaluator
->
m
->
rawPtr
);
}
paddle/api/Paddle.swig
浏览文件 @
eaba2e2e
...
...
@@ -97,6 +97,7 @@ namespace std {
%rename(__setitem__) Vector::set;
%rename(__len__) Vector::getSize;
%rename(__call__) ParameterTraverseCallback::apply;
%rename(__repr__) Evaluator::toString;
%apply (float* INPLACE_ARRAY2, int DIM1, int DIM2) {
(float* data, int dim1, int dim2)
...
...
@@ -167,6 +168,7 @@ namespace std {
%newobject GradientMachine::asSequenceGenerator;
%newobject GradientMachine::getParameter;
%newobject GradientMachine::getLayerOutput;
%newobject GradientMachine::makeEvaluator;
%newobject TrainerConfig::createFromTrainerConfigFile;
%newobject TrainerConfig::getModelConfig;
%newobject TrainerConfig::getOptimizationConfig;
...
...
paddle/api/PaddleAPI.h
浏览文件 @
eaba2e2e
...
...
@@ -685,7 +685,7 @@ private:
};
class
SequenceGenerator
;
class
Evaluator
;
struct
GradientMachinePrivate
;
class
GradientMachine
{
private:
...
...
@@ -770,6 +770,10 @@ public:
size_t
max_length
=
100UL
,
size_t
beam_size
=
-
1UL
);
Evaluator
*
makeEvaluator
();
void
eval
(
Evaluator
*
evaluator
);
private:
GradientMachinePrivate
*
m
;
...
...
@@ -809,6 +813,27 @@ private:
ParameterUpdaterPrivate
*
m
;
};
struct
EvaluatorPrivate
;
class
Evaluator
{
private:
Evaluator
();
DISABLE_COPY_AND_ASSIGN
(
Evaluator
);
public:
~
Evaluator
();
void
start
();
void
finish
();
std
::
string
toString
();
private:
EvaluatorPrivate
*
m
;
friend
class
GradientMachine
;
};
struct
TrainerPrivate
;
class
Trainer
{
private:
...
...
paddle/api/PaddleAPIPrivate.h
浏览文件 @
eaba2e2e
...
...
@@ -14,10 +14,10 @@ limitations under the License. */
#pragma once
#include <memory>
#include "PaddleAPI.h"
#include "paddle/gserver/evaluators/Evaluator.h"
#include "paddle/gserver/gradientmachines/GradientMachine.h"
#include "paddle/trainer/TrainerConfigHelper.h"
#include "paddle/parameter/ParameterUpdaterBase.h"
#include "paddle/trainer/TrainerConfigHelper.h"
struct
GradientMachinePrivate
{
std
::
shared_ptr
<
paddle
::
GradientMachine
>
machine
;
...
...
@@ -88,3 +88,10 @@ struct ParameterPrivate {
}
}
};
struct
EvaluatorPrivate
{
paddle
::
Evaluator
*
rawPtr
;
EvaluatorPrivate
()
:
rawPtr
(
nullptr
)
{}
~
EvaluatorPrivate
()
{
delete
rawPtr
;
}
};
paddle/api/ParameterUpdater.cpp
浏览文件 @
eaba2e2e
...
...
@@ -29,7 +29,7 @@ ParameterUpdater *ParameterUpdater::createLocalUpdater(
ParameterUpdater
::~
ParameterUpdater
()
{
delete
m
;
}
void
ParameterUpdater
::
init
(
const
GradientMachine
&
gm
)
{
m
->
updater
->
init
(
gm
.
m
->
machine
->
getParameters
());
m
->
updater
->
init
(
gm
.
m
->
machine
->
get
NonStatic
Parameters
());
}
void
ParameterUpdater
::
startPass
()
{
m
->
updater
->
startPass
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录