From 06ba0e8438951fc4d63c7ca8b1edb8a01e70498b Mon Sep 17 00:00:00 2001 From: wangjiawei04 Date: Tue, 3 Nov 2020 11:24:24 +0000 Subject: [PATCH] fix for iPipe2 --- python/examples/bert/bert_client.py | 3 --- python/examples/criteo_ctr/test_client.py | 5 +++-- python/examples/faster_rcnn_model/test_client.py | 2 +- python/examples/fit_a_line/test_client.py | 4 +--- python/examples/imdb/benchmark.py | 11 +++++++---- .../examples/pipeline/imdb_model_ensemble/config.yml | 10 +++++++++- python/examples/yolov4/test_client.py | 2 +- python/pipeline/operator.py | 5 ++--- 8 files changed, 24 insertions(+), 18 deletions(-) diff --git a/python/examples/bert/bert_client.py b/python/examples/bert/bert_client.py index a6471c7d..d0f8b0aa 100644 --- a/python/examples/bert/bert_client.py +++ b/python/examples/bert/bert_client.py @@ -34,7 +34,4 @@ for line in sys.stdin: feed_dict[key] = np.array(feed_dict[key]).reshape((128, 1)) #print(feed_dict) result = client.predict(feed=feed_dict, fetch=fetch) - print(result) -print(result) -print(result) print(result) diff --git a/python/examples/criteo_ctr/test_client.py b/python/examples/criteo_ctr/test_client.py index 2beac850..ecb2fc37 100644 --- a/python/examples/criteo_ctr/test_client.py +++ b/python/examples/criteo_ctr/test_client.py @@ -20,7 +20,7 @@ import os import time import criteo_reader as criteo from paddle_serving_client.metric import auc - +import numpy as np import sys py_version = sys.version_info[0] @@ -49,7 +49,8 @@ for ei in range(1000): data = reader().__next__() feed_dict = {} for i in range(1, 27): - feed_dict["sparse_{}".format(i - 1)] = data[0][i] + feed_dict["sparse_{}".format(i - 1)] = np.array(data[0][i]).reshape(-1) + feed_dict["sparse_{}.lod".format(i - 1)] = [0, len(data[0][i])] fetch_map = client.predict(feed=feed_dict, fetch=["prob"]) end = time.time() print(end - start) diff --git a/python/examples/faster_rcnn_model/test_client.py b/python/examples/faster_rcnn_model/test_client.py index ce577a3c..baa0be88 100755 --- a/python/examples/faster_rcnn_model/test_client.py +++ b/python/examples/faster_rcnn_model/test_client.py @@ -36,6 +36,6 @@ fetch_map = client.predict( "im_info": np.array(list(im.shape[1:]) + [1.0]), "im_shape": np.array(list(im.shape[1:]) + [1.0]) }, - fetch=["multiclass_nms"]) + fetch=["multiclass_nms"], batch=False) fetch_map["image"] = sys.argv[3] postprocess(fetch_map) diff --git a/python/examples/fit_a_line/test_client.py b/python/examples/fit_a_line/test_client.py index 985a6399..41a037de 100644 --- a/python/examples/fit_a_line/test_client.py +++ b/python/examples/fit_a_line/test_client.py @@ -28,10 +28,8 @@ test_reader = paddle.batch( for data in test_reader(): import numpy as np - new_data = np.zeros((2, 1, 13)).astype("float32") + new_data = np.zeros((1, 1, 13)).astype("float32") new_data[0] = data[0][0] - new_data[1] = data[0][0] - print(new_data) fetch_map = client.predict( feed={"x": new_data}, fetch=["price"], batch=True) print("{} {}".format(fetch_map["price"][0], data[0][1][0])) diff --git a/python/examples/imdb/benchmark.py b/python/examples/imdb/benchmark.py index d226efbf..87e7bd22 100644 --- a/python/examples/imdb/benchmark.py +++ b/python/examples/imdb/benchmark.py @@ -17,6 +17,7 @@ import os import sys import time import requests +import numpy as np from paddle_serving_app.reader import IMDBDataset from paddle_serving_client import Client from paddle_serving_client.utils import MultiThreadRunner @@ -47,11 +48,13 @@ def single_func(idx, resource): for i in range(1000): if args.batch_size >= 1: feed_batch = [] + feed = {"words": [], "words.lod":[0]} for bi in range(args.batch_size): - word_ids, label = imdb_dataset.get_words_and_label(dataset[ - bi]) - feed_batch.append({"words": word_ids}) - result = client.predict(feed=feed_batch, fetch=["prediction"]) + word_ids, label = imdb_dataset.get_words_and_label(dataset[bi]) + feed["words.lod"].append(feed["words.lod"][-1] + len(word_ids)) + feed["words"].extend(word_ids) + feed["words"] = np.array(feed["words"]).reshape(len(feed["words"]), 1) + result = client.predict(feed=feed, fetch=["prediction"], batch=True) if result is None: raise ("predict failed.") else: diff --git a/python/examples/pipeline/imdb_model_ensemble/config.yml b/python/examples/pipeline/imdb_model_ensemble/config.yml index a89f171f..0853033f 100644 --- a/python/examples/pipeline/imdb_model_ensemble/config.yml +++ b/python/examples/pipeline/imdb_model_ensemble/config.yml @@ -10,5 +10,13 @@ op: concurrency: 2 remote_service_conf: client_type: brpc - model_config: ocr_det_model + model_config: imdb_bow_model devices: "" + rpc_port : 9393 + cnn: + concurrency: 2 + remote_service_conf: + client_type: brpc + model_config: imdb_cnn_model + devices: "" + rpc_port : 9292 diff --git a/python/examples/yolov4/test_client.py b/python/examples/yolov4/test_client.py index 2616e557..8356a168 100644 --- a/python/examples/yolov4/test_client.py +++ b/python/examples/yolov4/test_client.py @@ -35,6 +35,6 @@ fetch_map = client.predict( "image": im, "im_size": np.array(list(im.shape[1:])), }, - fetch=["save_infer_model/scale_0.tmp_0"]) + fetch=["save_infer_model/scale_0.tmp_0"], batch=False) fetch_map["image"] = sys.argv[1] postprocess(fetch_map) diff --git a/python/pipeline/operator.py b/python/pipeline/operator.py index 866150dc..3af58a84 100644 --- a/python/pipeline/operator.py +++ b/python/pipeline/operator.py @@ -835,8 +835,7 @@ class Op(object): self.concurrency_idx = None # init client self.client = self.init_client(self._client_config, - self._server_endpoints, - self._fetch_names) + self._server_endpoints) # user defined self.init_op() self._succ_init_op = True @@ -845,7 +844,7 @@ class Op(object): self.concurrency_idx = concurrency_idx # init client self.client = self.init_client( - self._client_config, self._server_endpoints, self._fetch_names) + self._client_config, self._server_endpoints) # user defined self.init_op() -- GitLab