Change a test image for object detection model EFFICIENT_LITE2 15/284115/2
authorTae-Young Chung <ty83.chung@samsung.com>
Thu, 10 Nov 2022 03:11:34 +0000 (12:11 +0900)
committerTae-Young Chung <ty83.chung@samsung.com>
Fri, 11 Nov 2022 02:46:30 +0000 (11:46 +0900)
[Issue type] update

Change-Id: I129fb15f5b2424015c121474e673522bebc38740
Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>
test/testsuites/machine_learning/inference/test_object_detection.cpp

index 5c7f599c3d7e359f8dc716a0d9811857789509ea..6ae988b2e427daae85de897670829f6177caa365 100644 (file)
@@ -51,6 +51,9 @@
 #define IMG_BUS    \
        MV_CONFIG_PATH \
        "/res/inference/images/bus.jpg"
+#define IMG_BASEBALL    \
+       MV_CONFIG_PATH \
+       "/res/inference/images/baseball.jpg"
 void _object_detected_cb(mv_source_h source, const int number_of_objects, const int *indices, const char **names,
                                                 const float *confidences, const mv_rectangle_s *locations, void *user_data)
 {
@@ -129,19 +132,11 @@ INSTANTIATE_TEST_CASE_P(Prefix, TestObjectDetectionTflite,
 class TestObjectDetectionSnpe : public TestInference
 {
 public:
-       void inferenceDog()
-       {
-               std::string answer("dog");
-               TestInference::ConfigureInference();
-
-               ASSERT_EQ(MediaVision::Common::ImageHelper::loadImageToSource(IMG_DOG, mv_source), MEDIA_VISION_ERROR_NONE);
-               ASSERT_EQ(mv_inference_object_detect(mv_source, infer, _object_detected_cb, &answer), MEDIA_VISION_ERROR_NONE);
-       }
-       void inferenceBus(std::string &answer)
+       void inference(std::string answer, std::string image)
        {
                TestInference::ConfigureInference();
 
-               ASSERT_EQ(MediaVision::Common::ImageHelper::loadImageToSource(IMG_BUS, mv_source), MEDIA_VISION_ERROR_NONE);
+               ASSERT_EQ(MediaVision::Common::ImageHelper::loadImageToSource(image.c_str(), mv_source), MEDIA_VISION_ERROR_NONE);
                ASSERT_EQ(mv_inference_object_detect(mv_source, infer, _object_detected_cb, &answer), MEDIA_VISION_ERROR_NONE);
        }
 };
@@ -152,7 +147,7 @@ TEST_P(TestObjectDetectionSnpe, DISABLED_EFDLite2QC)
        engine_config_hosted_snpe_model(engine_cfg, OD_SNPE_WEIGHT_QC_EFFCIENTDET_LITE2_448_PATH,
                                                                        OD_LABEL_EFFICIENTDET_LITE2_448_PATH, _use_json_parser, _target_device_type);
 
-       inferenceDog();
+       inference("person", IMG_BASEBALL);
 }
 
 TEST_P(TestObjectDetectionSnpe, DISABLED_YoloV5MultiAnchor)
@@ -161,8 +156,7 @@ TEST_P(TestObjectDetectionSnpe, DISABLED_YoloV5MultiAnchor)
        ASSERT_TRUE(_use_json_parser);
        engine_config_hosted_snpe_model(engine_cfg, OD_SNPE_WEIGHT_QC_YOLO_V5_MULTIANCHOR_PATH,
                                                                        OD_SNPE_LABEL_QC_YOLO_V5_MULTIANCHOR_PATH, _use_json_parser, _target_device_type);
-       std::string answer = "bus";
-       inferenceBus(answer);
+       inference("bus", IMG_BUS);
 }
 
 INSTANTIATE_TEST_CASE_P(Prefix, TestObjectDetectionSnpe,