Merge pull request #1113 from TeslaZhao/develop

fix bugs for importing cpu/gpu server in examples

python/examples/bert/bert_gpu_server.py

@@ -14,9 +14,9 @@
 
 import os
 import sys
-from paddle_serving_server_gpu import OpMaker
-from paddle_serving_server_gpu import OpSeqMaker
-from paddle_serving_server_gpu import Server
+from paddle_serving_server import OpMaker
+from paddle_serving_server import OpSeqMaker
+from paddle_serving_server import Server
 
 op_maker = OpMaker()
 read_op = op_maker.create('general_reader')

python/examples/bert/bert_web_service_gpu.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # pylint: disable=doc-string-missing
-from paddle_serving_server_gpu.web_service import WebService
+from paddle_serving_server.web_service import WebService
 from paddle_serving_app.reader import ChineseBertReader
 import sys
 import os

python/examples/detection/faster_rcnn_hrnetv2p_w18_1x/README.md

@@ -10,7 +10,7 @@ wget --no-check-certificate https://paddle-serving.bj.bcebos.com/pddet_demo/2.0/
 ### Start the service
 ```
 tar xf faster_rcnn_hrnetv2p_w18_1x.tar
-python -m paddle_serving_server_gpu.serve --model serving_server --port 9494 --gpu_ids 0
+python -m paddle_serving_server.serve --model serving_server --port 9494 --gpu_ids 0
 ```
 
 This model support TensorRT, if you want a faster inference, please use `--use_trt`. 

python/examples/detection/faster_rcnn_hrnetv2p_w18_1x/README_CN.md

@@ -11,7 +11,7 @@ wget --no-check-certificate https://paddle-serving.bj.bcebos.com/pddet_demo/2.0/
 ### 启动服务
 ```
 tar xf faster_rcnn_hrnetv2p_w18_1x.tar
-python -m paddle_serving_server_gpu.serve --model serving_server --port 9494 --gpu_ids 0
+python -m paddle_serving_server.serve --model serving_server --port 9494 --gpu_ids 0
 ```
 该模型支持TensorRT，如果想要更快的预测速度，可以开启`--use_trt`选项。
 

python/examples/detection/fcos_dcn_r50_fpn_1x_coco/README.md

@@ -10,7 +10,7 @@ wget --no-check-certificate https://paddle-serving.bj.bcebos.com/pddet_demo/2.0/
 ### Start the service
 ```
 tar xf fcos_dcn_r50_fpn_1x_coco.tar
-python -m paddle_serving_server_gpu.serve --model serving_server --port 9494 --gpu_ids 0
+python -m paddle_serving_server.serve --model serving_server --port 9494 --gpu_ids 0
 ```
 This model support TensorRT, if you want a faster inference, please use `--use_trt`.
 
@@ -18,4 +18,3 @@ This model support TensorRT, if you want a faster inference, please use `--use_t
 ```
 python test_client.py 000000570688.jpg
 ```
-

python/examples/detection/fcos_dcn_r50_fpn_1x_coco/README_CN.md

@@ -11,7 +11,7 @@ wget --no-check-certificate https://paddle-serving.bj.bcebos.com/pddet_demo/2.0/
 ### 启动服务
 ```
 tar xf fcos_dcn_r50_fpn_1x_coco.tar
-python -m paddle_serving_server_gpu.serve --model serving_server --port 9494 --gpu_ids 0
+python -m paddle_serving_server.serve --model serving_server --port 9494 --gpu_ids 0
 ```
 
 该模型支持TensorRT，如果想要更快的预测速度，可以开启`--use_trt`选项。
@@ -20,4 +20,3 @@ python -m paddle_serving_server_gpu.serve --model serving_server --port 9494 --g
 ```
 python test_client.py 000000570688.jpg
 ```
-

python/examples/detection/ssd_vgg16_300_240e_voc/README.md

@@ -10,7 +10,7 @@ wget --no-check-certificate https://paddle-serving.bj.bcebos.com/pddet_demo/2.0/
 ### Start the service
 ```
 tar xf ssd_vgg16_300_240e_voc.tar
