dongzhihong
8 years ago
commit
aadbd49814
@ -0,0 +1,2 @@
|
||||
vendor/
|
||||
.glide/
|
||||
@ -0,0 +1,19 @@
|
||||
# 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.
|
||||
#
|
||||
|
||||
add_subdirectory(pserver/cclient)
|
||||
add_subdirectory(cmd/pserver)
|
||||
add_subdirectory(cmd/master)
|
||||
add_subdirectory(master/c)
|
||||
@ -0,0 +1,15 @@
|
||||
# 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.
|
||||
|
||||
go_binary(master SRC master.go)
|
||||
@ -0,0 +1,15 @@
|
||||
# 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.
|
||||
|
||||
go_binary(pserver SRCS pserver.go)
|
||||
@ -0,0 +1,61 @@
|
||||
hash: b8f18ce6784bd3fadd9fed0b8443e7b658234ea785ae1f220723ae2c1f652aa7
|
||||
updated: 2017-06-27T14:05:48.925262819+08:00
|
||||
imports:
|
||||
- name: github.com/coreos/etcd
|
||||
version: 61fc123e7a8b14a0a258aa3f5c4159861b1ec2e7
|
||||
subpackages:
|
||||
- auth/authpb
|
||||
- clientv3
|
||||
- clientv3/concurrency
|
||||
- etcdserver/api/v3rpc/rpctypes
|
||||
- etcdserver/etcdserverpb
|
||||
- mvcc/mvccpb
|
||||
- name: github.com/golang/protobuf
|
||||
version: 4bd1920723d7b7c925de087aa32e2187708897f7
|
||||
subpackages:
|
||||
- jsonpb
|
||||
- proto
|
||||
- name: github.com/golang/snappy
|
||||
version: 553a641470496b2327abcac10b36396bd98e45c9
|
||||
- name: github.com/namsral/flag
|
||||
version: 71ceffbeb0ba60fccc853971bb3ed4d7d90bfd04
|
||||
- name: github.com/PaddlePaddle/recordio
|
||||
version: edfb82af0739c84f241c87390ec5649c7b28c129
|
||||
- name: github.com/sirupsen/logrus
|
||||
version: 202f25545ea4cf9b191ff7f846df5d87c9382c2b
|
||||
- name: golang.org/x/net
|
||||
version: c8c74377599bd978aee1cf3b9b63a8634051cec2
|
||||
subpackages:
|
||||
- context
|
||||
- http2
|
||||
- http2/hpack
|
||||
- idna
|
||||
- internal/timeseries
|
||||
- lex/httplex
|
||||
- trace
|
||||
- name: golang.org/x/sys
|
||||
version: f7928cfef4d09d1b080aa2b6fd3ca9ba1567c733
|
||||
subpackages:
|
||||
- unix
|
||||
- name: golang.org/x/text
|
||||
version: 4e9ab9ee170f2a39bd66c92b3e0a47ff47a4bc77
|
||||
subpackages:
|
||||
- secure/bidirule
|
||||
- transform
|
||||
- unicode/bidi
|
||||
- unicode/norm
|
||||
- name: google.golang.org/grpc
|
||||
version: 8050b9cbc271307e5a716a9d782803d09b0d6f2d
|
||||
subpackages:
|
||||
- codes
|
||||
- credentials
|
||||
- grpclog
|
||||
- internal
|
||||
- keepalive
|
||||
- metadata
|
||||
- naming
|
||||
- peer
|
||||
- stats
|
||||
- tap
|
||||
- transport
|
||||
testImports: []
|
||||
@ -0,0 +1,12 @@
|
||||
package: github.com/PaddlePaddle/Paddle/go
|
||||
import:
|
||||
- package: github.com/PaddlePaddle/recordio
|
||||
- package: github.com/coreos/etcd
|
||||
version: ^3.2.1
|
||||
subpackages:
|
||||
- clientv3
|
||||
- clientv3/concurrency
|
||||
- package: github.com/namsral/flag
|
||||
version: ^1.7.4-pre
|
||||
- package: github.com/sirupsen/logrus
|
||||
version: ^1.0.0
|
||||
@ -1,3 +1 @@
|
||||
cmake_minimum_required(VERSION 3.0)
|
||||
|
||||
go_library(paddle_master SHARED)
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
cc_library(paddle_go_optimizer DEPS paddle_optimizer paddle_proto glog gflags protobuf)
|
||||
go_library(paddle_pserver_cclient STATIC)
|
||||
|
||||
add_subdirectory(test)
|
||||
if(WITH_TESTING)
|
||||
add_subdirectory(test)
|
||||
endif()
|
||||
|
||||
@ -1,3 +1,2 @@
|
||||
|
||||
cc_binary(main SRCS main.c DEPS paddle_pserver_cclient)
|
||||
cc_test(test_cclient SRCS test_cclient.c DEPS paddle_pserver_cclient)
|
||||
add_style_check_target(test_cclient test_cclient.c)
|
||||
|
||||
@ -1,93 +0,0 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "libpaddle_pserver_cclient.h"
|
||||
|
||||
// TODO(helin): Fix: gtest using cmake is not working, using this
|
||||
// hacky way for now.
|
||||
#define fail() \
|
||||
fprintf(stderr, "info: %s:%d: ", __FILE__, __LINE__); \
|
||||
exit(-1);
|
||||
|
||||
void sendGrads(paddle_pserver_client c) {
|
||||
unsigned char grad_a[2000] = {2};
|
||||
unsigned char grad_b[3000] = {3};
|
||||
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();
|
||||
}
|
||||
}
|
||||
|
||||
void getParams(paddle_pserver_client c) {
|
||||
paddle_parameter param_a;
|
||||
paddle_parameter param_b;
|
||||
char name_a[] = "param_a";
|
||||
char name_b[] = "param_b";
|
||||
// Must pre-allocate the prameter content before calling paddle_get_params.
|
||||
unsigned char content_a[2000] = {};
|
||||
unsigned char content_b[3000] = {};
|
||||
param_a.element_type = PADDLE_ELEMENT_TYPE_FLOAT32;
|
||||
param_a.name = name_a;
|
||||
param_a.content = content_a;
|
||||
param_a.content_len = 2000;
|
||||
param_b.element_type = PADDLE_ELEMENT_TYPE_FLOAT32;
|
||||
param_b.name = name_b;
|
||||
param_b.content = content_b;
|
||||
param_b.content_len = 3000;
|
||||
|
||||
paddle_parameter* params[2] = {¶m_a, ¶m_b};
|
||||
if (paddle_get_params(c, params, 2)) {
|
||||
fail();
|
||||
}
|
||||
}
|
||||
|
||||
int main() {
|
||||
char addr[] = "localhost:3000";
|
||||
paddle_pserver_client c = paddle_new_pserver_client(addr, 1);
|
||||
retry:
|
||||
if (paddle_begin_init_params(c)) {
|
||||
paddle_parameter param;
|
||||
char name_a[] = "param_a";
|
||||
char name_b[] = "param_b";
|
||||
unsigned char content_a[2000] = {1};
|
||||
unsigned char content_b[3000] = {0};
|
||||
param.element_type = PADDLE_ELEMENT_TYPE_FLOAT32;
|
||||
param.name = name_a;
|
||||
param.content = content_a;
|
||||
param.content_len = 2000;
|
||||
int error = paddle_init_param(c, param, NULL, 0);
|
||||
if (error != 0) {
|
||||
goto retry;
|
||||
}
|
||||
|
||||
param.element_type = PADDLE_ELEMENT_TYPE_FLOAT32;
|
||||
param.name = name_b;
|
||||
param.content = content_b;
|
||||
param.content_len = 3000;
|
||||
error = paddle_init_param(c, param, NULL, 0);
|
||||
if (error != 0) {
|
||||
goto retry;
|
||||
}
|
||||
|
||||
error = paddle_finish_init_params(c);
|
||||
if (error != 0) {
|
||||
goto retry;
|
||||
}
|
||||
}
|
||||
|
||||
int i;
|
||||
for (i = 0; i < 100; i++) {
|
||||
sendGrads(c);
|
||||
getParams(c);
|
||||
}
|
||||
|
||||
if (paddle_save_model(c, "/tmp/")) {
|
||||
fail();
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
Binary file not shown.
@ -1,58 +0,0 @@
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "optimizer.h"
|
||||
|
||||
typedef int (*update_func)(void*, void*, paddle_element_type, const void*, int);
|
||||
typedef void (*release_func)(void*);
|
||||
|
||||
typedef struct paddle_optimizer {
|
||||
update_func update;
|
||||
release_func release;
|
||||
void* optimizer;
|
||||
} paddle_optimizer;
|
||||
|
||||
void paddle_release_optimizer(paddle_optimizer* o) {
|
||||
o->release(o->optimizer);
|
||||
free(o);
|
||||
}
|
||||
|
||||
int paddle_update_parameter(paddle_optimizer* o,
|
||||
void* buffer,
|
||||
paddle_element_type element_type,
|
||||
const void* gradient,
|
||||
int num_bytes) {
|
||||
return o->update(o->optimizer, buffer, element_type, gradient, num_bytes);
|
||||
}
|
||||
|
||||
typedef struct { double learning_rate; } SGD_optimizer;
|
||||
|
||||
int update_SGD(void* optimizer,
|
||||
void* buffer,
|
||||
paddle_element_type element_type,
|
||||
const void* gradient,
|
||||
int num_bytes) {
|
||||
SGD_optimizer* o = (SGD_optimizer*)optimizer;
|
||||
float* parameter = (float*)buffer;
|
||||
float* grad = (float*)gradient;
|
||||
|
||||
int i;
|
||||
for (i = 0; i < num_bytes / sizeof(float); ++i) {
|
||||
parameter[i] -= o->learning_rate * grad[i];
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
void release_SGD(void* optimizer) {
|
||||
SGD_optimizer* o = (SGD_optimizer*)optimizer;
|
||||
// nothing allocated on heap
|
||||
}
|
||||
|
||||
paddle_optimizer* paddle_create_SGD_optimizer(double learning_rate) {
|
||||
SGD_optimizer* impl = (SGD_optimizer*)malloc(sizeof(SGD_optimizer));
|
||||
impl->learning_rate = learning_rate;
|
||||
paddle_optimizer* opt = (paddle_optimizer*)malloc(sizeof(paddle_optimizer));
|
||||
opt->update = update_SGD;
|
||||
opt->release = release_SGD;
|
||||
opt->optimizer = impl;
|
||||
return opt;
|
||||
}
|
||||
@ -1,22 +0,0 @@
|
||||
#ifndef PADDLE_PSERVER_OPTIMIZER_H
|
||||
#define PADDLE_PSERVER_OPTIMIZER_H
|
||||
|
||||
typedef enum {
|
||||
PADDLE_ELEMENT_TYPE_INT32 = 0,
|
||||
PADDLE_ELEMENT_TYPE_UINT32 = 1,
|
||||
PADDLE_ELEMENT_TYPE_INT64 = 2,
|
||||
PADDLE_ELEMENT_TYPE_UINT64 = 3,
|
||||
PADDLE_ELEMENT_TYPE_FLOAT32 = 4,
|
||||
PADDLE_ELEMENT_TYPE_FLOAT64 = 5,
|
||||
} paddle_element_type;
|
||||
|
||||
struct paddle_optimizer;
|
||||
struct paddle_optimizer* paddle_create_SGD_optimizer(double learning_rate);
|
||||
void paddle_release_optimizer(struct paddle_optimizer* o);
|
||||
int paddle_update_parameter(struct paddle_optimizer* o,
|
||||
void* buffer,
|
||||
paddle_element_type element_type,
|
||||
const void* gradient,
|
||||
int num_bytes);
|
||||
|
||||
#endif /* PADDLE_PSERVER_OPTIMIZER_H */
|
||||
@ -1,8 +1,24 @@
|
||||
package pserver
|
||||
|
||||
import "testing"
|
||||
import (
|
||||
"io/ioutil"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestSGDCreateRelease(t *testing.T) {
|
||||
o := newOptimizer(sgd, 1)
|
||||
func TestOptimizerCreateRelease(t *testing.T) {
|
||||
p := Parameter{
|
||||
Name: "a",
|
||||
ElementType: Int32,
|
||||
}
|
||||
p.Content = []byte{1, 3}
|
||||
config, err := ioutil.ReadFile("./cclient/test/testdata/optimizer.pb")
|
||||
if err != nil {
|
||||
t.Fatalf("read optimizer proto failed")
|
||||
}
|
||||
param := ParameterWithConfig{
|
||||
Param: p,
|
||||
Config: config,
|
||||
}
|
||||
o := newOptimizer(param)
|
||||
o.Cleanup()
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue