Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
ebba2b13
P
Paddle
项目概览
PaddlePaddle
/
Paddle
11 个月 前同步成功
通知
2292
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ebba2b13
编写于
6月 14, 2017
作者:
Q
qiaolongfei
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update code with new cclient
上级
8941a385
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
36 addition
and
46 deletion
+36
-46
go/pserver/cclient/test/main.c
go/pserver/cclient/test/main.c
+3
-4
go/pserver/cclient/test/test_cclient.c
go/pserver/cclient/test/test_cclient.c
+30
-27
paddle/trainer/NewRemoteParameterUpdater.cpp
paddle/trainer/NewRemoteParameterUpdater.cpp
+2
-9
paddle/trainer/NewRemoteParameterUpdater.h
paddle/trainer/NewRemoteParameterUpdater.h
+1
-6
未找到文件。
go/pserver/cclient/test/main.c
浏览文件 @
ebba2b13
...
...
@@ -11,10 +11,9 @@
void
sendGrads
(
paddle_pserver_client
c
)
{
unsigned
char
grad_a
[
2000
]
=
{
2
};
unsigned
char
grad_b
[
3000
]
=
{
3
};
paddle_gradient
grads
[
2
]
=
{
{
"param_a"
,
PADDLE_ELEMENT_TYPE_FLOAT32
,
grad_a
,
2000
},
{
"param_b"
,
PADDLE_ELEMENT_TYPE_FLOAT32
,
grad_b
,
3000
}};
paddle_gradient
grad1
=
{
"param_a"
,
PADDLE_ELEMENT_TYPE_FLOAT32
,
grad_a
,
2000
};
paddle_gradient
grad2
=
{
"param_b"
,
PADDLE_ELEMENT_TYPE_FLOAT32
,
grad_b
,
3000
};
paddle_gradient
*
grads
[
2
]
=
{
&
grad1
,
&
grad2
};
if
(
paddle_send_grads
(
c
,
grads
,
2
))
{
fail
();
}
...
...
go/pserver/cclient/test/test_cclient.c
浏览文件 @
ebba2b13
...
...
@@ -30,30 +30,36 @@ void print_parameter(paddle_gradient* param) {
int
main
()
{
char
addr
[]
=
"localhost:3000"
;
client
c
=
paddle_new_pserver_client
(
addr
,
1
);
paddle_pserver_
client
c
=
paddle_new_pserver_client
(
addr
,
1
);
char
*
names
[]
=
{
"param_a"
,
"param_b"
};
retry:
printf
(
"init parameter to pserver:
\n
"
);
real
param_content1
[]
=
{
0
.
1
,
0
.
2
,
0
.
3
};
real
param_content2
[]
=
{
0
.
4
,
0
.
5
,
0
.
6
};
paddle_parameter
**
params
=
(
paddle_parameter
**
)
malloc
(
sizeof
(
paddle_parameter
*
)
*
2
);
params
[
0
]
=
(
paddle_parameter
*
)
malloc
(
sizeof
(
paddle_parameter
));
params
[
0
]
->
name
=
names
[
0
];
params
[
0
]
->
content
=
(
unsigned
char
*
)
param_content1
;
params
[
0
]
->
content_len
=
3
*
sizeof
(
real
);
params
[
0
]
->
element_type
=
PADDLE_ELEMENT_TYPE_FLOAT32
;
params
[
1
]
=
(
paddle_parameter
*
)
malloc
(
sizeof
(
paddle_parameter
));
params
[
1
]
->
name
=
names
[
1
];
params
[
1
]
->
content
=
(
unsigned
char
*
)
param_content2
;
params
[
1
]
->
content_len
=
3
*
sizeof
(
real
);
params
[
1
]
->
element_type
=
PADDLE_ELEMENT_TYPE_INT32
;
if
(
paddle_begin_init_params
(
c
))
{
paddle_parameter
param
;
real
param_content1
[]
=
{
0
.
1
,
0
.
2
,
0
.
3
};
param
.
element_type
=
PADDLE_ELEMENT_TYPE_FLOAT32
;
param
.
name
=
names
[
0
];
param
.
content
=
(
unsigned
char
*
)
param_content1
;
param
.
content_len
=
3
*
sizeof
(
real
);
if
(
paddle_init_param
(
c
,
param
,
NULL
,
0
)
!=
0
)
{
if
(
paddle_init_param
(
c
,
*
params
[
0
],
NULL
,
0
)
!=
0
)
{
goto
retry
;
}
real
param_content2
[]
=
{
0
.
4
,
0
.
5
,
0
.
6
};
param
.
element_type
=
PADDLE_ELEMENT_TYPE_INT32
;
param
.
name
=
names
[
1
];
param
.
content
=
(
unsigned
char
*
)
param_content2
;
param
.
content_len
=
3
*
sizeof
(
real
);
if
(
paddle_init_param
(
c
,
param
,
NULL
,
0
)
!=
0
)
{
if
(
paddle_init_param
(
c
,
*
params
[
1
],
NULL
,
0
)
!=
0
)
{
goto
retry
;
}
if
(
paddle_finish_init_params
(
c
)
!=
0
)
{
goto
retry
;
}
...
...
@@ -61,13 +67,13 @@ retry:
fail
();
}
printf
(
"get init
ializ
ed parameters from pserver:
\n
"
);
paddle_parameter
*
param_ptrs
[
2
]
=
{
NULL
,
NULL
};
if
(
paddle_get_params
(
c
,
names
,
param_ptr
s
,
2
)
!=
0
)
{
printf
(
"get inited parameters from pserver:
\n
"
);
// get parameters again by reusing the allocated parameter buffers.
if
(
paddle_get_params
(
c
,
param
s
,
2
)
!=
0
)
{
fail
();
}
print_parameter
(
param
_ptr
s
[
0
]);
print_parameter
(
param
_ptr
s
[
1
]);
print_parameter
(
params
[
0
]);
print_parameter
(
params
[
1
]);
printf
(
"send gradient to pserver:
\n
"
);
real
gradient_content1
[]
=
{
0
.
01
,
0
.
02
,
0
.
03
};
...
...
@@ -87,6 +93,7 @@ retry:
grads
[
1
]
->
content_len
=
3
*
sizeof
(
real
);
grads
[
1
]
->
element_type
=
PADDLE_ELEMENT_TYPE_INT32
;
printf
(
"print gradient sent to pserver:
\n
"
);
print_parameter
(
grads
[
0
]);
print_parameter
(
grads
[
1
]);
...
...
@@ -96,15 +103,11 @@ retry:
printf
(
"get updated parameters from pserver:
\n
"
);
// get parameters again by reusing the allocated parameter buffers.
if
(
paddle_get_params
(
c
,
names
,
param_ptr
s
,
2
)
!=
0
)
{
if
(
paddle_get_params
(
c
,
param
s
,
2
)
!=
0
)
{
fail
();
}
print_parameter
(
param_ptrs
[
0
]);
print_parameter
(
param_ptrs
[
1
]);
paddle_release_param
(
param_ptrs
[
0
]);
paddle_release_param
(
param_ptrs
[
1
]);
print_parameter
(
params
[
0
]);
print_parameter
(
params
[
1
]);
if
(
paddle_save_model
(
c
,
"/tmp/"
)
!=
0
)
{
fail
();
...
...
paddle/trainer/NewRemoteParameterUpdater.cpp
浏览文件 @
ebba2b13
...
...
@@ -25,7 +25,6 @@ NewRemoteParameterUpdater::NewRemoteParameterUpdater(
:
parameterClient_
(
-
1
),
newParameters_
(
nullptr
),
newGradients_
(
nullptr
),
names_
(
nullptr
),
pserverSpec_
(
pserverSpec
)
{}
void
NewRemoteParameterUpdater
::
init
(
...
...
@@ -41,12 +40,6 @@ void NewRemoteParameterUpdater::init(
parameterClient_
=
paddle_new_pserver_client
((
char
*
)
pserverSpec_
.
c_str
(),
FLAGS_trainer_id
==
0
);
// init names_ for get parameter through paddle_cclient
names_
=
(
char
**
)
malloc
(
parameterSize
()
*
sizeof
(
char
*
));
for
(
int
i
=
0
;
i
<
parameterSize
();
++
i
)
{
names_
[
i
]
=
(
char
*
)
parameters_
[
i
]
->
getName
().
c_str
();
}
// init new parameter and gradient.
newParameters_
=
initNewParameter
(
PARAMETER_VALUE
);
newGradients_
=
initNewParameter
(
PARAMETER_GRADIENT
);
...
...
@@ -68,7 +61,7 @@ void NewRemoteParameterUpdater::init(
LOG
(
INFO
)
<<
"paddle_begin_init_params done"
;
}
else
{
paddle_get_params
(
parameterClient_
,
n
ames_
,
n
ewParameters_
,
parameterSize
());
parameterClient_
,
newParameters_
,
parameterSize
());
}
LOG
(
INFO
)
<<
"NewRemoteParameterUpdater initialized"
;
...
...
@@ -80,7 +73,7 @@ void NewRemoteParameterUpdater::finishBatch(real cost) {
// send gradient to parameter server.
paddle_send_grads
(
parameterClient_
,
newGradients_
,
parameterSize
());
// get the updated parameter from parameterClient.
paddle_get_params
(
parameterClient_
,
n
ames_
,
n
ewParameters_
,
parameterSize
());
paddle_get_params
(
parameterClient_
,
newParameters_
,
parameterSize
());
// clear gradient after update parameter.
for
(
auto
&
para
:
parameters_
)
{
...
...
paddle/trainer/NewRemoteParameterUpdater.h
浏览文件 @
ebba2b13
...
...
@@ -32,9 +32,6 @@ public:
NewRemoteParameterUpdater
(
const
OptimizationConfig
&
config
,
const
std
::
string
pserverSpec
);
~
NewRemoteParameterUpdater
()
{
if
(
names_
!=
nullptr
)
{
free
(
names_
);
}
releaseNewParameter
(
newParameters_
);
releaseNewParameter
(
newGradients_
);
if
(
parameterClient_
>=
0
)
paddle_pserver_client_release
(
parameterClient_
);
...
...
@@ -105,13 +102,11 @@ private:
protected:
/// internal parameter client object for exchanging data with pserver
client
parameterClient_
;
paddle_pserver_
client
parameterClient_
;
/// the parameters for new pserver client
paddle_parameter
**
newParameters_
;
/// the gradinets for new pserver client
paddle_parameter
**
newGradients_
;
/// the names for new parameters.
char
**
names_
;
/// the specification of parameter server "host1:port,host1:port"
std
::
string
pserverSpec_
;
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录