diff --git a/go/pserver/optimizer.go b/go/pserver/optimizer.go index 9cb2801f30de71b49eb3bec364e367cfcfe3cb1b..46e614d3a1697cd368ab30f2f4bd865dbc824498 100644 --- a/go/pserver/optimizer.go +++ b/go/pserver/optimizer.go @@ -12,14 +12,15 @@ import "C" import ( "fmt" "unsafe" + + log "github.com/sirupsen/logrus" ) var nullPtr = unsafe.Pointer(uintptr(0)) type optimizer struct { - opt *C.struct_paddle_optimizer - // used in GetParam, reconstruct Parameter from optimizer - ElementType ElementType + opt *C.struct_paddle_optimizer + elementType ElementType } func cArrayToSlice(p unsafe.Pointer, len int) []byte { @@ -37,13 +38,17 @@ func cArrayToSlice(p unsafe.Pointer, len int) []byte { func newOptimizer(paramWithConfigs ParameterWithConfig) *optimizer { o := &optimizer{} - o.ElementType = paramWithConfigs.Param.ElementType + o.elementType = paramWithConfigs.Param.ElementType p := paramWithConfigs.Param c := paramWithConfigs.Config + log.WithFields(log.Fields{ + "ElementType": p.ElementType, + "ParamSize": len(p.Content), + "ConfigSize": len(c), + }).Info("New Optimizer Created with config:") var cbuffer unsafe.Pointer - cbuffer_len := int(unsafe.Sizeof(p.Content[0])) * len(p.Content) - cbuffer = C.malloc(C.size_t(cbuffer_len)) - C.memcpy(cbuffer, unsafe.Pointer(&p.Content[0]), C.size_t(cbuffer_len)) + cbuffer = C.malloc(C.size_t(len(p.Content))) + C.memcpy(cbuffer, unsafe.Pointer(&p.Content[0]), C.size_t(len(p.Content))) o.opt = C.paddle_create_optimizer((*C.uchar)(&c[0]), C.int(len(c)), C.paddle_element_type(p.ElementType), cbuffer, C.int(len(p.Content)), (*C.char)(nullPtr), 0) @@ -57,11 +62,10 @@ func (o *optimizer) GetWeights() []byte { } func (o *optimizer) UpdateParameter(g Gradient) error { - if o.ElementType != g.ElementType { - return fmt.Errorf("Name: %s, parameter and gradient element type not match, parameter: %v, gradient: %v", g.Name, o.ElementType, g.ElementType) + if o.elementType != g.ElementType { + return fmt.Errorf("Name: %s, parameter and gradient element type not match, parameter: %v, gradient: %v", g.Name, o.elementType, g.ElementType) } - fmt.Println(g) r := C.paddle_update_parameter(o.opt, C.paddle_element_type(g.ElementType), unsafe.Pointer(&g.Content[0]), C.int(len(g.Content))) if r != 0 { return fmt.Errorf("optimizer update returned error code: %d", r) diff --git a/go/pserver/service.go b/go/pserver/service.go index 2ab622d7902175c150005281ebf583dcd5579095..555d379bcbe639a9af59f55a5275b4e4dcf1887c 100644 --- a/go/pserver/service.go +++ b/go/pserver/service.go @@ -128,7 +128,7 @@ func (s *Service) GetParam(name string, parameter *Parameter) error { // to save the program from making a copy of the // paramter content. parameter.Name = name - parameter.ElementType = opt.ElementType + parameter.ElementType = opt.elementType parameter.Content = opt.GetWeights() return nil }