Merge pull request #836 from MRXLT/0.3.2-qa

0.3.2 bug fix

cmake/paddlepaddle.cmake

@@ -31,7 +31,7 @@ message( "WITH_GPU = ${WITH_GPU}")
 # Paddle Version should be one of:
 # latest: latest develop build
 # version number like 1.5.2
-SET(PADDLE_VERSION "1.7.2")
+SET(PADDLE_VERSION "1.8.4")
 
 if (WITH_GPU)
     SET(PADDLE_LIB_VERSION "${PADDLE_VERSION}-gpu-cuda${CUDA_VERSION_MAJOR}-cudnn7-avx-mkl")

python/examples/blazeface/test_client.py

@@ -16,6 +16,7 @@ from paddle_serving_client import Client
 from paddle_serving_app.reader import *
 import sys
 import numpy as np
+from paddle_serving_app.reader import BlazeFacePostprocess
 
 preprocess = Sequential([
     File2Image(),

python/examples/imagenet/resnet50_web_service.py

@@ -30,7 +30,7 @@ else:
 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)
         ])

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

python/paddle_serving_app/reader/image_reader.py

@@ -317,7 +317,7 @@ class RCNNPostprocess(object):
                             self.clip_bbox([xmin, ymin, xmax, ymax])
                         w = xmax - xmin
                         h = ymax - ymin
-                        im_shape = t['im_shape'][0][i].tolist()
+                        im_shape = t['im_shape'].tolist()
                         im_height, im_width = int(im_shape[0]), int(im_shape[1])
                         xmin *= im_width
                         ymin *= im_height
@@ -420,7 +420,7 @@ class RCNNPostprocess(object):
         for key in image_with_bbox:
             if key == "image":
                 continue
-            if ".lod" in key:
+            if ".lod" in key or "im_shape" in key:
                 continue
             fetch_name = key
         bbox_result = self._get_bbox_result(image_with_bbox, fetch_name,