diff --git a/doc/ABTEST_IN_PADDLE_SERVING.md b/doc/ABTEST_IN_PADDLE_SERVING.md index 412d79a2341453bab9d6b6b2262b8d3be3d1d199..3ae23504bff2621c9a814a3ac15e5157626f8999 100644 --- a/doc/ABTEST_IN_PADDLE_SERVING.md +++ b/doc/ABTEST_IN_PADDLE_SERVING.md @@ -21,7 +21,7 @@ The following Python code will process the data `test_data/part-0` and write to [//file]:#process.py ``` python -from imdb_reader import IMDBDataset +from paddle_serving_app.reader import IMDBDataset imdb_dataset = IMDBDataset() imdb_dataset.load_resource('imdb.vocab') @@ -78,7 +78,7 @@ with open('processed.data') as f: feed = {"words": word_ids} fetch = ["acc", "cost", "prediction"] [fetch_map, tag] = client.predict(feed=feed, fetch=fetch, need_variant_tag=True) - if (float(fetch_map["prediction"][1]) - 0.5) * (float(label[0]) - 0.5) > 0: + if (float(fetch_map["prediction"][0][1]) - 0.5) * (float(label[0]) - 0.5) > 0: cnt[tag]['acc'] += 1 cnt[tag]['total'] += 1 diff --git a/doc/ABTEST_IN_PADDLE_SERVING_CN.md b/doc/ABTEST_IN_PADDLE_SERVING_CN.md index 7ba4e5d7dbe643d87fc15e783afea2955b98fa1e..43bb702bd8b0317d7449313c0e1362953ed87744 100644 --- a/doc/ABTEST_IN_PADDLE_SERVING_CN.md +++ b/doc/ABTEST_IN_PADDLE_SERVING_CN.md @@ -20,7 +20,7 @@ sh get_data.sh 下面Python代码将处理`test_data/part-0`的数据，写入`processed.data`文件中。 ```python -from imdb_reader import IMDBDataset +from paddle_serving_app.reader import IMDBDataset imdb_dataset = IMDBDataset() imdb_dataset.load_resource('imdb.vocab') @@ -76,7 +76,7 @@ with open('processed.data') as f: feed = {"words": word_ids} fetch = ["acc", "cost", "prediction"] [fetch_map, tag] = client.predict(feed=feed, fetch=fetch, need_variant_tag=True) - if (float(fetch_map["prediction"][1]) - 0.5) * (float(label[0]) - 0.5) > 0: + if (float(fetch_map["prediction"][0][1]) - 0.5) * (float(label[0]) - 0.5) > 0: cnt[tag]['acc'] += 1 cnt[tag]['total'] += 1 diff --git a/python/examples/lac/lac_web_service.py b/python/examples/lac/lac_web_service.py index 9b1c6693b52393aee1294b521fe30fb1a9fd0d79..bed89f54b626c0cce55767f8edacc3dd33f0104c 100644 --- a/python/examples/lac/lac_web_service.py +++ b/python/examples/lac/lac_web_service.py @@ -19,7 +19,7 @@ from paddle_serving_app.reader import LACReader class LACService(WebService): def load_reader(self): - self.reader = LACReader("lac_dict") + self.reader = LACReader() def preprocess(self, feed={}, fetch=[]): feed_batch = [] diff --git a/python/examples/resnet_v2_50/resnet50_v2_tutorial.py b/python/examples/resnet_v2_50/resnet50_v2_tutorial.py index 8d916cbd8145cdc73424a05fdb2855412f4d4fe2..b249d2a6df85f87258f66c96aaa779eb2e299613 100644 --- a/python/examples/resnet_v2_50/resnet50_v2_tutorial.py +++ b/python/examples/resnet_v2_50/resnet50_v2_tutorial.py @@ -14,7 +14,7 @@ from paddle_serving_client import Client from paddle_serving_app.reader import Sequential, File2Image, Resize, CenterCrop -from apddle_serving_app.reader import RGB2BGR, Transpose, Div, Normalize +from paddle_serving_app.reader import RGB2BGR, Transpose, Div, Normalize client = Client() client.load_client_config( @@ -28,5 +28,5 @@ seq = Sequential([ image_file = "daisy.jpg" img = seq(image_file) -fetch_map = client.predict(feed={"image": img}, fetch=["feature_map"]) -print(fetch_map["feature_map"].reshape(-1)) +fetch_map = client.predict(feed={"image": img}, fetch=["score"]) +print(fetch_map["score"].reshape(-1)) diff --git a/python/examples/unet_for_image_seg/seg_client.py b/python/examples/unet_for_image_seg/seg_client.py index 9e76b060955ec74492312c8896efaf3946a3f7ab..44f634b6090159ee1bd37c176eebb7d2b7f37065 100644 --- a/python/examples/unet_for_image_seg/seg_client.py +++ b/python/examples/unet_for_image_seg/seg_client.py @@ -27,7 +27,8 @@ preprocess = Sequential( postprocess = SegPostprocess(2) -im = preprocess("N0060.jpg") +filename = "N0060.jpg" +im = preprocess(filename) fetch_map = client.predict(feed={"image": im}, fetch=["output"]) fetch_map["filename"] = filename postprocess(fetch_map) diff --git a/python/paddle_serving_app/README_CN.md b/python/paddle_serving_app/README_CN.md index f3fa8de1cf6aff39f460510209cb03d628fcbfbe..181037c55a2aae578cb189525030ccba87146f6e 100644 --- a/python/paddle_serving_app/README_CN.md +++ b/python/paddle_serving_app/README_CN.md @@ -28,7 +28,7 @@ paddle_serving_app中内置了11种预训练模型，涵盖了6种预测任务 | 语义理解 | 'ernie' | | 中文分词 | 'lac' | | 图像检测 | 'faster_rcnn' | -| 图像分割 | 'unet', 'deeplabv3' | +| 图像分割 | 'unet', 'deeplabv3', 'deeplabv3+cityscapes' | | 图像分类 | 'resnet_v2_50_imagenet', 'mobilenet_v2_imagenet' | ## 数据预处理API diff --git a/python/setup.py.server.in b/python/setup.py.server.in index 97f02078806b20f41e917e0c385983a767a4df8c..a7190ecf36c194e7d486f96e1bf8e219a7600dba 100644 --- a/python/setup.py.server.in +++ b/python/setup.py.server.in @@ -38,12 +38,9 @@ max_version, mid_version, min_version = python_version() REQUIRED_PACKAGES = [ 'six >= 1.10.0', 'protobuf >= 3.1.0', - 'paddle_serving_client', 'flask >= 1.1.1' + 'paddle_serving_client', 'flask >= 1.1.1', 'paddle_serving_app' ] -if not find_package("paddlepaddle") and not find_package("paddlepaddle-gpu"): - REQUIRED_PACKAGES.append("paddlepaddle") - packages=['paddle_serving_server', 'paddle_serving_server.proto'] diff --git a/python/setup.py.server_gpu.in b/python/setup.py.server_gpu.in index 6a651053391b30afb71996c5073d21a5620d3320..90db7addbcd8b1929342a893c8213a48f3c8e9e3 100644 --- a/python/setup.py.server_gpu.in +++ b/python/setup.py.server_gpu.in @@ -38,11 +38,9 @@ max_version, mid_version, min_version = python_version() REQUIRED_PACKAGES = [ 'six >= 1.10.0', 'protobuf >= 3.1.0', - 'paddle_serving_client', 'flask >= 1.1.1' + 'paddle_serving_client', 'flask >= 1.1.1', 'paddle_serving_app' ] -if not find_package("paddlepaddle") and not find_package("paddlepaddle-gpu"): - REQUIRED_PACKAGES.append("paddlepaddle") packages=['paddle_serving_server_gpu', 'paddle_serving_server_gpu.proto']