update demo serving

demo-serving/conf/general_model.prototxt

+is_lod_feed: true
+is_lod_feed: false
+is_lod_feed: true
+feed_type: 1
+feed_type: 0
+feed_type: 1
+
+feed_shape {
+    shape: -1
+}
+
+feed_shape {
+    shape: 1
+    shape: 2
+    shape: 3
+}
+
+feed_shape {
+    shape: -1
+}

demo-serving/conf/gflags.conf

 --enable_model_toolkit
---enable_cube=true
+--enable_cube=false
+--enable_general_model=true
+--general_model_path=./conf
+--general_model_file=general_model.prototxt

demo-serving/conf/service.prototxt

@@ -39,3 +39,7 @@ services {
   name: "BertService"
   workflows: "workflow9"
 }
+services {
+  name: "LoadGeneralModelService"
+  workflows: "workflow10"
+}
\ No newline at end of file

demo-serving/conf/workflow.prototxt

@@ -91,4 +91,11 @@ workflows {
     type: "BertServiceOp"
   }
 }
-
+workflows {
+  name: "workflow10"
+  workflow_type: "Sequence"
+  nodes {
+    name: "load_general_model_conf_op"
+    type: "LoadGeneralModelConfOp"
+  }
+}

demo-serving/op/load_general_model_conf_op.cpp

+// Copyright (c) 2019 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.
+
+#include "demo-serving/op/load_general_model_conf_op.h"
+
+namespace baidu {
+namespace paddle_serving {
+namespace predictor {
+
+DEFINE_OP(LoadGeneralModelConfOp);
+
+}  // namespace predictor
+}  // namespace paddle_serving
+}  // namespace baidu

demo-serving/op/load_general_model_conf_op.h

+// Copyright (c) 2019 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.
+
+#pragma once
+#include <memory>
+
+#include "demo-serving/load_general_model_service.pb.h"
+#include "predictor/common/inner_common.h"
+#include "predictor/framework/channel.h"
+#include "predictor/framework/op_repository.h"
+#include "predictor/op/op.h"
+#include "predictor/framework/resource.h"
+
+namespace baidu {
+namespace paddle_serving {
+namespace predictor {
+
+class LoadGeneralModelConfOp
+    : public OpWithChannel<
+    baidu::paddle_serving::predictor::
+    load_general_model_service::RequestAndResponse> {
+ public:
+  typedef baidu::paddle_serving::predictor::
+      load_general_model_service::RequestAndResponse
+      RequestAndResponse;
+
+  DECLARE_OP(LoadGeneralModelConfOp);
+
+  int inference() {
+    LOG(INFO) << "start to call load general model_conf op";
+    baidu::paddle_serving::predictor::Resource& resource =
+        baidu::paddle_serving::predictor::Resource::instance();
+
+    LOG(INFO) << "get resource pointer done.";
+    std::shared_ptr<PaddleGeneralModelConfig> model_config =
+        resource.get_general_model_config();
+
+    LOG(INFO) << "get general model config pointer done.";
+    resource.print_general_model_config(model_config);
+
+    LOG(INFO) << "print general model config done.";
+    const RequestAndResponse* req =
+        dynamic_cast<const RequestAndResponse*>(get_request_message());
+
+    RequestAndResponse* data = mutable_data<RequestAndResponse>();
+
+    data->CopyFrom(*req);
+
+    return 0;
+  }
+};
+
+}  // namespace predictor
+}  // namespace paddle_serving
+}  // namespace baidu

demo-serving/proto/CMakeLists.txt

@@ -8,6 +8,7 @@ LIST(APPEND protofiles
         ${CMAKE_CURRENT_LIST_DIR}/text_classification.proto
         ${CMAKE_CURRENT_LIST_DIR}/ctr_prediction.proto
         ${CMAKE_CURRENT_LIST_DIR}/bert_service.proto
+	${CMAKE_CURRENT_LIST_DIR}/load_general_model_service.proto
 )
 
 PROTOBUF_GENERATE_SERVING_CPP(TRUE PROTO_SRCS PROTO_HDRS ${protofiles})

demo-serving/proto/load_general_model_service.proto

+// Copyright (c) 2019 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.
+
+syntax = "proto2";
+import "pds_option.proto";
+package baidu.paddle_serving.predictor.load_general_model_service;
+
+option cc_generic_services = true;
+
+message RequestAndResponse {
+  required int32 a = 1;
+  required float b = 2;
+};
+
+service LoadGeneralModelService {
+  rpc inference(RequestAndResponse) returns (RequestAndResponse);
+  rpc debug(RequestAndResponse) returns (RequestAndResponse);
+  option (pds.options).generate_impl = true;
+};