Update blazeModel to lite model

Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>

diff --git a/mv_inference/inference/src/Inference.cpp b/mv_inference/inference/src/Inference.cpp
index 1eb6d1188b78e7dd41952bdd3da991e1c20a58a7..9ef38ad5af73148a76ae1f806ea2145c901df922 100755 (executable)
--- a/mv_inference/inference/src/Inference.cpp
+++ b/mv_inference/inference/src/Inference.cpp
@@ -1687,11 +1687,11 @@ namespace inference
                                pose_detect_result_t detection_result;
 
                                // classificators = Identity
-                               //float *score_ptr = reinterpret_cast<float *>(inferResults[0]);
-                               //float *bboxes_ptr = reinterpret_cast<float *>(inferResults[1]);
+                               float *score_ptr = reinterpret_cast<float *>(inferResults[0]);
+                               float *bboxes_ptr = reinterpret_cast<float *>(inferResults[1]);
 
-                               float *score_ptr = reinterpret_cast<float *>(inferResults[1]);
-                               float *bboxes_ptr = reinterpret_cast<float *>(inferResults[0]);
+                               //float *score_ptr = reinterpret_cast<float *>(inferResults[1]);
+                               //float *bboxes_ptr = reinterpret_cast<float *>(inferResults[0]);
                                decode_bounds(region_list, ssdScoreThreshVal, mInputSize.width, mInputSize.height, score_ptr, bboxes_ptr);
 
                                //nms
@@ -2088,9 +2088,13 @@ namespace inference
 
                } else { //inferDimInfo.size >= 3
 
-                       float * coordsPtr = reinterpret_cast<float*>(inferResults[0]);
+                       //lite
+                       float * coordsPtr = reinterpret_cast<float*>(inferResults[2]);
                        float * scorePtr =  reinterpret_cast<float*>(inferResults[1]);
 
+                       //float * coordsPtr = reinterpret_cast<float*>(inferResults[0]);
+                       //float * scorePtr =  reinterpret_cast<float*>(inferResults[1]);
+
                        LOGI("inferDimInfo[0][0]: %d", inferDimInfo[0][0]);
                        LOGI("inferDimInfo[0][1]: %d", inferDimInfo[0][1]);
                        LOGI("inferDimInfo[1][0]: %d", inferDimInfo[1][0]);

diff --git a/test/testsuites/inference/inference_test_suite.c b/test/testsuites/inference/inference_test_suite.c
index 46f670b7321071a7042bb4a2fb04809711bfa438..e266dc12bd92b633a3d0e239032a708422293388 100644 (file)
--- a/test/testsuites/inference/inference_test_suite.c
+++ b/test/testsuites/inference/inference_test_suite.c
@@ -111,9 +111,9 @@
        "/usr/share/capi-media-vision/models/PLD/tflite/pose-label-srid.txt"
 
 #define PLD_TFLITE_BLAZE_WEIGTH_PATH \
-       "/usr/share/capi-media-vision/models/PLD/tflite/posedetector_full.tflite"
+       "/usr/share/capi-media-vision/models/PLD/tflite/lite_pose_detection_128x128_float32.tflite"
 #define PLD_TFLITE_BLAZE_WEIGTH2_PATH \
-       "/usr/share/capi-media-vision/models/PLD/tflite/pose_39kp_full.tflite"
+       "/usr/share/capi-media-vision/models/PLD/tflite/lite_pose_landmark_39kp_256x256_float32.tflite"
 #define PLD_POSE_BLAZE_LABEL_PATH \
        "/usr/share/capi-media-vision/models/PLD/tflite/pose-label-blaze.txt"
 

diff --git a/test/testsuites/stream_infer/stream_infer.c b/test/testsuites/stream_infer/stream_infer.c
index cab19f60fe583ae16edd4796f37bb1af8f4a7366..21111c4d1680bbab4a2403637f9a827f581cca89 100644 (file)
--- a/test/testsuites/stream_infer/stream_infer.c
+++ b/test/testsuites/stream_infer/stream_infer.c
@@ -145,8 +145,10 @@ static guint bus_watch_id;
 #define PLD_MOTION_CAPTURE_MAPPING_FILE_PATH "/usr/share/capi-media-vision/models/PLD/mocap/example-mocap-mapping.txt"
 
 
-#define PLD_TFLITE_BLAZE_WEIGTH_PATH "/usr/share/capi-media-vision/models/PLD/tflite/posedetector_full.tflite"
-#define PLD_TFLITE_BLAZE_WEIGTH2_PATH "/usr/share/capi-media-vision/models/PLD/tflite/pose_39kp_full.tflite"
+//#define PLD_TFLITE_BLAZE_WEIGTH_PATH "/usr/share/capi-media-vision/models/PLD/tflite/posedetector_full.tflite"
+//#define PLD_TFLITE_BLAZE_WEIGTH2_PATH "/usr/share/capi-media-vision/models/PLD/tflite/pose_39kp_full.tflite"
+#define PLD_TFLITE_BLAZE_WEIGTH_PATH "/usr/share/capi-media-vision/models/PLD/tflite/lite_pose_detection_128x128_float32.tflite"
+#define PLD_TFLITE_BLAZE_WEIGTH2_PATH "/usr/share/capi-media-vision/models/PLD/tflite/lite_pose_landmark_39kp_256x256_float32.tflite"
 #define PLD_POSE_BLAZE_LABEL_PATH "/usr/share/capi-media-vision/models/PLD/tflite/pose-label-blaze.txt"
 
 #define POSE_RESET_COUNT 5
@@ -1430,8 +1432,8 @@ int perform_tflite_human_pose_blaze_detector_configure(mv_engine_config_h mv_eng
 
        char *inputNodeName = "input";
        // Identity_1: regressor, Identity: classficator
-       //char *outputNodeName[] = { "Identity_1", "Identity" };
-       char *outputNodeName[] = { "regressor", "classficator" };
+       char *outputNodeName[] = { "Identity_1", "Identity" };
+       //char *outputNodeName[] = { "regressor", "classficator" };
 
        mv_engine_config_set_string_attribute(mv_engine_cfg,
                                                MV_INFERENCE_MODEL_WEIGHT_FILE_PATH,
@@ -1496,9 +1498,9 @@ int perform_tflite_human_pose_blaze_landmark_configure(mv_engine_config_h mv_eng
        }
 
        char *inputNodeName = "input_1";
-       // Identity_1: regressor, Identity: classficator
-       char *outputNodeName[] = { "ld_3d", "output_poseflag" };
-
+       // Identity_2: ld_3d, Identity_1: output_poseflag
+       //char *outputNodeName[] = { "ld_3d", "output_poseflag" };
+       char *outputNodeName[] = { "Identity_2", "Identity_1" };
        mv_engine_config_set_string_attribute(mv_engine_cfg,
                                                MV_INFERENCE_MODEL_WEIGHT_FILE_PATH,
                                                PLD_TFLITE_BLAZE_WEIGTH2_PATH);