From a30abac2c44a33f8a57c4f59007d3cac4d547bf1 Mon Sep 17 00:00:00 2001
From: Guanghua Yu <742925032@qq.com>
Date: Fri, 21 Aug 2020 15:40:12 +0800
Subject: [PATCH] fix use_cv2 of SSD in infer (#1264)

---
 configs/ssd/ssd_mobilenet_v1_voc.yml           | 2 +-
 configs/ssd/ssd_vgg16_300.yml                  | 2 +-
 configs/ssd/ssd_vgg16_300_voc.yml              | 2 +-
 configs/ssd/ssd_vgg16_512.yml                  | 2 +-
 configs/ssd/ssd_vgg16_512_voc.yml              | 2 +-
 configs/ssd/ssdlite_ghostnet.yml               | 2 +-
 configs/ssd/ssdlite_mobilenet_v1.yml           | 2 +-
 configs/ssd/ssdlite_mobilenet_v3_large.yml     | 2 +-
 configs/ssd/ssdlite_mobilenet_v3_large_fpn.yml | 2 +-
 configs/ssd/ssdlite_mobilenet_v3_small.yml     | 2 +-
 configs/ssd/ssdlite_mobilenet_v3_small_fpn.yml | 2 +-
 deploy/cpp/src/main.cc                         | 1 +
 12 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/configs/ssd/ssd_mobilenet_v1_voc.yml b/configs/ssd/ssd_mobilenet_v1_voc.yml
index ec3c5a21c..5fcbbf230 100644
--- a/configs/ssd/ssd_mobilenet_v1_voc.yml
+++ b/configs/ssd/ssd_mobilenet_v1_voc.yml
@@ -134,7 +134,7 @@ TestReader:
     interp: 1
     max_size: 0
     target_size: 300
-    use_cv2: false
+    use_cv2: true
   - !Permute {}
   - !NormalizeImage
     is_scale: false
diff --git a/configs/ssd/ssd_vgg16_300.yml b/configs/ssd/ssd_vgg16_300.yml
index aaacf022d..3c94c7d93 100644
--- a/configs/ssd/ssd_vgg16_300.yml
+++ b/configs/ssd/ssd_vgg16_300.yml
@@ -140,7 +140,7 @@ TestReader:
     interp: 1
     max_size: 0
     target_size: 300
-    use_cv2: false
+    use_cv2: true
   - !Permute
     to_bgr: false
   - !NormalizeImage
diff --git a/configs/ssd/ssd_vgg16_300_voc.yml b/configs/ssd/ssd_vgg16_300_voc.yml
index b74896688..58570954d 100644
--- a/configs/ssd/ssd_vgg16_300_voc.yml
+++ b/configs/ssd/ssd_vgg16_300_voc.yml
@@ -140,7 +140,7 @@ TestReader:
     interp: 1
     max_size: 0
     target_size: 300
-    use_cv2: false
+    use_cv2: true
   - !Permute
     to_bgr: false
   - !NormalizeImage
diff --git a/configs/ssd/ssd_vgg16_512.yml b/configs/ssd/ssd_vgg16_512.yml
index 1ddea5570..4a36eecfb 100644
--- a/configs/ssd/ssd_vgg16_512.yml
+++ b/configs/ssd/ssd_vgg16_512.yml
@@ -142,7 +142,7 @@ TestReader:
     interp: 1
     max_size: 0
     target_size: 512
-    use_cv2: false
+    use_cv2: true
   - !Permute
     to_bgr: false
   - !NormalizeImage
diff --git a/configs/ssd/ssd_vgg16_512_voc.yml b/configs/ssd/ssd_vgg16_512_voc.yml
index 35fd19094..7cc5cd8c6 100644
--- a/configs/ssd/ssd_vgg16_512_voc.yml
+++ b/configs/ssd/ssd_vgg16_512_voc.yml
@@ -144,7 +144,7 @@ TestReader:
     interp: 1
     max_size: 0
     target_size: 512
-    use_cv2: false
+    use_cv2: true
   - !Permute
     to_bgr: false
   - !NormalizeImage
diff --git a/configs/ssd/ssdlite_ghostnet.yml b/configs/ssd/ssdlite_ghostnet.yml
index 5a7f0e749..fc0d35ddb 100644
--- a/configs/ssd/ssdlite_ghostnet.yml
+++ b/configs/ssd/ssdlite_ghostnet.yml
@@ -150,7 +150,7 @@ TestReader:
     interp: 1
     max_size: 0
     target_size: 320
-    use_cv2: false
+    use_cv2: true
   - !NormalizeImage
     mean: [0.485, 0.456, 0.406]
     std: [0.229, 0.224, 0.225]
diff --git a/configs/ssd/ssdlite_mobilenet_v1.yml b/configs/ssd/ssdlite_mobilenet_v1.yml
index 3624a3f6b..6d6254cfd 100644
--- a/configs/ssd/ssdlite_mobilenet_v1.yml
+++ b/configs/ssd/ssdlite_mobilenet_v1.yml
@@ -147,7 +147,7 @@ TestReader:
     interp: 1
     max_size: 0
     target_size: 300
-    use_cv2: false
+    use_cv2: true
   - !NormalizeImage
     mean: [0.485, 0.456, 0.406]
     std: [0.229, 0.224, 0.225]
diff --git a/configs/ssd/ssdlite_mobilenet_v3_large.yml b/configs/ssd/ssdlite_mobilenet_v3_large.yml
index 85cda27f6..1bee6ff18 100644
--- a/configs/ssd/ssdlite_mobilenet_v3_large.yml
+++ b/configs/ssd/ssdlite_mobilenet_v3_large.yml
@@ -151,7 +151,7 @@ TestReader:
     interp: 1
     max_size: 0
     target_size: 320
-    use_cv2: false
+    use_cv2: true
   - !NormalizeImage
     mean: [0.485, 0.456, 0.406]
     std: [0.229, 0.224, 0.225]
diff --git a/configs/ssd/ssdlite_mobilenet_v3_large_fpn.yml b/configs/ssd/ssdlite_mobilenet_v3_large_fpn.yml
index f168785dd..3d2c7603b 100644
--- a/configs/ssd/ssdlite_mobilenet_v3_large_fpn.yml
+++ b/configs/ssd/ssdlite_mobilenet_v3_large_fpn.yml
@@ -158,7 +158,7 @@ TestReader:
     interp: 1
     max_size: 0
     target_size: 320
-    use_cv2: false
+    use_cv2: true
   - !NormalizeImage
     mean: [0.485, 0.456, 0.406]
     std: [0.229, 0.224, 0.225]
diff --git a/configs/ssd/ssdlite_mobilenet_v3_small.yml b/configs/ssd/ssdlite_mobilenet_v3_small.yml
index d09f96702..65695cc30 100644
--- a/configs/ssd/ssdlite_mobilenet_v3_small.yml
+++ b/configs/ssd/ssdlite_mobilenet_v3_small.yml
@@ -151,7 +151,7 @@ TestReader:
     interp: 1
     max_size: 0
     target_size: 320
-    use_cv2: false
+    use_cv2: true
   - !NormalizeImage
     mean: [0.485, 0.456, 0.406]
     std: [0.229, 0.224, 0.225]
diff --git a/configs/ssd/ssdlite_mobilenet_v3_small_fpn.yml b/configs/ssd/ssdlite_mobilenet_v3_small_fpn.yml
index 1d8182aa2..40bdb8461 100644
--- a/configs/ssd/ssdlite_mobilenet_v3_small_fpn.yml
+++ b/configs/ssd/ssdlite_mobilenet_v3_small_fpn.yml
@@ -158,7 +158,7 @@ TestReader:
     interp: 1
     max_size: 0
     target_size: 320
-    use_cv2: false
+    use_cv2: true
   - !NormalizeImage
     mean: [0.485, 0.456, 0.406]
     std: [0.229, 0.224, 0.225]
diff --git a/deploy/cpp/src/main.cc b/deploy/cpp/src/main.cc
index 6ad626498..90dfcf97f 100644
--- a/deploy/cpp/src/main.cc
+++ b/deploy/cpp/src/main.cc
@@ -25,6 +25,7 @@ DEFINE_string(model_dir, "", "Path of inference model");
 DEFINE_string(image_path, "", "Path of input image");
 DEFINE_string(video_path, "", "Path of input video");
 DEFINE_bool(use_gpu, false, "Infering with GPU or CPU");
+DEFINE_bool(use_camera, false, "Use camera or not");
 DEFINE_string(run_mode, "fluid", "Mode of running(fluid/trt_fp32/trt_fp16)");
 DEFINE_int32(gpu_id, 0, "Device id of GPU to execute");
 DEFINE_int32(camera_id, -1, "Device id of camera to predict");
-- 
GitLab