Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
迷途归一
Paddle
提交
c44f5dd8
P
Paddle
项目概览
迷途归一
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
0
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,发现更多精彩内容 >>
提交
c44f5dd8
编写于
6月 10, 2017
作者:
Q
qiaolongfei
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add simple updater, this version can train a model
上级
966bf9ae
变更
7
显示空白变更内容
内联
并排
Showing
7 changed file
with
146 addition
and
56 deletion
+146
-56
go/pserver/cclient/cclient.go
go/pserver/cclient/cclient.go
+0
-1
go/pserver/cclient/test/CMakeLists.txt
go/pserver/cclient/test/CMakeLists.txt
+4
-0
go/pserver/cclient/test/main.c
go/pserver/cclient/test/main.c
+20
-51
go/pserver/cclient/test/test_cclient.c
go/pserver/cclient/test/test_cclient.c
+114
-0
go/pserver/optimizer.c
go/pserver/optimizer.c
+7
-1
paddle/trainer/NewRemoteParameterUpdater.cpp
paddle/trainer/NewRemoteParameterUpdater.cpp
+0
-2
paddle/trainer/NewRemoteParameterUpdater.h
paddle/trainer/NewRemoteParameterUpdater.h
+1
-1
未找到文件。
go/pserver/cclient/cclient.go
浏览文件 @
c44f5dd8
...
...
@@ -42,7 +42,6 @@ import (
"strings"
"sync"
"unsafe"
"fmt"
"github.com/PaddlePaddle/Paddle/go/pserver"
)
...
...
go/pserver/cclient/test/CMakeLists.txt
浏览文件 @
c44f5dd8
...
...
@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.0)
add_executable
(
main main.c
)
add_dependencies
(
main paddle_pserver_cclient
)
add_executable
(
test_cclient test_cclient.c
)
add_dependencies
(
test_cclient paddle_pserver_cclient
)
if
(
APPLE
)
set
(
CMAKE_EXE_LINKER_FLAGS
"-framework CoreFoundation -framework Security"
)
...
...
@@ -10,7 +12,9 @@ endif()
if
(
PROJ_ROOT
)
include_directories
(
${
CMAKE_BINARY_DIR
}
/go/pserver/cclient/
)
target_link_libraries
(
main
${
CMAKE_BINARY_DIR
}
/go/pserver/cclient/libpaddle_pserver_cclient.a pthread
)
target_link_libraries
(
test_cclient
${
CMAKE_BINARY_DIR
}
/go/pserver/cclient/libpaddle_pserver_cclient.a pthread
)
else
(
PROJ_ROOT
)
include_directories
(
${
CMAKE_BINARY_DIR
}
)
target_link_libraries
(
main
${
CMAKE_BINARY_DIR
}
/libpaddle_pserver_cclient.a pthread
)
target_link_libraries
(
test_cclient
${
CMAKE_BINARY_DIR
}
/libpaddle_pserver_cclient.a pthread
)
endif
(
PROJ_ROOT
)
go/pserver/cclient/test/main.c
浏览文件 @
c44f5dd8
#include <stdio.h>
#include <stdlib.h>
#include "libpaddle_pserver_cclient.h"
...
...
@@ -10,21 +9,6 @@ void fail() {
exit
(
-
1
);
}
void
print_parameter
(
paddle_gradient
*
param
)
{
if
(
param
==
NULL
)
{
printf
(
"param is NULL!!
\n
"
);
}
else
{
printf
(
"==== parameter ====
\n
"
);
printf
(
"name: %s
\n
"
,
param
->
name
);
printf
(
"content_len: %d
\n
"
,
param
->
content_len
);
printf
(
"content_type: %d
\n
"
,
param
->
element_type
);
for
(
int
i
=
0
;
i
<
param
->
content_len
;
++
i
)
{
printf
(
"0x%x "
,
param
->
content
[
i
]);
}
printf
(
"
\n\n
"
);
}
}
int
main
()
{
char
addr
[]
=
"localhost:3000"
;
client
c
=
paddle_new_pserver_client
(
addr
,
1
);
...
...
@@ -33,23 +17,21 @@ retry:
paddle_parameter
param
;
char
name_a
[]
=
"param_a"
;
char
name_b
[]
=
"param_b"
;
unsigned
char
content
1
[]
=
{
0x01
,
0x02
,
0x03
};
unsigned
char
content
[]
=
{
0x00
,
0x11
,
0x22
};
param
.
element_type
=
PADDLE_ELEMENT_TYPE_FLOAT32
;
param
.
name
=
name_a
;
param
.
content
=
content
1
;
param
.
content
=
content
;
param
.
content_len
=
3
;
if
(
paddle_init_param
(
c
,
param
,
NULL
,
0
)
!=
0
)
{
goto
retry
;
}
unsigned
char
content2
[]
=
{
0x04
,
0x05
,
0x06
};
param
.
element_type
=
PADDLE_ELEMENT_TYPE_INT32
;
param
.
name
=
name_b
;
param
.
content
=
content
2
;
param
.
content
=
content
;
param
.
content_len
=
3
;
if
(
paddle_init_param
(
c
,
param
,
NULL
,
0
)
!=
0
)
{
goto
retry
;
}
if
(
paddle_finish_init_params
(
c
)
!=
0
)
{
goto
retry
;
}
...
...
@@ -57,27 +39,22 @@ retry:
fail
();
}
unsigned
char
content1
[]
=
{
0x12
,
0x23
,
0x34
};
unsigned
char
content2
[]
=
{
0x45
,
0x56
,
0x67
};
paddle_gradient
**
new_params
=
unsigned
char
content
[]
=
{
0x00
,
0x11
,
0x22
};
paddle_gradient
**
grads
=
(
paddle_gradient
**
)
malloc
(
sizeof
(
paddle_gradient
*
)
*
2
);
new_params
[
0
]
=
(
paddle_gradient
*
)
malloc
(
sizeof
(
paddle_gradient
));
new_params
[
0
]
->
name
=
"param_a"
;
new_params
[
0
]
->
content
=
content1
;
new_params
[
0
]
->
content_len
=
3
;
new_params
[
0
]
->
element_type
=
PADDLE_ELEMENT_TYPE_FLOAT32
;
new_params
[
1
]
=
(
paddle_gradient
*
)
malloc
(
sizeof
(
paddle_gradient
));
new_params
[
1
]
->
name
=
"param_b"
;
new_params
[
1
]
->
content
=
content2
;
new_params
[
1
]
->
content_len
=
3
;
new_params
[
1
]
->
element_type
=
PADDLE_ELEMENT_TYPE_INT32
;
print_parameter
(
new_params
[
0
]);
print_parameter
(
new_params
[
1
]);
if
(
paddle_send_grads
(
c
,
new_params
,
2
)
!=
0
)
{
grads
[
0
]
=
(
paddle_gradient
*
)
malloc
(
sizeof
(
paddle_gradient
));
grads
[
0
]
->
name
=
"param_a"
;
grads
[
0
]
->
content
=
content
;
grads
[
0
]
->
content_len
=
3
;
grads
[
0
]
->
element_type
=
PADDLE_ELEMENT_TYPE_FLOAT32
;
grads
[
1
]
=
(
paddle_gradient
*
)
malloc
(
sizeof
(
paddle_gradient
));
grads
[
1
]
->
name
=
"param_b"
;
grads
[
1
]
->
content
=
content
;
grads
[
1
]
->
content_len
=
3
;
grads
[
1
]
->
element_type
=
PADDLE_ELEMENT_TYPE_INT32
;
if
(
paddle_send_grads
(
c
,
grads
,
2
)
!=
0
)
{
fail
();
}
...
...
@@ -87,15 +64,6 @@ retry:
fail
();
}
print_parameter
(
params
[
0
]);
print_parameter
(
params
[
1
]);
/// change name of parameter.
char
*
names2
[]
=
{
"param_1"
,
"param_2"
};
if
(
paddle_get_params
(
c
,
names2
,
params
,
2
)
==
0
)
{
fail
();
}
// get parameters again by reusing the allocated parameter buffers.
if
(
paddle_get_params
(
c
,
names
,
params
,
2
)
!=
0
)
{
fail
();
...
...
@@ -109,5 +77,6 @@ retry:
}
printf
(
"test success!
\n
"
);
return
0
;
}
go/pserver/cclient/test/test_cclient.c
0 → 100644
浏览文件 @
c44f5dd8
#include <stdio.h>
#include <stdlib.h>
#include "libpaddle_pserver_cclient.h"
typedef
float
real
;
void
fail
()
{
// TODO(helin): fix: gtest using cmake is not working, using this
// hacky way for now.
printf
(
"test failed.
\n
"
);
exit
(
-
1
);
}
void
print_parameter
(
paddle_gradient
*
param
)
{
if
(
param
==
NULL
)
{
printf
(
"param is NULL!!
\n
"
);
}
else
{
printf
(
"==== parameter ====
\n
"
);
printf
(
"name: %s
\n
"
,
param
->
name
);
printf
(
"content_len: %d
\n
"
,
param
->
content_len
);
printf
(
"content_type: %d
\n
"
,
param
->
element_type
);
for
(
int
i
=
0
;
i
<
param
->
content_len
/
sizeof
(
real
);
++
i
)
{
printf
(
"%f "
,
((
float
*
)
param
->
content
)[
i
]);
}
printf
(
"
\n\n
"
);
}
}
int
main
()
{
char
addr
[]
=
"localhost:3000"
;
client
c
=
paddle_new_pserver_client
(
addr
,
1
);
char
*
names
[]
=
{
"param_a"
,
"param_b"
};
retry:
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
)
{
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
)
{
goto
retry
;
}
if
(
paddle_finish_init_params
(
c
)
!=
0
)
{
goto
retry
;
}
}
else
{
fail
();
}
printf
(
"get initialized parameters from pserver:
\n
"
);
paddle_parameter
*
param_ptrs
[
2
]
=
{
NULL
,
NULL
};
if
(
paddle_get_params
(
c
,
names
,
param_ptrs
,
2
)
!=
0
)
{
fail
();
}
print_parameter
(
param_ptrs
[
0
]);
print_parameter
(
param_ptrs
[
1
]);
printf
(
"send gradient to pserver:
\n
"
);
real
gradient_content1
[]
=
{
0
.
01
,
0
.
02
,
0
.
03
};
real
gradinet_content2
[]
=
{
0
.
04
,
0
.
05
,
0
.
06
};
paddle_gradient
**
grads
=
(
paddle_gradient
**
)
malloc
(
sizeof
(
paddle_gradient
*
)
*
2
);
grads
[
0
]
=
(
paddle_gradient
*
)
malloc
(
sizeof
(
paddle_gradient
));
grads
[
0
]
->
name
=
names
[
0
];
grads
[
0
]
->
content
=
(
unsigned
char
*
)
gradient_content1
;
grads
[
0
]
->
content_len
=
3
*
sizeof
(
real
);
grads
[
0
]
->
element_type
=
PADDLE_ELEMENT_TYPE_FLOAT32
;
grads
[
1
]
=
(
paddle_gradient
*
)
malloc
(
sizeof
(
paddle_gradient
));
grads
[
1
]
->
name
=
names
[
1
];
grads
[
1
]
->
content
=
(
unsigned
char
*
)
gradinet_content2
;
grads
[
1
]
->
content_len
=
3
*
sizeof
(
real
);
grads
[
1
]
->
element_type
=
PADDLE_ELEMENT_TYPE_INT32
;
print_parameter
(
grads
[
0
]);
print_parameter
(
grads
[
1
]);
if
(
paddle_send_grads
(
c
,
grads
,
2
)
!=
0
)
{
fail
();
}
printf
(
"get updated parameters from pserver:
\n
"
);
// get parameters again by reusing the allocated parameter buffers.
if
(
paddle_get_params
(
c
,
names
,
param_ptrs
,
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
]);
if
(
paddle_save_model
(
c
,
"/tmp/"
)
!=
0
)
{
fail
();
}
printf
(
"test success!
\n
"
);
return
0
;
}
go/pserver/optimizer.c
浏览文件 @
c44f5dd8
...
...
@@ -32,7 +32,13 @@ int update_SGD(void* optimizer,
const
void
*
gradient
,
int
num_bytes
)
{
SGD_optimizer
*
o
=
(
SGD_optimizer
*
)
optimizer
;
// TODO
// TODO(a simple SGD implement)
float
*
parameter
=
(
float
*
)
buffer
;
float
*
grad
=
(
float
*
)
gradient
;
for
(
int
i
=
0
;
i
<
num_bytes
/
sizeof
(
float
);
++
i
)
{
parameter
[
i
]
-=
o
->
learning_rate
*
grad
[
i
];
}
return
0
;
}
...
...
paddle/trainer/NewRemoteParameterUpdater.cpp
浏览文件 @
c44f5dd8
...
...
@@ -73,8 +73,6 @@ void NewRemoteParameterUpdater::init(
void
NewRemoteParameterUpdater
::
updateImpl
(
Parameter
*
para
)
{}
void
NewRemoteParameterUpdater
::
finishBatch
(
real
cost
)
{
LOG
(
INFO
)
<<
"finishBatch in, cost: "
<<
cost
;
// send gradient to parameter server.
paddle_send_grads
(
parameterClient_
,
newGradients_
,
parameterSize
());
// get the updated parameter from parameterClient.
...
...
paddle/trainer/NewRemoteParameterUpdater.h
浏览文件 @
c44f5dd8
...
...
@@ -87,7 +87,7 @@ private:
new_params
[
i
]
->
name
=
(
char
*
)
param
->
getName
().
c_str
();
new_params
[
i
]
->
content
=
(
unsigned
char
*
)(
param
->
getBuf
(
type
).
get
()
->
getData
());
new_params
[
i
]
->
content_len
=
(
int
)
param
->
getBuf
(
type
).
get
()
->
getSize
();
new_params
[
i
]
->
content_len
=
(
int
)
param
->
getBuf
(
type
).
get
()
->
getSize
()
*
sizeof
(
real
)
;
}
return
new_params
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录