diff --git a/core/general-server/proto/general_model_service.proto b/core/general-server/proto/general_model_service.proto index 1f236ea34574e10af905aa936348bea9dd4c0ae5..36b63ec68bc704c1f5e1eb7a8ed4d3e4fb456d4f 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 d48a79e18a54cfca7eeca2d730dc4b0b357c2bb4..1d62c25f1ce40ecc23e98310e7834d7bcc847022 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 d8b58bbe3cf0ad94ae3bf1c62cf48886218bcc1b..cbfedf43462567bf2a7c87ab965f0e41091eeac3 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"}