update ssd_mobilenet_v1_pascal (#1955)

* update ssd_mobilenet_v1_pascal

* update gpu config

* update

* add clean func

* update save inference model

modules/image/object_detection/ssd_mobilenet_v1_pascal/README.md

@@ -102,19 +102,13 @@
         - save\_path (str, optional): 识别结果的保存路径 (仅当visualization=True时存在)
 
   - ```python
-    def save_inference_model(dirname,
-                             model_filename=None,
-                             params_filename=None,
-                             combined=True)
+    def save_inference_model(dirname)
     ```
     - 将模型保存到指定路径。
 
     - **参数**
 
-      - dirname: 存在模型的目录名称； <br/>
-      - model\_filename: 模型文件名称，默认为\_\_model\_\_； <br/>
-      - params\_filename: 参数文件名称，默认为\_\_params\_\_(仅当`combined`为True时生效)；<br/>
-      - combined: 是否将参数保存到统一的一个文件中。
+      - dirname: 模型保存路径 <br/>
 
 
 ## 四、服务部署
@@ -172,6 +166,10 @@
 
   移除 fluid api
 
+* 1.2.0
+
+  修复推理模型无法导出的问题
+
   - ```shell
-    $ hub install ssd_mobilenet_v1_pascal==1.1.3
+    $ hub install ssd_mobilenet_v1_pascal==1.2.0
     ```

modules/image/object_detection/ssd_mobilenet_v1_pascal/README_en.md

@@ -101,19 +101,13 @@
         - save\_path (str, optional): output path for saving results
 
   - ```python
-    def save_inference_model(dirname,
-                             model_filename=None,
-                             params_filename=None,
-                             combined=True)
+    def save_inference_model(dirname)
     ```
     - Save model to specific path
 
     - **Parameters**
 
-      - dirname: output dir for saving model
-      - model\_filename: filename for saving model
-      - params\_filename: filename for saving parameters
-      - combined: whether save parameters into one file
+      - dirname: model save path
 
 
 ## IV.Server Deployment
@@ -171,6 +165,10 @@
 
   Remove fluid api
 
+* 1.2.0
+
+  Fix bug of save_inference_model
+
   - ```shell
-    $ hub install ssd_mobilenet_v1_pascal==1.1.3
+    $ hub install ssd_mobilenet_v1_pascal==1.2.0
     ```

modules/image/object_detection/ssd_mobilenet_v1_pascal/data_feed.py

@@ -5,12 +5,10 @@ from __future__ import division
 
 import os
 import random
-from collections import OrderedDict
 
 import cv2
 import numpy as np
 from PIL import Image
-from paddle import fluid
 
 __all__ = ['reader']
 

modules/image/object_detection/ssd_mobilenet_v1_pascal/module.py

@@ -8,38 +8,39 @@ from functools import partial
 
 import numpy as np
 import paddle
+import paddle.jit
+import paddle.static
 import yaml
 from paddle.inference import Config
 from paddle.inference import create_predictor
-from ssd_mobilenet_v1_pascal.data_feed import reader
-from ssd_mobilenet_v1_pascal.processor import base64_to_cv2
-from ssd_mobilenet_v1_pascal.processor import load_label_info
-from ssd_mobilenet_v1_pascal.processor import postprocess
+from .data_feed import reader
+from .processor import base64_to_cv2
+from .processor import load_label_info
+from .processor import postprocess
 
-import paddlehub as hub
-from paddlehub.common.paddle_helper import add_vars_prefix
 from paddlehub.module.module import moduleinfo
 from paddlehub.module.module import runnable
 from paddlehub.module.module import serving
 
 
 @moduleinfo(name="ssd_mobilenet_v1_pascal",
-            version="1.1.3",
+            version="1.2.0",
             type="cv/object_detection",
             summary="SSD with backbone MobileNet_V1, trained with dataset Pasecal VOC.",
             author="paddlepaddle",
             author_email="paddle-dev@baidu.com")
-class SSDMobileNetv1(hub.Module):
-
-    def _initialize(self):
-        self.default_pretrained_model_path = os.path.join(self.directory, "ssd_mobilenet_v1_model")
+class SSDMobileNetv1:
+    def __init__(self):
+        self.default_pretrained_model_path = os.path.join(self.directory, "ssd_mobilenet_v1_model", "model")
         self.label_names = load_label_info(os.path.join(self.directory, "label_file.txt"))
         self.model_config = None
         self._set_config()
 
     def _set_config(self):
         # predictor config setting.
-        cpu_config = Config(self.default_pretrained_model_path)
+        model = self.default_pretrained_model_path+'.pdmodel'
+        params = self.default_pretrained_model_path+'.pdiparams'
+        cpu_config = Config(model, params)
         cpu_config.disable_glog_info()
         cpu_config.disable_gpu()
         cpu_config.switch_ir_optim(False)
@@ -52,7 +53,7 @@ class SSDMobileNetv1(hub.Module):
         except:
             use_gpu = False
         if use_gpu:
-            gpu_config = Config(self.default_pretrained_model_path)
+            gpu_config = Config(model, params)
             gpu_config.disable_glog_info()
             gpu_config.enable_use_gpu(memory_pool_init_size_mb=500, device_id=0)
             self.gpu_predictor = create_predictor(gpu_config)
@@ -136,24 +137,6 @@ class SSDMobileNetv1(hub.Module):
             res.extend(output)
         return res
 
-    def save_inference_model(self, dirname, model_filename=None, params_filename=None, combined=True):
-        if combined:
-            model_filename = "__model__" if not model_filename else model_filename
-            params_filename = "__params__" if not params_filename else params_filename
-        place = paddle.CPUPlace()
-        exe = paddle.Executor(place)
-
-        program, feeded_var_names, target_vars = paddle.static.load_inference_model(
-            dirname=self.default_pretrained_model_path, executor=exe)
-
-        paddle.static.save_inference_model(dirname=dirname,
-                                           main_program=program,
-                                           executor=exe,
-                                           feeded_var_names=feeded_var_names,
-                                           target_vars=target_vars,
-                                           model_filename=model_filename,
-                                           params_filename=params_filename)
-
     @serving
     def serving_method(self, images, **kwargs):
         """

modules/image/object_detection/ssd_mobilenet_v1_pascal/test.py

+import os
+import shutil
+import unittest
+
+import cv2
+import requests
+import paddlehub as hub
+
+
+class TestHubModule(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls) -> None:
+        img_url = 'https://ai-studio-static-online.cdn.bcebos.com/68313e182f5e4ad9907e69dac9ece8fc50840d7ffbd24fa88396f009958f969a'
+        if not os.path.exists('tests'):
+            os.makedirs('tests')
+        response = requests.get(img_url)
+        assert response.status_code == 200, 'Network Error.'
+        with open('tests/test.jpg', 'wb') as f:
+            f.write(response.content)
+        cls.module = hub.Module(name="ssd_mobilenet_v1_pascal")
+
+    @classmethod
+    def tearDownClass(cls) -> None:
+        shutil.rmtree('tests')
+        shutil.rmtree('inference')
+        shutil.rmtree('detection_result')
+
+    def test_object_detection1(self):
+        results = self.module.object_detection(
+            paths=['tests/test.jpg']
+        )
+        bbox = results[0]['data'][0]
+        label = bbox['label']
+        confidence = bbox['confidence']
+        left = bbox['left']
+        right = bbox['right']
+        top = bbox['top']
+        bottom = bbox['bottom']
+
+        self.assertEqual(label, 'cat')
+        self.assertTrue(confidence > 0.5)
+        self.assertTrue(200 < left < 800)
+        self.assertTrue(2500 < right < 3500)
+        self.assertTrue(500 < top < 1500)
+        self.assertTrue(3500 < bottom < 4500)
+
+    def test_object_detection2(self):
+        results = self.module.object_detection(
+            images=[cv2.imread('tests/test.jpg')]
+        )
+        bbox = results[0]['data'][0]
+        label = bbox['label']
+        confidence = bbox['confidence']
+        left = bbox['left']
+        right = bbox['right']
+        top = bbox['top']
+        bottom = bbox['bottom']
+
+        self.assertEqual(label, 'cat')
+        self.assertTrue(confidence > 0.5)
+        self.assertTrue(200 < left < 800)
+        self.assertTrue(2500 < right < 3500)
+        self.assertTrue(500 < top < 1500)
+        self.assertTrue(3500 < bottom < 4500)
+
+    def test_object_detection3(self):
+        results = self.module.object_detection(
+            images=[cv2.imread('tests/test.jpg')],
+            visualization=False
+        )
+        bbox = results[0]['data'][0]
+        label = bbox['label']
+        confidence = bbox['confidence']
+        left = bbox['left']
+        right = bbox['right']
+        top = bbox['top']
+        bottom = bbox['bottom']
+
+        self.assertEqual(label, 'cat')
+        self.assertTrue(confidence > 0.5)
+        self.assertTrue(200 < left < 800)
+        self.assertTrue(2500 < right < 3500)
+        self.assertTrue(500 < top < 1500)
+        self.assertTrue(3500 < bottom < 4500)
+
+    def test_object_detection4(self):
+        self.assertRaises(
+            AssertionError,
+            self.module.object_detection,
+            paths=['no.jpg']
+        )
+
+    def test_object_detection5(self):
+        self.assertRaises(
+            cv2.error,
+            self.module.object_detection,
+            images=['test.jpg']
+        )
+
+    def test_save_inference_model(self):
+        self.module.save_inference_model('./inference/model')
+
+        self.assertTrue(os.path.exists('./inference/model.pdmodel'))
+        self.assertTrue(os.path.exists('./inference/model.pdiparams'))
+
+
+if __name__ == "__main__":
+    unittest.main()