-python -m paddle_serving_server_gpu.serve --model serving_server --port 9494 --gpu_ids 0
+python -m paddle_serving_server.serve --model serving_server --port 9494 --gpu_ids 0
 ```
 This model support TensorRT, if you want a faster inference, please use `--use_trt`.
 
@@ -18,4 +18,3 @@ This model support TensorRT, if you want a faster inference, please use `--use_t
 ```
 python test_client.py 000000570688.jpg
 ```
-

python/examples/detection/ssd_vgg16_300_240e_voc/README_CN.md

@@ -11,7 +11,7 @@ wget --no-check-certificate https://paddle-serving.bj.bcebos.com/pddet_demo/2.0/
 ### 启动服务
 ```
 tar xf ssd_vgg16_300_240e_voc.tar
-python -m paddle_serving_server_gpu.serve --model serving_server --port 9494 --gpu_ids 0
+python -m paddle_serving_server.serve --model serving_server --port 9494 --gpu_ids 0
 ```
 
 该模型支持TensorRT，如果想要更快的预测速度，可以开启`--use_trt`选项。
@@ -20,4 +20,3 @@ python -m paddle_serving_server_gpu.serve --model serving_server --port 9494 --g
 ```
 python test_client.py 000000570688.jpg
 ```
-

python/examples/fit_a_line/test_server.py

@@ -13,10 +13,7 @@
 # limitations under the License.
 # pylint: disable=doc-string-missing
 
-try:
-    from paddle_serving_server_gpu.web_service import WebService
-except ImportError:
-    from paddle_serving_server.web_service import WebService
+from paddle_serving_server.web_service import WebService
 import numpy as np
 
 

python/examples/grpc_impl_example/fit_a_line/test_server_gpu.py

@@ -15,9 +15,9 @@
 
 import os
 import sys
-from paddle_serving_server_gpu import OpMaker
-from paddle_serving_server_gpu import OpSeqMaker
-from paddle_serving_server_gpu import MultiLangServer as Server
+from paddle_serving_server import OpMaker
+from paddle_serving_server import OpSeqMaker
+from paddle_serving_server import MultiLangServer as Server
 
 op_maker = OpMaker()
 read_op = op_maker.create('general_reader')

python/examples/imagenet/resnet50_web_service.py

@@ -25,7 +25,7 @@ device = sys.argv[2]
 if device == "cpu":
     from paddle_serving_server.web_service import WebService
 else:
-    from paddle_serving_server_gpu.web_service import WebService
+    from paddle_serving_server.web_service import WebService
 
 
 class ImageService(WebService):

python/examples/imdb/text_classify_service.py

@@ -13,11 +13,7 @@
 # limitations under the License.
 # pylint: disable=doc-string-missing
 
-try:
-    from paddle_serving_server.web_service import WebService
-except ImportError:
-    from paddle_serving_server_gpu.web_service import WebService
-
+from paddle_serving_server.web_service import WebService
 from paddle_serving_app.reader.imdb_reader import IMDBDataset
 import sys
 import numpy as np

python/examples/lac/lac_web_service.py

@@ -12,10 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-try:
-    from paddle_serving_server.web_service import WebService
-except ImportError:
-    from paddle_serving_server_gpu.web_service import WebService
+from paddle_serving_server.web_service import WebService
 import sys
 from paddle_serving_app.reader import LACReader
 import numpy as np

python/examples/ocr/det_debugger_server.py

@@ -22,7 +22,7 @@ from paddle_serving_app.reader import Sequential, ResizeByFactor
 from paddle_serving_app.reader import Div, Normalize, Transpose
 from paddle_serving_app.reader import DBPostProcess, FilterBoxes
 if sys.argv[1] == 'gpu':
-    from paddle_serving_server_gpu.web_service import WebService
+    from paddle_serving_server.web_service import WebService
 elif sys.argv[1] == 'cpu':
     from paddle_serving_server.web_service import WebService
 import time

