From: Inki Dae Date: Mon, 16 Dec 2024 00:59:53 +0000 (+0900) Subject: test: fix test case X-Git-Tag: accepted/tizen/unified/20250103.142713~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F05%2F316605%2F2;p=platform%2Fcore%2Fmultimedia%2Finference-engine-interface.git test: fix test case Fix test case by dropping invalid backend types and adding rpi5 board support. Change-Id: I121e6bf8d385750bc5748e3449f5dfb97d7766a5 Signed-off-by: Inki Dae --- diff --git a/test/src/inference_engine_tc.cpp b/test/src/inference_engine_tc.cpp index d37116a..7f7e9d4 100644 --- a/test/src/inference_engine_tc.cpp +++ b/test/src/inference_engine_tc.cpp @@ -635,32 +635,15 @@ TEST_P(InferenceEngineTestCase_G6, Inference_P) INSTANTIATE_TEST_CASE_P(Prefix, InferenceEngineTestCase_G1, testing::Values( // parameter order : backend name - // ARMNN. - ParamType_One("armnn"), // TFLITE. - ParamType_One("tflite"), - // OPENCV - ParamType_One("opencv"), - // ML Single API for NNStreamer. - ParamType_One("one"), - // SNPE - ParamType_One("snpe") + ParamType_One("tflite") )); INSTANTIATE_TEST_CASE_P(Prefix, InferenceEngineTestCase_G2, testing::Values( // parameter order : backend name, target device - // ARMNN. - ParamType_Two("armnn", INFERENCE_TARGET_CPU), // TFLITE. - ParamType_Two("tflite", INFERENCE_TARGET_CPU), - // OPENCV. - ParamType_Two("opencv", INFERENCE_TARGET_CPU), - // ML Single API for NNStreamer. - ParamType_Two("one", INFERENCE_TARGET_CPU), - // ML Single API with SNPE - ParamType_Two("snpe", INFERENCE_TARGET_CUSTOM) - /* TODO */ + ParamType_Two("tflite", INFERENCE_TARGET_CPU) )); INSTANTIATE_TEST_CASE_P( @@ -668,26 +651,10 @@ INSTANTIATE_TEST_CASE_P( testing::Values( // parameter order : backend name, target device, model path/s // mobilenet based image classification model loading test - // ARMNN. - ParamType_Three( - "armnn", INFERENCE_TARGET_CPU, - { "/usr/share/capi-media-vision/models/IC/tflite/ic_tflite_model.tflite" }), // TFLITE. ParamType_Three( "tflite", INFERENCE_TARGET_CPU, - { "/usr/share/capi-media-vision/models/IC/tflite/ic_tflite_model.tflite" }), - // OPENCV. - ParamType_Three( - "opencv", INFERENCE_TARGET_CPU, - { "/usr/share/capi-media-vision/models/IC/caffe/ic_caffe_model_squeezenet.caffemodel", - "/usr/share/capi-media-vision/models/IC/caffe/ic_caffe_model_squeezenet.prototxt" }), - // ML Single API for NNStreamer. - ParamType_Three( - "one", INFERENCE_TARGET_CPU, - { "/usr/share/capi-media-vision/models/IC_Q/tflite/ic_tflite_q_model.tflite" }), - ParamType_Three( - "snpe", INFERENCE_TARGET_CUSTOM, - { "/usr/share/capi-media-vision/models/OD/snpe/lite2_fp32.dlc" }) + { "/opt/usr/home/owner/media/Others/mv_test/res/inference/models/ic_tflite_model.tflite" }) /* TODO */ )); @@ -696,17 +663,8 @@ INSTANTIATE_TEST_CASE_P( testing::Values( // parameter order : backend name, input data type, height, width, channel count, layer name // set input and output layer positive test - // ARMNN. - ParamType_Six("armnn", INFERENCE_TENSOR_DATA_TYPE_FLOAT32, 224, - 224, 3, { "test_name" }), // TFLITE. ParamType_Six("tflite", INFERENCE_TENSOR_DATA_TYPE_FLOAT32, 224, - 224, 3, { "test_name" }), - // OPENCV. - ParamType_Six("opencv", INFERENCE_TENSOR_DATA_TYPE_FLOAT32, 224, - 224, 3, { "test_name" }), - // ML Single API for NNStreamer. - ParamType_Six("one", INFERENCE_TENSOR_DATA_TYPE_UINT8, 224, 224, 3, { "test_name" }) /* TODO */ )); @@ -716,16 +674,6 @@ INSTANTIATE_TEST_CASE_P( testing::Values( // parameter order : backend name, input data type, height, width, channel count, layer name // set input and output layer negative test - // ARMNN. - ParamType_Six("armnn", -1, 224, 224, 3, { "test_name" }), - ParamType_Six("armnn", INFERENCE_TENSOR_DATA_TYPE_FLOAT32, 0, - 224, 3, { "test_name" }), - ParamType_Six("armnn", INFERENCE_TENSOR_DATA_TYPE_FLOAT32, 224, - 0, 3, { "test_name" }), - ParamType_Six("armnn", INFERENCE_TENSOR_DATA_TYPE_FLOAT32, 224, - 224, 0, { "test_name" }), - ParamType_Six("armnn", INFERENCE_TENSOR_DATA_TYPE_FLOAT32, 224, - 224, 3, { "" }), // TFLITE. ParamType_Six("tflite", -1, 224, 224, 3, { "test_name" }), ParamType_Six("tflite", INFERENCE_TENSOR_DATA_TYPE_FLOAT32, 0, @@ -735,26 +683,6 @@ INSTANTIATE_TEST_CASE_P( ParamType_Six("tflite", INFERENCE_TENSOR_DATA_TYPE_FLOAT32, 224, 224, 0, { "test_name" }), ParamType_Six("tflite", INFERENCE_TENSOR_DATA_TYPE_FLOAT32, 224, - 224, 3, { "" }), - // OPENCV. - ParamType_Six("opencv", -1, 224, 224, 3, { "test_name" }), - ParamType_Six("opencv", INFERENCE_TENSOR_DATA_TYPE_FLOAT32, 0, - 224, 3, { "test_name" }), - ParamType_Six("opencv", INFERENCE_TENSOR_DATA_TYPE_FLOAT32, 224, - 0, 3, { "test_name" }), - ParamType_Six("opencv", INFERENCE_TENSOR_DATA_TYPE_FLOAT32, 224, - 224, 0, { "test_name" }), - ParamType_Six("opencv", INFERENCE_TENSOR_DATA_TYPE_FLOAT32, 224, - 224, 3, { "" }), - // ML Single API for NNStreamer. - ParamType_Six("one", -1, 224, 224, 3, { "test_name" }), - ParamType_Six("one", INFERENCE_TENSOR_DATA_TYPE_UINT8, 0, - 224, 3, { "test_name" }), - ParamType_Six("one", INFERENCE_TENSOR_DATA_TYPE_UINT8, 224, - 0, 3, { "test_name" }), - ParamType_Six("one", INFERENCE_TENSOR_DATA_TYPE_UINT8, 224, - 224, 0, { "test_name" }), - ParamType_Six("one", INFERENCE_TENSOR_DATA_TYPE_UINT8, 224, 224, 3, { "" }) /* TODO */ )); @@ -764,15 +692,6 @@ INSTANTIATE_TEST_CASE_P( testing::Values( // parameter order : backend name, target device, input image path/s, height, width, channel count, input layer names, output layer names, model path/s, inference result // mobilenet based image classification test - // ARMNN. - ParamType_Many( - "armnn", INFERENCE_ENGINE_PROFILER_OFF, - INFERENCE_TARGET_CPU, TEST_MODEL_IMAGE_CLASSIFICATION, 10, - INFERENCE_TENSOR_DATA_TYPE_FLOAT32, - { "/opt/usr/images/image_classification.bin" }, 224, - 224, 3, { "input_2" }, { "dense_3/Softmax" }, - { "/usr/share/capi-media-vision/models/IC/tflite/ic_tflite_model.tflite" }, - { 3 }), // TFLITE. ParamType_Many( "tflite", INFERENCE_ENGINE_PROFILER_OFF, @@ -780,101 +699,24 @@ INSTANTIATE_TEST_CASE_P( INFERENCE_TENSOR_DATA_TYPE_FLOAT32, { "/opt/usr/images/image_classification.bin" }, 224, 224, 3, { "input_2" }, { "dense_3/Softmax" }, - { "/usr/share/capi-media-vision/models/IC/tflite/ic_tflite_model.tflite" }, - { 3 }), - // OPENCV. - ParamType_Many( - "opencv", INFERENCE_ENGINE_PROFILER_OFF, - INFERENCE_TARGET_CPU, TEST_MODEL_IMAGE_CLASSIFICATION, 10, - INFERENCE_TENSOR_DATA_TYPE_FLOAT32, - { "/opt/usr/images/image_classification_caffe.bin" }, - 227, 227, 3, { "data" }, { "prob" }, - { "/usr/share/capi-media-vision/models/IC/caffe/ic_caffe_model_squeezenet.caffemodel", - "/usr/share/capi-media-vision/models/IC/caffe/ic_caffe_model_squeezenet.prototxt" }, - { 281 }), - // ONE. - ParamType_Many( - "one", INFERENCE_ENGINE_PROFILER_OFF, - INFERENCE_TARGET_CPU, TEST_MODEL_IMAGE_CLASSIFICATION, 10, - INFERENCE_TENSOR_DATA_TYPE_UINT8, - { "/opt/usr/images/image_classification_q.bin" }, - 224, 224, 3, { "input" }, { "MobilenetV1/Predictions/Reshape_1" }, - { "/usr/share/capi-media-vision/models/IC_Q/tflite/ic_tflite_q_model.tflite" }, - { 955 }), - // ARMNN. - ParamType_Many( - "armnn", INFERENCE_ENGINE_PROFILER_FILE, - INFERENCE_TARGET_CPU, TEST_MODEL_IMAGE_CLASSIFICATION, 10, - INFERENCE_TENSOR_DATA_TYPE_FLOAT32, - { "/opt/usr/images/image_classification.bin" }, 224, - 224, 3, { "input_2" }, { "dense_3/Softmax" }, - { "/usr/share/capi-media-vision/models/IC/tflite/ic_tflite_model.tflite" }, + { "/opt/usr/home/owner/media/Others/mv_test/res/inference/models/ic_tflite_model.tflite" }, { 3 }), - // TFLITE. ParamType_Many( "tflite", INFERENCE_ENGINE_PROFILER_FILE, INFERENCE_TARGET_CPU, TEST_MODEL_IMAGE_CLASSIFICATION, 10, INFERENCE_TENSOR_DATA_TYPE_FLOAT32, { "/opt/usr/images/image_classification.bin" }, 224, 224, 3, { "input_2" }, { "dense_3/Softmax" }, - { "/usr/share/capi-media-vision/models/IC/tflite/ic_tflite_model.tflite" }, - { 3 }), - // OPENCV. - ParamType_Many( - "opencv", INFERENCE_ENGINE_PROFILER_FILE, - INFERENCE_TARGET_CPU, TEST_MODEL_IMAGE_CLASSIFICATION, 10, - INFERENCE_TENSOR_DATA_TYPE_FLOAT32, - { "/opt/usr/images/image_classification_caffe.bin" }, - 227, 227, 3, { "data" }, { "prob" }, - { "/usr/share/capi-media-vision/models/IC/caffe/ic_caffe_model_squeezenet.caffemodel", - "/usr/share/capi-media-vision/models/IC/caffe/ic_caffe_model_squeezenet.prototxt" }, - { 281 }), - // ONE. - ParamType_Many( - "one", INFERENCE_ENGINE_PROFILER_FILE, - INFERENCE_TARGET_CPU, TEST_MODEL_IMAGE_CLASSIFICATION, 10, - INFERENCE_TENSOR_DATA_TYPE_UINT8, - { "/opt/usr/images/image_classification_q.bin" }, - 224, 224, 3, { "input" }, { "MobilenetV1/Predictions/Reshape_1" }, - { "/usr/share/capi-media-vision/models/IC_Q/tflite/ic_tflite_q_model.tflite" }, - { 955 }), - // ARMNN. - ParamType_Many( - "armnn", INFERENCE_ENGINE_PROFILER_CONSOLE, - INFERENCE_TARGET_CPU, TEST_MODEL_IMAGE_CLASSIFICATION, 10, - INFERENCE_TENSOR_DATA_TYPE_FLOAT32, - { "/opt/usr/images/image_classification.bin" }, 224, - 224, 3, { "input_2" }, { "dense_3/Softmax" }, - { "/usr/share/capi-media-vision/models/IC/tflite/ic_tflite_model.tflite" }, + { "/opt/usr/home/owner/media/Others/mv_test/res/inference/models/ic_tflite_model.tflite" }, { 3 }), - // TFLITE. ParamType_Many( "tflite", INFERENCE_ENGINE_PROFILER_CONSOLE, INFERENCE_TARGET_CPU, TEST_MODEL_IMAGE_CLASSIFICATION, 10, INFERENCE_TENSOR_DATA_TYPE_FLOAT32, { "/opt/usr/images/image_classification.bin" }, 224, 224, 3, { "input_2" }, { "dense_3/Softmax" }, - { "/usr/share/capi-media-vision/models/IC/tflite/ic_tflite_model.tflite" }, - { 3 }), - // OPENCV. - ParamType_Many( - "opencv", INFERENCE_ENGINE_PROFILER_CONSOLE, - INFERENCE_TARGET_CPU, TEST_MODEL_IMAGE_CLASSIFICATION, 10, - INFERENCE_TENSOR_DATA_TYPE_FLOAT32, - { "/opt/usr/images/image_classification_caffe.bin" }, - 227, 227, 3, { "data" }, { "prob" }, - { "/usr/share/capi-media-vision/models/IC/caffe/ic_caffe_model_squeezenet.caffemodel", - "/usr/share/capi-media-vision/models/IC/caffe/ic_caffe_model_squeezenet.prototxt" }, - { 281 }), - // ONE. - ParamType_Many( - "one", INFERENCE_ENGINE_PROFILER_CONSOLE, - INFERENCE_TARGET_CPU, TEST_MODEL_IMAGE_CLASSIFICATION, 10, - INFERENCE_TENSOR_DATA_TYPE_UINT8, - { "/opt/usr/images/image_classification_q.bin" }, - 224, 224, 3, { "input" }, { "MobilenetV1/Predictions/Reshape_1" }, - { "/usr/share/capi-media-vision/models/IC_Q/tflite/ic_tflite_q_model.tflite" }, - { 955 }) + { "/opt/usr/home/owner/media/Others/mv_test/res/inference/models/ic_tflite_model.tflite" }, + { 3 }) /* TODO */ )); diff --git a/test/src/inference_engine_test_common.cpp b/test/src/inference_engine_test_common.cpp index f1a378f..464d53b 100644 --- a/test/src/inference_engine_test_common.cpp +++ b/test/src/inference_engine_test_common.cpp @@ -46,6 +46,7 @@ static MachineCapacity MachineCap[] = { { true, false, false }, // TM1 { true, true, false }, // TM4 { true, false, false }, // RPI4 + { true, false, false }, // RPI5 { true, true, false }, // ODROID { true, true, true }, // VIM3 { true, true, false }, // NIKE-M @@ -55,6 +56,7 @@ static MachineCapacity MachineCap[] = { static std::map Machine_Idx = { { "Raspberry Pi 4 Model B", MACHINE_NAME_RPI4 }, + { "Raspberry Pi 5 Model B Rev 1.0", MACHINE_NAME_RPI5 }, { "Khadas VIM3", MACHINE_NAME_VIM3 }, { "Hardkernel Odroid XU3", MACHINE_NAME_ODROID }, { "Hardkernel Odroid XU4", MACHINE_NAME_ODROID }, diff --git a/test/src/inference_engine_test_common.h b/test/src/inference_engine_test_common.h index 403fecf..8e874b4 100644 --- a/test/src/inference_engine_test_common.h +++ b/test/src/inference_engine_test_common.h @@ -32,6 +32,7 @@ enum { MACHINE_NAME_TM1, MACHINE_NAME_TM4, MACHINE_NAME_RPI4, + MACHINE_NAME_RPI5, MACHINE_NAME_ODROID, MACHINE_NAME_VIM3, MACHINE_NAME_NIKE_M,