提交 4d435db4 编写于 作者: M MRXLT

Merge remote-tracking branch 'upstream/develop' into general-server-v1

[submodule "core/general-client/pybind11"]
path = core/general-client/pybind11
url = https://github.com/pybind/pybind11
Subproject commit 9a19306fbf30642ca331d0ec88e7da54a96860f9 Subproject commit 4f72ef846fe8453596230ac285eeaa0ce3278bb4
...@@ -31,11 +31,13 @@ from paddle_serving_server import Server ...@@ -31,11 +31,13 @@ from paddle_serving_server import Server
op_maker = OpMaker() op_maker = OpMaker()
read_op = op_maker.create('general_text_reader') read_op = op_maker.create('general_text_reader')
general_infer_op = op_maker.create('general_text_infer') general_infer_op = op_maker.create('general_infer')
general_response_op = op_maker.create('general_text_response')
op_seq_maker = OpSeqMaker() op_seq_maker = OpSeqMaker()
op_seq_maker.add_op(read_op) op_seq_maker.add_op(read_op)
op_seq_maker.add_op(general_infer_op) op_seq_maker.add_op(general_infer_op)
op_seq_maker.add_op(general_response_op)
server = Server() server = Server()
server.set_op_sequence(op_seq_maker.get_op_sequence()) server.set_op_sequence(op_seq_maker.get_op_sequence())
......
...@@ -20,7 +20,7 @@ import ( ...@@ -20,7 +20,7 @@ import (
"io/ioutil" "io/ioutil"
"log" "log"
"net/http" "net/http"
pb "general_model" pb "github.com/PaddlePaddle/Serving/go/proto"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
) )
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册