From 612a84246c488012f7ff1304425cc35211a0c279 Mon Sep 17 00:00:00 2001
From: BohaoWu <37072443+BohaoWu@users.noreply.github.com>
Date: Tue, 1 Dec 2020 16:58:09 +0800
Subject: [PATCH] Addjust set.

---
 python/paddle_serving_app/reader/__init__.py | 15 +++++++++++----
 python/setup.py.app.in                       |  1 -
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/python/paddle_serving_app/reader/__init__.py b/python/paddle_serving_app/reader/__init__.py
index 2f8c44ee..d0b71086 100644
--- a/python/paddle_serving_app/reader/__init__.py
+++ b/python/paddle_serving_app/reader/__init__.py
@@ -12,14 +12,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # pylint: disable=doc-string-missing
+import os
+
 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, BlazeFacePostprocess
 from .image_reader import DBPostProcess, FilterBoxes, GetRotateCropImage, SortedBoxes
 from .lac_reader import LACReader
 from .senta_reader import SentaReader
 from .imdb_reader import IMDBDataset
 from .ocr_reader import OCRReader
-from libgpupreprocess import Image2Gpubuffer, Gpubuffer2Image, RGB2BGR, BGR2RGB
-from libgpupreprocess import Div, Sub, Normalize, CenterCrop, Resize, ResizeByFactor
+
+if os.path.exists('libgpupreprocess.so'):
+    from libgpupreprocess import Image2Gpubuffer, Gpubuffer2Image, RGB2BGR, BGR2RGB
+    from libgpupreprocess import Div, Sub, Normalize, CenterCrop, Resize, ResizeByFactor
+else:
+    from .image_reader import ImageReader, File2Image, URL2Image
+    from .image_reader import Sequential, Normalize, Base64ToImage
+    from .image_reader import CenterCrop, Resize, Transpose, Div
+    from .image_reader import RGB2BGR, BGR2RGB, ResizeByFactor
diff --git a/python/setup.py.app.in b/python/setup.py.app.in
index 02d500e5..a90f7517 100644
--- a/python/setup.py.app.in
+++ b/python/setup.py.app.in
@@ -41,7 +41,6 @@ if '${PACK}' == 'ON':
     copy_lib()
 
 if os.path.exists('../core/preprocess/hwvideoframe/libgpupreprocess.so'):
-    print("新建目录")
     os.system('mkdir -p ./paddle_serving_app/reader/lib')
     os.system('cp ../core/preprocess/hwvideoframe/libgpupreprocess.so ./paddle_serving_app/reader')
     os.system('cp ../core/preprocess/hwvideoframe/cuda/libgpu.so ./paddle_serving_app/reader/lib')
-- 
GitLab