Merge pull request #837 from MRXLT/release/0.3

[cherry pick] to release 0.3
PaddlePaddle · Sep 14, 2020 · 48f7e4f · 48f7e4f
2 parents 633a771 + 4f14b18
commit 48f7e4f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/python/examples/blazeface/test_client.py b/python/examples/blazeface/test_client.py
@@ -16,6 +16,7 @@
 from paddle_serving_app.reader import *
 import sys
 import numpy as np
+from paddle_serving_app.reader import BlazeFacePostprocess
 
 preprocess = Sequential([
     File2Image(),

diff --git a/python/examples/imagenet/resnet50_web_service.py b/python/examples/imagenet/resnet50_web_service.py
@@ -30,7 +30,7 @@
 class ImageService(WebService):
     def init_imagenet_setting(self):
         self.seq = Sequential([
-            Base64ToImage(), Resize(256), CenterCrop(224), RGB2BGR(), Transpose(
+            URL2Image(), Resize(256), CenterCrop(224), RGB2BGR(), Transpose(
                 (2, 0, 1)), Div(255), Normalize([0.485, 0.456, 0.406],
                                                 [0.229, 0.224, 0.225], True)
         ])

diff --git a/python/paddle_serving_app/reader/__init__.py b/python/paddle_serving_app/reader/__init__.py
@@ -14,7 +14,7 @@
 from .chinese_bert_reader import ChineseBertReader
 from .image_reader import ImageReader, File2Image, URL2Image, Sequential, Normalize, Base64ToImage
 from .image_reader import CenterCrop, Resize, Transpose, Div, RGB2BGR, BGR2RGB, ResizeByFactor
-from .image_reader import RCNNPostprocess, SegPostprocess, PadStride
+from .image_reader import RCNNPostprocess, SegPostprocess, PadStride, BlazeFacePostprocess
 from .image_reader import DBPostProcess, FilterBoxes, GetRotateCropImage, SortedBoxes
 from .lac_reader import LACReader
 from .senta_reader import SentaReader

diff --git a/python/paddle_serving_server_gpu/web_service.py b/python/paddle_serving_server_gpu/web_service.py
@@ -221,6 +221,6 @@ def preprocess(self, feed=[], fetch=[]):
         return feed, fetch
 
     def postprocess(self, feed=[], fetch=[], fetch_map=None):
-        for key in fetch_map.iterkeys():
+        for key in fetch_map:
             fetch_map[key] = fetch_map[key].tolist()
         return fetch_map