From 1b7f60100818d402ba50924bf12a65bee4e5d96d Mon Sep 17 00:00:00 2001 From: wangjiawei04 Date: Wed, 2 Dec 2020 11:48:29 +0000 Subject: [PATCH] fix some bugs --- python/examples/bert/bert_client.py | 2 +- python/examples/bert/bert_web_service.py | 2 +- python/examples/imagenet/resnet50_web_service.py | 5 +++-- python/examples/imdb/text_classify_service.py | 3 ++- python/setup.py.app.in | 4 ++-- requirements.txt | 5 +++++ doc/requirements.txt => requirements_win.txt | 3 ++- 7 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 requirements.txt rename doc/requirements.txt => requirements_win.txt (58%) diff --git a/python/examples/bert/bert_client.py b/python/examples/bert/bert_client.py index b378f9f7..4111589b 100644 --- a/python/examples/bert/bert_client.py +++ b/python/examples/bert/bert_client.py @@ -33,5 +33,5 @@ for line in sys.stdin: for key in feed_dict.keys(): feed_dict[key] = np.array(feed_dict[key]).reshape((128, 1)) #print(feed_dict) - result = client.predict(feed=feed_dict, fetch=fetch, batch=True) + result = client.predict(feed=feed_dict, fetch=fetch, batch=False) print(result) diff --git a/python/examples/bert/bert_web_service.py b/python/examples/bert/bert_web_service.py index e1260dd1..7cd34fb9 100644 --- a/python/examples/bert/bert_web_service.py +++ b/python/examples/bert/bert_web_service.py @@ -29,7 +29,7 @@ class BertService(WebService): def preprocess(self, feed=[], fetch=[]): feed_res = [] - is_batch = True + is_batch = False for ins in feed: feed_dict = self.reader.process(ins["words"].encode("utf-8")) for key in feed_dict.keys(): diff --git a/python/examples/imagenet/resnet50_web_service.py b/python/examples/imagenet/resnet50_web_service.py index 4c982275..70331037 100644 --- a/python/examples/imagenet/resnet50_web_service.py +++ b/python/examples/imagenet/resnet50_web_service.py @@ -13,7 +13,7 @@ # limitations under the License. import sys from paddle_serving_client import Client - +import numpy as np from paddle_serving_app.reader import Sequential, URL2Image, Resize, CenterCrop, RGB2BGR, Transpose, Div, Normalize, Base64ToImage if len(sys.argv) != 4: @@ -44,12 +44,13 @@ class ImageService(WebService): def preprocess(self, feed=[], fetch=[]): feed_batch = [] + is_batch = True for ins in feed: if "image" not in ins: raise ("feed data error!") img = self.seq(ins["image"]) feed_batch.append({"image": img[np.newaxis, :]}) - return feed_batch, fetch + return feed_batch, fetch, is_batch def postprocess(self, feed=[], fetch=[], fetch_map={}): score_list = fetch_map["score"] diff --git a/python/examples/imdb/text_classify_service.py b/python/examples/imdb/text_classify_service.py index 1d292194..ca1e2600 100755 --- a/python/examples/imdb/text_classify_service.py +++ b/python/examples/imdb/text_classify_service.py @@ -29,13 +29,14 @@ class IMDBService(WebService): def preprocess(self, feed={}, fetch=[]): feed_batch = [] words_lod = [0] + is_batch = True for ins in feed: words = self.dataset.get_words_only(ins["words"]) words = np.array(words).reshape(len(words), 1) words_lod.append(words_lod[-1] + len(words)) feed_batch.append(words) feed = {"words": np.concatenate(feed_batch), "words.lod": words_lod} - return feed, fetch + return feed, fetch, is_batch imdb_service = IMDBService(name="imdb") diff --git a/python/setup.py.app.in b/python/setup.py.app.in index 1a06b0d3..8480ed84 100644 --- a/python/setup.py.app.in +++ b/python/setup.py.app.in @@ -32,8 +32,8 @@ if '${PACK}' == 'ON': REQUIRED_PACKAGES = [ - 'six >= 1.10.0', 'sentencepiece', 'opencv-python<=4.2.0.32', 'pillow', - 'shapely<=1.6.1', 'pyclipper' + 'six >= 1.10.0', 'sentencepiece<=0.1.92', 'opencv-python<=4.2.0.32', 'pillow', + 'pyclipper' ] packages=['paddle_serving_app', diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..a1eb26e5 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,5 @@ +sphinx==2.1.0 +mistune +sphinx_rtd_theme +paddlepaddle>=1.8.4 +shapely<=1.6.1 diff --git a/doc/requirements.txt b/requirements_win.txt similarity index 58% rename from doc/requirements.txt rename to requirements_win.txt index 1560ebc5..a202642a 100644 --- a/doc/requirements.txt +++ b/requirements_win.txt @@ -1,4 +1,5 @@ sphinx==2.1.0 mistune sphinx_rtd_theme -paddlepaddle>=1.6 +paddlepaddle>=1.8.4 +shapely -- GitLab