python/examples/ocr/det_web_server.py

@@ -22,7 +22,7 @@ from paddle_serving_app.reader import Sequential, ResizeByFactor
 from paddle_serving_app.reader import Div, Normalize, Transpose
 from paddle_serving_app.reader import DBPostProcess, FilterBoxes
 if sys.argv[1] == 'gpu':
-    from paddle_serving_server_gpu.web_service import WebService
+    from paddle_serving_server.web_service import WebService
 elif sys.argv[1] == 'cpu':
     from paddle_serving_server.web_service import WebService
 import time

python/examples/ocr/ocr_debugger_server.py

@@ -23,7 +23,7 @@ from paddle_serving_app.reader import Sequential, URL2Image, ResizeByFactor
 from paddle_serving_app.reader import Div, Normalize, Transpose
 from paddle_serving_app.reader import DBPostProcess, FilterBoxes, GetRotateCropImage, SortedBoxes
 if sys.argv[1] == 'gpu':
-    from paddle_serving_server_gpu.web_service import WebService
+    from paddle_serving_server.web_service import WebService
 elif sys.argv[1] == 'cpu':
     from paddle_serving_server.web_service import WebService
 from paddle_serving_app.local_predict import LocalPredictor

python/examples/ocr/rec_debugger_server.py

@@ -23,7 +23,7 @@ from paddle_serving_app.reader import Sequential, URL2Image, ResizeByFactor
 from paddle_serving_app.reader import Div, Normalize, Transpose
 from paddle_serving_app.reader import DBPostProcess, FilterBoxes, GetRotateCropImage, SortedBoxes
 if sys.argv[1] == 'gpu':
-    from paddle_serving_server_gpu.web_service import WebService
+    from paddle_serving_server.web_service import WebService
 elif sys.argv[1] == 'cpu':
     from paddle_serving_server.web_service import WebService
 import time

python/examples/ocr/rec_web_server.py

@@ -23,7 +23,7 @@ from paddle_serving_app.reader import Sequential, URL2Image, ResizeByFactor
 from paddle_serving_app.reader import Div, Normalize, Transpose
 from paddle_serving_app.reader import DBPostProcess, FilterBoxes, GetRotateCropImage, SortedBoxes
 if sys.argv[1] == 'gpu':
-    from paddle_serving_server_gpu.web_service import WebService
+    from paddle_serving_server.web_service import WebService
 elif sys.argv[1] == 'cpu':
     from paddle_serving_server.web_service import WebService
 import time

python/examples/pipeline/bert/pipeline_rpc_client.py

+# Copyright (c) 2021 PaddlePaddle Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 import sys
 import os
 import yaml
 import requests
 import time
 import json
-try:
-    from paddle_serving_server_gpu.pipeline import PipelineClient
-except ImportError:
-    from paddle_serving_server.pipeline import PipelineClient
+from paddle_serving_server.pipeline import PipelineClient
 import numpy as np
 
-
 client = PipelineClient()
 client.connect(['127.0.0.1:9998'])
 batch_size = 101
 with open("data-c.txt", 'r') as fin:
-     lines = fin.readlines()
-     start_idx = 0
-     while start_idx < len(lines):
-         end_idx = min(len(lines), start_idx + batch_size)
-         feed = {}
-         for i in range(start_idx, end_idx):
-             feed[str(i - start_idx)] = lines[i]
-         ret = client.predict(feed_dict=feed, fetch=["res"])
-         print(ret)
-         start_idx += batch_size
+    lines = fin.readlines()
+    start_idx = 0
+    while start_idx < len(lines):
+        end_idx = min(len(lines), start_idx + batch_size)
+        feed = {}
+        for i in range(start_idx, end_idx):
+            feed[str(i - start_idx)] = lines[i]
+        ret = client.predict(feed_dict=feed, fetch=["res"])
+        print(ret)
+        start_idx += batch_size

python/examples/pipeline/bert/web_service.py

