Merge pull request #1025 from littletomatodonkey/dev/fix_hb_export

fix export python path

deploy/hubserving/ocr_det/module.py

@@ -3,11 +3,14 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import os
+import sys
+sys.path.insert(0, ".")
+
 import argparse
 import ast
 import copy
 import math
-import os
 import time
 
 from paddle.fluid.core import AnalysisConfig, create_paddle_predictor, PaddleTensor
@@ -67,9 +70,7 @@ class OCRDet(hub.Module):
             images.append(img)
         return images
 
-    def predict(self,
-                images=[],
-                paths=[]):
+    def predict(self, images=[], paths=[]):
         """
         Get the text box in the predicted images.
         Args:
@@ -99,11 +100,9 @@ class OCRDet(hub.Module):
 
             rec_res_final = []
             for dno in range(len(dt_boxes)):
-                rec_res_final.append(
-                    {
+                rec_res_final.append({
                     'text_region': dt_boxes[dno].astype(np.int).tolist()
-                    }
-                )
+                })
             all_results.append(rec_res_final)
         return all_results
 

deploy/hubserving/ocr_rec/module.py

@@ -3,11 +3,14 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import os
+import sys
+sys.path.insert(0, ".")
+
 import argparse
 import ast
 import copy
 import math
-import os
 import time
 
 from paddle.fluid.core import AnalysisConfig, create_paddle_predictor, PaddleTensor
@@ -67,9 +70,7 @@ class OCRRec(hub.Module):
             images.append(img)
         return images
 
-    def predict(self,
-                images=[],
-                paths=[]):
+    def predict(self, images=[], paths=[]):
         """
         Get the text box in the predicted images.
         Args:
@@ -99,19 +100,16 @@ class OCRRec(hub.Module):
             rec_res, predict_time = self.text_recognizer(img_list)
             for dno in range(len(rec_res)):
                 text, score = rec_res[dno]
-                rec_res_final.append(
-                    {
+                rec_res_final.append({
                     'text': text,
                     'confidence': float(score),
-                    }
-                )
+                })
         except Exception as e:
             print(e)
             return [[]]
 
         return [rec_res_final]
 
-
     @serving
     def serving_method(self, images, **kwargs):
         """

deploy/hubserving/ocr_system/module.py

@@ -3,11 +3,14 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+import os
+import sys
+sys.path.insert(0, ".")
+
 import argparse
 import ast
 import copy
 import math
-import os
 import time
 
 from paddle.fluid.core import AnalysisConfig, create_paddle_predictor, PaddleTensor
@@ -67,9 +70,7 @@ class OCRSystem(hub.Module):
             images.append(img)
         return images
 
-    def predict(self,
-                       images=[],
-                       paths=[]):
+    def predict(self, images=[], paths=[]):
         """
         Get the chinese texts in the predicted images.
         Args:
@@ -104,13 +105,11 @@ class OCRSystem(hub.Module):
 
             for dno in range(dt_num):
                 text, score = rec_res[dno]
-                rec_res_final.append(
-                    {
+                rec_res_final.append({
                     'text': text,
                     'confidence': float(score),
                     'text_region': dt_boxes[dno].astype(np.int).tolist()
-                    }
-                )
+                })
             all_results.append(rec_res_final)
         return all_results
 

deploy/hubserving/readme.md

@@ -29,12 +29,6 @@ deploy/hubserving/ocr_system/
 ```shell
 # 安装paddlehub  
 pip3 install paddlehub --upgrade -i https://pypi.tuna.tsinghua.edu.cn/simple
-
-# 在Linux下设置环境变量
-export PYTHONPATH=.
-
-# 或者，在Windows下设置环境变量
-SET PYTHONPATH=.
 ```
 
 ### 2. 下载推理模型

deploy/hubserving/readme_en.md

@@ -30,12 +30,6 @@ The following steps take the 2-stage series service as an example. If only the d
 ```shell
 # Install paddlehub  
 pip3 install paddlehub --upgrade -i https://pypi.tuna.tsinghua.edu.cn/simple
-
-# Set environment variables on Linux
-export PYTHONPATH=.
-
-# Set environment variables on Windows
-SET PYTHONPATH=.
 ```
 
 ### 2. Download inference model