提交 a4b89dc5 编写于 作者: B barrierye

update the usage of Client in python examples

上级 392c85a7
...@@ -41,7 +41,9 @@ def single_func(idx, resource): ...@@ -41,7 +41,9 @@ def single_func(idx, resource):
fetch = ["pooled_output"] fetch = ["pooled_output"]
client = Client() client = Client()
client.load_client_config(args.model) client.load_client_config(args.model)
client.connect([resource["endpoint"][idx % len(resource["endpoint"])]]) client.add_variant(
"var1", [resource["endpoint"][idx % len(resource["endpoint"])]], 50)
client.connect()
start = time.time() start = time.time()
for i in range(1000): for i in range(1000):
......
...@@ -40,7 +40,9 @@ def single_func(idx, resource): ...@@ -40,7 +40,9 @@ def single_func(idx, resource):
fetch = ["pooled_output"] fetch = ["pooled_output"]
client = Client() client = Client()
client.load_client_config(args.model) client.load_client_config(args.model)
client.connect([resource["endpoint"][idx % len(resource["endpoint"])]]) client.add_variant(
"var1", [resource["endpoint"][idx % len(resource["endpoint"])]], 50)
client.connect()
feed_batch = [] feed_batch = []
for bi in range(args.batch_size): for bi in range(args.batch_size):
feed_batch.append(reader.process(dataset[bi])) feed_batch.append(reader.process(dataset[bi]))
......
...@@ -33,7 +33,8 @@ fetch = ["pooled_output"] ...@@ -33,7 +33,8 @@ fetch = ["pooled_output"]
endpoint_list = ["127.0.0.1:9494"] endpoint_list = ["127.0.0.1:9494"]
client = Client() client = Client()
client.load_client_config(args.model) client.load_client_config(args.model)
client.connect(endpoint_list) client.add_variant("var1", endpoint_list, 50)
client.connect()
for line in fin: for line in fin:
feed_dict = reader.process(line) feed_dict = reader.process(line)
......
...@@ -43,7 +43,9 @@ def single_func(idx, resource): ...@@ -43,7 +43,9 @@ def single_func(idx, resource):
fetch = ["prob"] fetch = ["prob"]
client = Client() client = Client()
client.load_client_config(args.model) client.load_client_config(args.model)
client.connect([resource["endpoint"][idx % len(resource["endpoint"])]]) client.add_variant(
"var1", [resource["endpoint"][idx % len(resource["endpoint"])]], 50)
client.connect()
start = time.time() start = time.time()
for i in range(1000): for i in range(1000):
......
...@@ -43,7 +43,9 @@ def single_func(idx, resource): ...@@ -43,7 +43,9 @@ def single_func(idx, resource):
fetch = ["prob"] fetch = ["prob"]
client = Client() client = Client()
client.load_client_config(args.model) client.load_client_config(args.model)
client.connect([resource["endpoint"][idx % len(resource["endpoint"])]]) client.add_variant(
"var1", [resource["endpoint"][idx % len(resource["endpoint"])]], 50)
client.connect()
start = time.time() start = time.time()
for i in range(1000): for i in range(1000):
......
...@@ -23,7 +23,8 @@ from paddle_serving_client.metric import auc ...@@ -23,7 +23,8 @@ from paddle_serving_client.metric import auc
client = Client() client = Client()
client.load_client_config(sys.argv[1]) client.load_client_config(sys.argv[1])
client.connect(["127.0.0.1:9292"]) client.add_variant("var1", ["127.0.0.1:9292"], 50)
client.connect()
batch = 1 batch = 1
buf_size = 100 buf_size = 100
......
...@@ -30,7 +30,8 @@ args = benchmark_args() ...@@ -30,7 +30,8 @@ args = benchmark_args()
def single_func(idx, resource): def single_func(idx, resource):
client = Client() client = Client()
client.load_client_config('ctr_client_conf/serving_client_conf.prototxt') client.load_client_config('ctr_client_conf/serving_client_conf.prototxt')
client.connect(['127.0.0.1:9292']) client.add_variant("var1", ['127.0.0.1:9292'], 50)
client.connect()
batch = 1 batch = 1
buf_size = 100 buf_size = 100
dataset = criteo.CriteoDataset() dataset = criteo.CriteoDataset()
......
...@@ -31,7 +31,8 @@ def single_func(idx, resource): ...@@ -31,7 +31,8 @@ def single_func(idx, resource):
client = Client() client = Client()
print([resource["endpoint"][idx % len(resource["endpoint"])]]) print([resource["endpoint"][idx % len(resource["endpoint"])]])
client.load_client_config('ctr_client_conf/serving_client_conf.prototxt') client.load_client_config('ctr_client_conf/serving_client_conf.prototxt')
client.connect(['127.0.0.1:9292']) client.add_variant("var1", ['127.0.0.1:9292'], 50)
client.connect()
batch = 1 batch = 1
buf_size = 100 buf_size = 100
dataset = criteo.CriteoDataset() dataset = criteo.CriteoDataset()
......
...@@ -22,7 +22,8 @@ from paddle_serving_client.metric import auc ...@@ -22,7 +22,8 @@ from paddle_serving_client.metric import auc
client = Client() client = Client()
client.load_client_config(sys.argv[1]) client.load_client_config(sys.argv[1])
client.connect(["127.0.0.1:9292"]) client.add_variant("var1", ['127.0.0.1:9292'], 50)
client.connect()
batch = 1 batch = 1
buf_size = 100 buf_size = 100
......
...@@ -28,7 +28,8 @@ def single_func(idx, resource): ...@@ -28,7 +28,8 @@ def single_func(idx, resource):
if args.request == "rpc": if args.request == "rpc":
client = Client() client = Client()
client.load_client_config(args.model) client.load_client_config(args.model)
client.connect([args.endpoint]) client.add_variant("var1", [args.endpoint], 50)
client.connect()
train_reader = paddle.batch( train_reader = paddle.batch(
paddle.reader.shuffle( paddle.reader.shuffle(
paddle.dataset.uci_housing.train(), buf_size=500), paddle.dataset.uci_housing.train(), buf_size=500),
......
...@@ -28,6 +28,5 @@ test_reader = paddle.batch( ...@@ -28,6 +28,5 @@ test_reader = paddle.batch(
batch_size=1) batch_size=1)
for data in test_reader(): for data in test_reader():
[fetch_map, server_pid] = client.predict( fetch_map = client.predict(feed={"x": data[0][0]}, fetch=["price"])
feed={"x": data[0][0]}, fetch=["price"], need_server_pid=True) print("{} {}".format(fetch_map["price"][0], data[0][1][0]))
print("[{}] {} {}".format(server_pid, fetch_map["price"][0], data[0][1][0]))
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
# pylint: disable=doc-string-missing
import sys import sys
from image_reader import ImageReader from image_reader import ImageReader
...@@ -35,7 +36,9 @@ def single_func(idx, resource): ...@@ -35,7 +36,9 @@ def single_func(idx, resource):
fetch = ["score"] fetch = ["score"]
client = Client() client = Client()
client.load_client_config(args.model) client.load_client_config(args.model)
client.connect([resource["endpoint"][idx % len(resource["endpoint"])]]) client.add_variant(
"var1", [resource["endpoint"][idx % len(resource["endpoint"])]], 50)
client.connect()
start = time.time() start = time.time()
for i in range(1000): for i in range(1000):
......
...@@ -41,7 +41,9 @@ def single_func(idx, resource): ...@@ -41,7 +41,9 @@ def single_func(idx, resource):
fetch = ["score"] fetch = ["score"]
client = Client() client = Client()
client.load_client_config(args.model) client.load_client_config(args.model)
client.connect([resource["endpoint"][idx % len(resource["endpoint"])]]) client.add_variant(
"var1", [resource["endpoint"][idx % len(resource["endpoint"])]], 50)
client.connect()
start = time.time() start = time.time()
for i in range(1000): for i in range(1000):
if args.batch_size >= 1: if args.batch_size >= 1:
......
...@@ -19,7 +19,8 @@ import time ...@@ -19,7 +19,8 @@ import time
client = Client() client = Client()
client.load_client_config(sys.argv[1]) client.load_client_config(sys.argv[1])
client.connect(["127.0.0.1:9295"]) client.add_variant("var1", ["127.0.0.1:9295"], 50)
client.connect()
reader = ImageReader() reader = ImageReader()
start = time.time() start = time.time()
......
...@@ -35,7 +35,8 @@ def single_func(idx, resource): ...@@ -35,7 +35,8 @@ def single_func(idx, resource):
if args.request == "rpc": if args.request == "rpc":
client = Client() client = Client()
client.load_client_config(args.model) client.load_client_config(args.model)
client.connect([args.endpoint]) client.add_variant("var1", [args.endpoint], 50)
client.connect()
for i in range(1000): for i in range(1000):
if args.batch_size == 1: if args.batch_size == 1:
word_ids, label = imdb_dataset.get_words_and_label(line) word_ids, label = imdb_dataset.get_words_and_label(line)
......
...@@ -35,7 +35,8 @@ def single_func(idx, resource): ...@@ -35,7 +35,8 @@ def single_func(idx, resource):
if args.request == "rpc": if args.request == "rpc":
client = Client() client = Client()
client.load_client_config(args.model) client.load_client_config(args.model)
client.connect([args.endpoint]) client.add_variant("var1", [args.endpoint], 50)
client.connect()
for i in range(1000): for i in range(1000):
if args.batch_size >= 1: if args.batch_size >= 1:
feed_batch = [] feed_batch = []
......
...@@ -18,7 +18,8 @@ import sys ...@@ -18,7 +18,8 @@ import sys
client = Client() client = Client()
client.load_client_config(sys.argv[1]) client.load_client_config(sys.argv[1])
client.connect(["127.0.0.1:9292"]) client.add_variant("var1", ["127.0.0.1:9292"], 50)
client.connect()
# you can define any english sentence or dataset here # you can define any english sentence or dataset here
# This example reuses imdb reader in training, you # This example reuses imdb reader in training, you
......
...@@ -23,7 +23,8 @@ import time ...@@ -23,7 +23,8 @@ import time
def batch_predict(batch_size=4): def batch_predict(batch_size=4):
client = Client() client = Client()
client.load_client_config(conf_file) client.load_client_config(conf_file)
client.connect(["127.0.0.1:9292"]) client.add_variant("var1", ["127.0.0.1:9292"], 50)
client.connect()
fetch = ["acc", "cost", "prediction"] fetch = ["acc", "cost", "prediction"]
feed_batch = [] feed_batch = []
for line in sys.stdin: for line in sys.stdin:
......
...@@ -30,7 +30,8 @@ def single_func(idx, resource): ...@@ -30,7 +30,8 @@ def single_func(idx, resource):
if args.request == "rpc": if args.request == "rpc":
client = Client() client = Client()
client.load_client_config(args.model) client.load_client_config(args.model)
client.connect([args.endpoint]) client.add_variant("var1", [args.endpoint], 50)
client.connect()
fin = open("jieba_test.txt") fin = open("jieba_test.txt")
for line in fin: for line in fin:
feed_data = reader.process(line) feed_data = reader.process(line)
......
...@@ -22,7 +22,8 @@ import io ...@@ -22,7 +22,8 @@ import io
client = Client() client = Client()
client.load_client_config(sys.argv[1]) client.load_client_config(sys.argv[1])
client.connect(["127.0.0.1:9280"]) client.add_variant("var1", ["127.0.0.1:9280"], 50)
client.connect()
reader = LACReader(sys.argv[2]) reader = LACReader(sys.argv[2])
for line in sys.stdin: for line in sys.stdin:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册