@@ -11,10 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-try:
-    from paddle_serving_server_gpu.web_service import WebService, Op
-except ImportError:
-    from paddle_serving_server.web_service import WebService, Op
+from paddle_serving_server.web_service import WebService, Op
 import logging
 import numpy as np
 import sys

python/examples/pipeline/imagenet/resnet50_web_service.py

@@ -13,10 +13,7 @@
 # limitations under the License.
 import sys
 from paddle_serving_app.reader import Sequential, URL2Image, Resize, CenterCrop, RGB2BGR, Transpose, Div, Normalize, Base64ToImage
-try:
-    from paddle_serving_server.web_service import WebService, Op
-except ImportError:
-    from paddle_serving_server_gpu.web_service import WebService, Op
+from paddle_serving_server.web_service import WebService, Op
 import logging
 import numpy as np
 import base64, cv2

python/examples/pipeline/imdb_model_ensemble/test_pipeline_server.py

@@ -15,18 +15,11 @@
 import numpy as np
 from paddle_serving_app.reader.imdb_reader import IMDBDataset
 import logging
-try:
-    from paddle_serving_server.web_service import WebService
-    from paddle_serving_server.pipeline import Op, RequestOp, ResponseOp
-    from paddle_serving_server.pipeline import PipelineServer
-    from paddle_serving_server.pipeline.proto import pipeline_service_pb2
-    from paddle_serving_server.pipeline.channel import ChannelDataErrcode
-except ImportError:
-    from paddle_serving_server_gpu.web_service import WebService
-    from paddle_serving_server_gpu.pipeline import Op, RequestOp, ResponseOp
-    from paddle_serving_server_gpu.pipeline import PipelineServer
-    from paddle_serving_server_gpu.pipeline.proto import pipeline_service_pb2
-    from paddle_serving_server_gpu.pipeline.channel import ChannelDataErrcode
+from paddle_serving_server.web_service import WebService
+from paddle_serving_server.pipeline import Op, RequestOp, ResponseOp
+from paddle_serving_server.pipeline import PipelineServer
+from paddle_serving_server.pipeline.proto import pipeline_service_pb2
+from paddle_serving_server.pipeline.channel import ChannelDataErrcode
 
 _LOGGER = logging.getLogger()
 user_handler = logging.StreamHandler()

python/examples/pipeline/ocr/web_service.py

@@ -11,10 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-try:
-    from paddle_serving_server_gpu.web_service import WebService, Op
-except ImportError:
-    from paddle_serving_server.web_service import WebService, Op
+from paddle_serving_server.web_service import WebService, Op
 import logging
 import numpy as np
 import cv2

python/examples/pipeline/simple_web_service/web_service.py

@@ -11,10 +11,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-try:
-    from paddle_serving_server.web_service import WebService, Op
-except ImportError:
-    from paddle_serving_server_gpu.web_service import WebService, Op
+
+from paddle_serving_server.web_service import WebService, Op
 import logging
 import numpy as np
 import sys

python/examples/pipeline/simple_web_service/web_service_java.py

@@ -11,10 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-try:
-    from paddle_serving_server.web_service import WebService, Op
-except ImportError:
-    from paddle_serving_server_gpu.web_service import WebService, Op
+from paddle_serving_server.web_service import WebService, Op
 import logging
 import numpy as np
 from numpy import array

python/examples/senta/senta_web_service.py

@@ -16,11 +16,7 @@
 import os
 import sys
 import numpy as np
-try:
-    from paddle_serving_server.web_service import WebService
-except ImportError:
-    from paddle_serving_server_gpu.web_service import WebService
-
+from paddle_serving_server.web_service import WebService
 from paddle_serving_client import Client
 from paddle_serving_app.reader import LACReader, SentaReader
 

python/examples/xpu/fit_a_line_xpu/test_server.py

@@ -13,11 +13,7 @@
 # limitations under the License.
 # pylint: disable=doc-string-missing
 
-try:
-    from paddle_serving_server.web_service import WebService
-except ImportError:
-    from paddle_serving_server_gpu.web_service import WebService
-
+from paddle_serving_server.web_service import WebService
 import numpy as np