diff --git a/configs/ssd/ssd_mobilenet_v1_voc.yml b/configs/ssd/ssd_mobilenet_v1_voc.yml index ec3c5a21c9c29f3fc81da276749259295f10bc7f..5fcbbf230d8e21ec9c2a66dc379707686cf506f7 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 aaacf022dcd61619ef4c4654b3ac1ebeb971bcd9..3c94c7d93e898f962579627008d467045736e621 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 b748966887cc58187da06327e5bce737b858cc89..58570954da3cc188ae7805d2e7d6f77d5451f042 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 1ddea55706141a694de02cdc1da2f72af41531cf..4a36eecfb251cabc384893046b4d4fc2b6006f83 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 35fd19094e366e882e0dd1dd92397f2b2e526c0e..7cc5cd8c6438aab92c284b2b09c5e73c68f970b9 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 5a7f0e749f68582826da70be68c6ee90cc1e700c..fc0d35ddb30761fba2fa0288662045eb3bc88e03 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 3624a3f6bdcf4eec860a1264d423a72d68a8773b..6d6254cfd661ef301af4057d27fa0f15575f09c3 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 85cda27f6b1b80b23d5a70529512378884e99751..1bee6ff18ebe3b08f81b6e68c925c6fae7e9f1d9 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 f168785dd3abbaad91e3076b2ebcde8919b79e20..3d2c7603bdf8464278c457375a789f44e6ea17ce 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 d09f96702830545a99de41fe00962f4bd515a0db..65695cc30c07d6c4b2b7c01e5e0dd309c82aad8c 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 1d8182aa24021fb384a2430e0b269654d2ba89bb..40bdb8461bccc233b3de8056a93cd6b5444badb2 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 6ad626498ca518ea38343e10eec883b9a2f27cfa..90dfcf97fa4ebc9e08f75c491d228ca8f39d1a29 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");