From e7cdd6c9f14f0b26ea9eb8f906e045b32e2b63fe Mon Sep 17 00:00:00 2001 From: guru4elephant Date: Thu, 13 Feb 2020 23:38:35 +0800 Subject: [PATCH] fix some bugs --- go/client_app/imdb_client.go | 65 ++++++------ go/serving_client/serving_client_api.go | 134 ++++++++++++++++++++++++ 2 files changed, 168 insertions(+), 31 deletions(-) create mode 100644 go/serving_client/serving_client_api.go diff --git a/go/client_app/imdb_client.go b/go/client_app/imdb_client.go index 4bf0d285..5eddbf94 100644 --- a/go/client_app/imdb_client.go +++ b/go/client_app/imdb_client.go @@ -1,32 +1,36 @@ -# Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved. -# -# 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. +// Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved. +// +// 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. package main import ( + "io" + "strings" + "bufio" + "strconv" + "fmt" "os" - "serving_client" - "path" - "path/filepath" + "serving_client" ) func main() { - config_file_path string = os.Args[1] - handle = serving_client.LoadModelConfig(config_file_path) + var config_file_path string + config_file_path = os.Args[1] + handle := serving_client.LoadModelConfig(config_file_path) serving_client.Connect("127.0.0.1", 9292, handle) - test_file_path string = os.Args[2] + test_file_path := os.Args[2] fi, err := os.Open(test_file_path) if err != nil { fmt.Print(err) @@ -35,9 +39,9 @@ func main() { defer fi.Close() br := bufio.NewReader(fi) - fetch []int = {"cost", "acc", "prediction"} + fetch := []string{"cost", "acc", "prediction"} - result Map(string)[]float + var result map[string][]float32 for { line, err := br.ReadString('\n') @@ -45,25 +49,24 @@ func main() { break } - var words = []int{} - var label = []int{} + var words = []int64{} s := strings.Split(line, " ") value, err := strconv.Atoi(s[0]) - feed_int_map Map(string)[]int - feed_float_map Map(string)[]float + var feed_int_map map[string][]int64 for _, v := range s[1:value + 1] { - int_v := strconv.Atoi(v) - words = append(words, int_v) + int_v, _ := strconv.Atoi(v) + words = append(words, int64(int_v)) } - label = append(label, strconv.Atoi(s[len(s)-1])) + label, _ := strconv.Atoi(s[len(s)-1]) feed_int_map["words"] = words - feed_int_map["label"] = label + feed_int_map["label"] = []int64{int64(label)} - result = serving_client.Predict( - feed_int_map, feed_float_map, fetch, handle) + result = serving_client.Predict(handle, + feed_int_map, fetch) + fmt.Println(result["prediction"][0]) } } \ No newline at end of file diff --git a/go/serving_client/serving_client_api.go b/go/serving_client/serving_client_api.go new file mode 100644 index 00000000..508ba0fd --- /dev/null +++ b/go/serving_client/serving_client_api.go @@ -0,0 +1,134 @@ +// Copyright (c) 2020 PaddlePaddle Authors. All Rights Reserved. +// +// 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. + +package serving_client + +import ( + "bytes" + "encoding/json" + "io/ioutil" + "log" + "net/http" + "fmt" + pb "general_model" + "github.com/golang/protobuf/proto" +) + +type Tensor struct { + IntData []int64 `json:"int_data"` + ElemType int `json:"elem_type"` + Shape []int `json:"shape"` +} + +type FeedInst struct { + TensorArray []Tensor `json:"tensor_array"` +} + +type FetchInst struct { + TensorArray []Tensor `json:"tensor_array"` +} + +type Request struct { + Insts []FeedInst `json:"insts"` + FetchVarNames []string `json:"fetch_var_names"` +} + +type Response struct { + Insts []FetchInst `json:"insts"` +} + +type Handle struct { + Url string + Port int + FeedAliasNameMap map[string]string + FeedShapeMap map[string][]int + FeedNameMap map[string]int + FetchNameMap map[string]int + FetchAliasNameMap map[string]string +} + +func LoadModelConfig(config string) Handle { + in, err := ioutil.ReadFile(config) + if err != nil { + log.Fatalln("Failed to read general model: ", err) + } + general_model_config := &pb.GeneralModelConfig{} + if err := proto.Unmarshal(in, general_model_config); err != nil { + log.Fatalln("Failed to parse GeneralModelConfig: ", err) + } + handle := Handle{} + for i, v := range general_model_config.FeedVar { + handle.FeedNameMap[*v.Name] = i + // handle.FeedShapeMap[*v.Name] := []int + tmp_array := []int{} + for _, vv := range v.Shape { + tmp_array = append(tmp_array, int(vv)) + } + handle.FeedShapeMap[*v.Name] = tmp_array + handle.FeedAliasNameMap[*v.AliasName] = *v.Name + } + + for i, v := range general_model_config.FetchVar { + handle.FetchNameMap[*v.Name] = i + handle.FetchAliasNameMap[*v.AliasName] = *v.Name + } + + return handle +} + +func Connect(url string, port int, handle Handle) Handle { + handle.Url = url + handle.Port = port + return handle +} + +func Predict(handle Handle, int_feed_map map[string][]int64, fetch []string) map[string][]float32 { + contentType := "application/json;charset=utf-8" + + var tensor_array []Tensor + var inst FeedInst + for k, _ := range int_feed_map { + var tmp Tensor + tmp.IntData = int_feed_map[k] + tmp.ElemType = 0 + tmp.Shape = handle.FeedShapeMap[k] + tensor_array = append(tensor_array, tmp) + } + + req := &Request{ + Insts: []FeedInst{inst}, + FetchVarNames: fetch} + + b, err := json.Marshal(req) + fmt.Println(string(b)) + + body := bytes.NewBuffer(b) + + resp, err := http.Post(handle.Url, contentType, body) + if err != nil { + log.Println("Post failed:", err) + } + + defer resp.Body.Close() + + content, err := ioutil.ReadAll(resp.Body) + if err != nil { + log.Println("Read failed:", err) + } + + log.Println("content:", string(content)) + + var result map[string][]float32 + return result +} -- GitLab