From 1a8606988f82b3c7e5b2cc057049b89686f06262 Mon Sep 17 00:00:00 2001 From: guru4elephant Date: Thu, 13 Feb 2020 11:45:02 +0800 Subject: [PATCH] add int_data and float_data for Tensor --- core/general-server/proto/general_model_service.proto | 6 ++++-- core/sdk-cpp/proto/general_model_service.proto | 8 +++++--- python/paddle_serving_server/__init__.py | 2 ++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/core/general-server/proto/general_model_service.proto b/core/general-server/proto/general_model_service.proto index 1f236ea3..36b63ec6 100644 --- a/core/general-server/proto/general_model_service.proto +++ b/core/general-server/proto/general_model_service.proto @@ -21,8 +21,10 @@ option cc_generic_services = true; message Tensor { repeated bytes data = 1; - optional int32 elem_type = 2; - repeated int32 shape = 3; + repeated int32 int_data = 2; + repeated float float_data = 3; + optional int32 elem_type = 4; + repeated int32 shape = 5; }; message FeedInst { diff --git a/core/sdk-cpp/proto/general_model_service.proto b/core/sdk-cpp/proto/general_model_service.proto index d48a79e1..1d62c25f 100644 --- a/core/sdk-cpp/proto/general_model_service.proto +++ b/core/sdk-cpp/proto/general_model_service.proto @@ -20,9 +20,11 @@ package baidu.paddle_serving.predictor.general_model; option cc_generic_services = true; message Tensor { - repeated bytes data = 1; - optional int32 elem_type = 2; - repeated int32 shape = 3; + repeated bytes data = 1; // most general format + repeated int32 int_data = 2; // for simple debug only + repeated float float_data = 3; // for simple debug only + optional int32 elem_type = 4; // support int64, float32 + repeated int32 shape = 5; }; message FeedInst { diff --git a/python/paddle_serving_server/__init__.py b/python/paddle_serving_server/__init__.py index d8b58bbe..cbfedf43 100644 --- a/python/paddle_serving_server/__init__.py +++ b/python/paddle_serving_server/__init__.py @@ -20,7 +20,9 @@ import google.protobuf.text_format class OpMaker(object): def __init__(self): self.op_dict = {"general_infer":"GeneralInferOp", + "general_text_infer":"GeneralTextInferOp", "general_reader":"GeneralReaderOp", + "general_text_reader":"GeneralTextReaderOp", "general_single_kv":"GeneralSingleKVOp", "general_dist_kv":"GeneralDistKVOp"} -- GitLab