未验证 提交 7c4482e9 编写于 作者: D Dong Daxiang 提交者: GitHub

Merge pull request #629 from MRXLT/0.3.0-bug-fix

0.3.0 bug fix
...@@ -21,7 +21,7 @@ The following Python code will process the data `test_data/part-0` and write to ...@@ -21,7 +21,7 @@ The following Python code will process the data `test_data/part-0` and write to
[//file]:#process.py [//file]:#process.py
``` python ``` python
from imdb_reader import IMDBDataset from paddle_serving_app.reader import IMDBDataset
imdb_dataset = IMDBDataset() imdb_dataset = IMDBDataset()
imdb_dataset.load_resource('imdb.vocab') imdb_dataset.load_resource('imdb.vocab')
...@@ -78,7 +78,7 @@ with open('processed.data') as f: ...@@ -78,7 +78,7 @@ with open('processed.data') as f:
feed = {"words": word_ids} feed = {"words": word_ids}
fetch = ["acc", "cost", "prediction"] fetch = ["acc", "cost", "prediction"]
[fetch_map, tag] = client.predict(feed=feed, fetch=fetch, need_variant_tag=True) [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]['acc'] += 1
cnt[tag]['total'] += 1 cnt[tag]['total'] += 1
......
...@@ -20,7 +20,7 @@ sh get_data.sh ...@@ -20,7 +20,7 @@ sh get_data.sh
下面Python代码将处理`test_data/part-0`的数据,写入`processed.data`文件中。 下面Python代码将处理`test_data/part-0`的数据,写入`processed.data`文件中。
```python ```python
from imdb_reader import IMDBDataset from paddle_serving_app.reader import IMDBDataset
imdb_dataset = IMDBDataset() imdb_dataset = IMDBDataset()
imdb_dataset.load_resource('imdb.vocab') imdb_dataset.load_resource('imdb.vocab')
...@@ -76,7 +76,7 @@ with open('processed.data') as f: ...@@ -76,7 +76,7 @@ with open('processed.data') as f:
feed = {"words": word_ids} feed = {"words": word_ids}
fetch = ["acc", "cost", "prediction"] fetch = ["acc", "cost", "prediction"]
[fetch_map, tag] = client.predict(feed=feed, fetch=fetch, need_variant_tag=True) [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]['acc'] += 1
cnt[tag]['total'] += 1 cnt[tag]['total'] += 1
......
...@@ -19,7 +19,7 @@ from paddle_serving_app.reader import LACReader ...@@ -19,7 +19,7 @@ from paddle_serving_app.reader import LACReader
class LACService(WebService): class LACService(WebService):
def load_reader(self): def load_reader(self):
self.reader = LACReader("lac_dict") self.reader = LACReader()
def preprocess(self, feed={}, fetch=[]): def preprocess(self, feed={}, fetch=[]):
feed_batch = [] feed_batch = []
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
from paddle_serving_client import Client from paddle_serving_client import Client
from paddle_serving_app.reader import Sequential, File2Image, Resize, CenterCrop 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 = Client()
client.load_client_config( client.load_client_config(
...@@ -28,5 +28,5 @@ seq = Sequential([ ...@@ -28,5 +28,5 @@ seq = Sequential([
image_file = "daisy.jpg" image_file = "daisy.jpg"
img = seq(image_file) img = seq(image_file)
fetch_map = client.predict(feed={"image": img}, fetch=["feature_map"]) fetch_map = client.predict(feed={"image": img}, fetch=["score"])
print(fetch_map["feature_map"].reshape(-1)) print(fetch_map["score"].reshape(-1))
...@@ -27,7 +27,8 @@ preprocess = Sequential( ...@@ -27,7 +27,8 @@ preprocess = Sequential(
postprocess = SegPostprocess(2) postprocess = SegPostprocess(2)
im = preprocess("N0060.jpg") filename = "N0060.jpg"
im = preprocess(filename)
fetch_map = client.predict(feed={"image": im}, fetch=["output"]) fetch_map = client.predict(feed={"image": im}, fetch=["output"])
fetch_map["filename"] = filename fetch_map["filename"] = filename
postprocess(fetch_map) postprocess(fetch_map)
...@@ -28,7 +28,7 @@ paddle_serving_app中内置了11种预训练模型,涵盖了6种预测任务 ...@@ -28,7 +28,7 @@ paddle_serving_app中内置了11种预训练模型,涵盖了6种预测任务
| 语义理解 | 'ernie' | | 语义理解 | 'ernie' |
| 中文分词 | 'lac' | | 中文分词 | 'lac' |
| 图像检测 | 'faster_rcnn' | | 图像检测 | 'faster_rcnn' |
| 图像分割 | 'unet', 'deeplabv3' | | 图像分割 | 'unet', 'deeplabv3', 'deeplabv3+cityscapes' |
| 图像分类 | 'resnet_v2_50_imagenet', 'mobilenet_v2_imagenet' | | 图像分类 | 'resnet_v2_50_imagenet', 'mobilenet_v2_imagenet' |
## 数据预处理API ## 数据预处理API
......
...@@ -38,12 +38,9 @@ max_version, mid_version, min_version = python_version() ...@@ -38,12 +38,9 @@ max_version, mid_version, min_version = python_version()
REQUIRED_PACKAGES = [ REQUIRED_PACKAGES = [
'six >= 1.10.0', 'protobuf >= 3.1.0', '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', packages=['paddle_serving_server',
'paddle_serving_server.proto'] 'paddle_serving_server.proto']
......
...@@ -38,11 +38,9 @@ max_version, mid_version, min_version = python_version() ...@@ -38,11 +38,9 @@ max_version, mid_version, min_version = python_version()
REQUIRED_PACKAGES = [ REQUIRED_PACKAGES = [
'six >= 1.10.0', 'protobuf >= 3.1.0', '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', packages=['paddle_serving_server_gpu',
'paddle_serving_server_gpu.proto'] 'paddle_serving_server_gpu.proto']
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册