Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
c7a247b7
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2299
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
c7a247b7
编写于
8月 10, 2017
作者:
L
Liu Yiqun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Support to load parameters from buffer in c-api.
上级
fb5cd7f8
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
117 addition
and
18 deletion
+117
-18
paddle/capi/Arguments.cpp
paddle/capi/Arguments.cpp
+12
-0
paddle/capi/arguments.h
paddle/capi/arguments.h
+13
-0
paddle/capi/gradient_machine.cpp
paddle/capi/gradient_machine.cpp
+9
-0
paddle/capi/gradient_machine.h
paddle/capi/gradient_machine.h
+9
-0
paddle/gserver/gradientmachines/GradientMachine.cpp
paddle/gserver/gradientmachines/GradientMachine.cpp
+43
-0
paddle/gserver/gradientmachines/GradientMachine.h
paddle/gserver/gradientmachines/GradientMachine.h
+2
-0
paddle/gserver/gradientmachines/NeuralNetwork.cpp
paddle/gserver/gradientmachines/NeuralNetwork.cpp
+2
-0
paddle/parameter/Parameter.cpp
paddle/parameter/Parameter.cpp
+22
-18
paddle/parameter/Parameter.h
paddle/parameter/Parameter.h
+5
-0
未找到文件。
paddle/capi/Arguments.cpp
浏览文件 @
c7a247b7
...
...
@@ -90,6 +90,18 @@ paddle_error paddle_arguments_set_ids(paddle_arguments args,
return
kPD_NO_ERROR
;
}
paddle_error
paddle_arguments_set_frame_shape
(
paddle_arguments
args
,
uint64_t
ID
,
uint64_t
frameHeight
,
uint64_t
frameWidth
)
{
if
(
args
==
nullptr
)
return
kPD_NULLPTR
;
auto
a
=
castArg
(
args
);
if
(
ID
>=
a
->
args
.
size
())
return
kPD_OUT_OF_RANGE
;
a
->
args
[
ID
].
setFrameHeight
(
frameHeight
);
a
->
args
[
ID
].
setFrameWidth
(
frameWidth
);
return
kPD_NO_ERROR
;
}
paddle_error
paddle_arguments_set_sequence_start_pos
(
paddle_arguments
args
,
uint64_t
ID
,
uint32_t
nestedLevel
,
...
...
paddle/capi/arguments.h
浏览文件 @
c7a247b7
...
...
@@ -111,6 +111,19 @@ PD_API paddle_error paddle_arguments_set_ids(paddle_arguments args,
uint64_t
ID
,
paddle_ivector
ids
);
/**
* @brief paddle_arguments_set_frame_shape Set the fram size of one argument
* in array, which index is `ID`.
* @param [in] args arguments array
* @param [in] ID array index
* @param [out] ids integer vector pointer
* @return paddle_error
*/
PD_API
paddle_error
paddle_arguments_set_frame_shape
(
paddle_arguments
args
,
uint64_t
ID
,
uint64_t
frameHeight
,
uint64_t
frameWidth
);
/**
* @brief PDArgsSetSequenceStartPos Set sequence start position vector of one
* argument in array, which index is `ID`.
...
...
paddle/capi/gradient_machine.cpp
浏览文件 @
c7a247b7
...
...
@@ -68,6 +68,15 @@ paddle_error paddle_gradient_machine_load_parameter_from_disk(
return
kPD_NO_ERROR
;
}
paddle_error
paddle_gradient_machine_load_parameter_from_buffer
(
paddle_gradient_machine
machine
,
const
char
*
buf
,
uint64_t
length
)
{
auto
m
=
cast
(
machine
);
if
(
m
==
nullptr
||
buf
==
nullptr
||
m
->
machine
==
nullptr
)
return
kPD_NULLPTR
;
m
->
machine
->
loadParameters
(
buf
,
length
);
return
kPD_NO_ERROR
;
}
paddle_error
paddle_gradient_machine_forward
(
paddle_gradient_machine
machine
,
paddle_arguments
inArgs
,
paddle_arguments
outArgs
,
...
...
paddle/capi/gradient_machine.h
浏览文件 @
c7a247b7
...
...
@@ -45,6 +45,15 @@ PD_API paddle_error paddle_gradient_machine_create_for_inference(
PD_API
paddle_error
paddle_gradient_machine_load_parameter_from_disk
(
paddle_gradient_machine
machine
,
const
char
*
path
);
/**
* @brief Load parameter from buffer.
* @param machine Gradient Machine.
* @param buffer containing all parameters.
* @return paddle_error
*/
PD_API
paddle_error
paddle_gradient_machine_load_parameter_from_buffer
(
paddle_gradient_machine
machine
,
const
char
*
buf
,
uint64_t
length
);
/**
* @brief Forward a gradient machine
* @param machine Gradient machine
...
...
paddle/gserver/gradientmachines/GradientMachine.cpp
浏览文件 @
c7a247b7
...
...
@@ -14,6 +14,7 @@ limitations under the License. */
#include "GradientMachine.h"
#include <string.h>
#include <fstream>
#include "paddle/utils/Logging.h"
...
...
@@ -81,6 +82,48 @@ void GradientMachine::loadParameters(const std::string& dir) {
}
}
void
GradientMachine
::
loadParameters
(
const
char
*
buf
,
uint64_t
length
)
{
LOG
(
INFO
)
<<
"Loading parameter from pre-load buffer"
;
CHECK_NOTNULL
(
buf
);
CHECK_GE
(
length
,
static_cast
<
uint64_t
>
(
sizeof
(
uint64_t
)));
uint64_t
numFiles
=
0
;
memcpy
(
&
numFiles
,
buf
,
sizeof
(
uint64_t
));
uint64_t
position
=
sizeof
(
uint64_t
);
LOG
(
INFO
)
<<
"numFiles: "
<<
numFiles
<<
", position: "
<<
position
;
std
::
map
<
std
::
string
,
char
*>
offsets
;
std
::
map
<
std
::
string
,
uint64_t
>
lengths
;
for
(
uint64_t
i
=
0
;
i
<
numFiles
;
i
++
)
{
std
::
string
filename
(
buf
+
position
);
position
+=
filename
.
size
()
+
1
;
LOG
(
INFO
)
<<
"filename: "
<<
filename
<<
", position: "
<<
position
;
uint64_t
size
=
0
;
memcpy
(
&
size
,
buf
+
position
,
sizeof
(
uint64_t
));
position
+=
sizeof
(
uint64_t
);
offsets
[
filename
]
=
const_cast
<
char
*>
(
buf
+
position
);
lengths
[
filename
]
=
size
;
position
+=
size
;
CHECK_GE
(
length
,
position
);
}
CHECK_GE
(
offsets
.
size
(),
parameters_
.
size
());
for
(
auto
&
para
:
parameters_
)
{
std
::
string
filename
=
para
->
getName
();
if
(
para
->
isFullSize
())
{
if
(
offsets
.
end
()
==
offsets
.
find
(
filename
))
{
para
->
loadMiss
(
filename
);
}
else
{
std
::
istringstream
stream
(
std
::
string
(
offsets
[
filename
],
lengths
[
filename
]));
para
->
load
(
stream
);
}
}
}
}
void
GradientMachine
::
randParameters
()
{
LOG
(
INFO
)
<<
"Initing parameters.."
;
...
...
paddle/gserver/gradientmachines/GradientMachine.h
浏览文件 @
c7a247b7
...
...
@@ -221,6 +221,8 @@ public:
void
loadParameters
(
const
std
::
string
&
dir
);
void
loadParameters
(
const
char
*
buf
,
uint64_t
length
);
void
randParameters
();
virtual
void
getStats
(
real
&
cost
,
int64_t
&
numProcessed
)
{
...
...
paddle/gserver/gradientmachines/NeuralNetwork.cpp
浏览文件 @
c7a247b7
...
...
@@ -24,6 +24,8 @@ limitations under the License. */
#include "paddle/gserver/layers/AgentLayer.h"
#include "paddle/utils/Stat.h"
#include <iostream>
namespace
paddle
{
void
parameterInitNN
(
int
paramId
,
Parameter
*
para
,
...
...
paddle/parameter/Parameter.cpp
浏览文件 @
c7a247b7
...
...
@@ -314,27 +314,31 @@ bool Parameter::save(std::ostream& s) const {
/**
* Load parameter value from a file
*/
bool
Parameter
::
loadMiss
(
const
std
::
string
&
filename
)
{
LOG
(
INFO
)
<<
"missing parameters ["
<<
filename
<<
"] while loading model."
;
if
(
kMissParameterFail
==
FLAGS_load_missing_parameter_strategy
)
{
LOG
(
FATAL
)
<<
getName
()
<<
" missing, not allowed."
;
return
false
;
}
if
(
kMissParameterRand
==
FLAGS_load_missing_parameter_strategy
)
{
LOG
(
INFO
)
<<
getName
()
<<
" missing, set to random."
;
randomize
();
return
true
;
}
if
(
kMissParameterZero
==
FLAGS_load_missing_parameter_strategy
)
{
LOG
(
INFO
)
<<
getName
()
<<
" missing, set to zero."
;
zeroMem
();
return
true
;
}
LOG
(
FATAL
)
<<
"unsupported load_missing_parameter_strategy: "
<<
FLAGS_load_missing_parameter_strategy
;
return
false
;
}
bool
Parameter
::
load
(
const
std
::
string
&
filename
)
{
std
::
ifstream
fs
(
filename
,
std
::
ios_base
::
binary
);
if
(
!
fs
)
{
LOG
(
INFO
)
<<
"missing parameters ["
<<
filename
<<
"] while loading model."
;
if
(
kMissParameterFail
==
FLAGS_load_missing_parameter_strategy
)
{
LOG
(
FATAL
)
<<
getName
()
<<
" missing, not allowed."
;
return
false
;
}
if
(
kMissParameterRand
==
FLAGS_load_missing_parameter_strategy
)
{
LOG
(
INFO
)
<<
getName
()
<<
" missing, set to random."
;
randomize
();
return
true
;
}
if
(
kMissParameterZero
==
FLAGS_load_missing_parameter_strategy
)
{
LOG
(
INFO
)
<<
getName
()
<<
" missing, set to zero."
;
zeroMem
();
return
true
;
}
LOG
(
FATAL
)
<<
"unsupported load_missing_parameter_strategy: "
<<
FLAGS_load_missing_parameter_strategy
;
return
false
;
loadMiss
(
filename
);
}
return
load
(
fs
);
}
...
...
paddle/parameter/Parameter.h
浏览文件 @
c7a247b7
...
...
@@ -201,6 +201,11 @@ public:
*/
bool
save
(
std
::
ostream
&
s
)
const
;
/**
* Fill parameter when file is missed
*/
bool
loadMiss
(
const
std
::
string
&
filename
);
/**
* Load parameter value from a file
*/
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录