From 07d58c77e174a8e041c1facc61637e85c6cc0bf6 Mon Sep 17 00:00:00 2001 From: keidav01 Date: Tue, 26 Feb 2019 11:57:39 +0000 Subject: IVGCVSW-2429 Add Detection PostProcess Parser to TensorFlow Lite Parser * Added additional custom option use_regular_nms to JSON string * Renamed use_regular_non_max_suppression to use_regular_nms in parser Change-Id: I5431eabade6337f6f8c3372670862e32e9cda63c Signed-off-by: keidav01 --- src/armnnTfLiteParser/TfLiteParser.cpp | 4 ++-- .../test/DetectionPostProcess.cpp | 27 ++++++++++------------ 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/armnnTfLiteParser/TfLiteParser.cpp b/src/armnnTfLiteParser/TfLiteParser.cpp index bc6316ce7e..cd0e9214c2 100644 --- a/src/armnnTfLiteParser/TfLiteParser.cpp +++ b/src/armnnTfLiteParser/TfLiteParser.cpp @@ -1771,9 +1771,9 @@ void TfLiteParser::ParseDetectionPostProcess(size_t subgraphIndex, size_t operat desc.m_ScaleX = m["x_scale"].AsFloat(); desc.m_ScaleY = m["y_scale"].AsFloat(); - if (!(m["use_regular_non_max_suppression"].IsNull())) + if (!(m["use_regular_nms"].IsNull())) { - desc.m_UseRegularNms = m["use_regular_non_max_suppression"].AsBool(); + desc.m_UseRegularNms = m["use_regular_nms"].AsBool(); } if (!(m["detections_per_class"].IsNull())) { diff --git a/src/armnnTfLiteParser/test/DetectionPostProcess.cpp b/src/armnnTfLiteParser/test/DetectionPostProcess.cpp index 4f748edfd7..3c602937ce 100644 --- a/src/armnnTfLiteParser/test/DetectionPostProcess.cpp +++ b/src/armnnTfLiteParser/test/DetectionPostProcess.cpp @@ -19,7 +19,7 @@ struct DetectionPostProcessFixture : ParserFlatbuffersFixture { /* The following values were used for the custom_options: - use_regular_non_max_suppression = true + use_regular_nms = true max_classes_per_detection = 1 nms_score_threshold = 0.0 nms_iou_threshold = 0.5 @@ -112,20 +112,17 @@ struct DetectionPostProcessFixture : ParserFlatbuffersFixture "outputs": [3, 4, 5, 6], "builtin_options_type": 0, "custom_options": [ - 109, 97, 120, 95, 100, 101, 116, 101, 99, 116, 105, 111, 110, 115, 0, 109, 97, - 120, 95, 99, 108, 97, 115, 115, 101, 115, 95, 112, 101, 114, 95, 100, 101, 116, - 101, 99, 116, 105, 111, 110, 0, 110, 109, 115, 95, 115, 99, 111, 114, 101, 95, - 116, 104, 114, 101, 115, 104, 111, 108, 100, 0, 110, 109, 115, 95, 105, 111, 117, - 95, 116, 104, 114, 101, 115, 104, 111, 108, 100, 0, 110, 117, 109, 95, 99, 108, 97, - 115, 115, 101, 115, 0, 104, 95, 115, 99, 97, 108, 101, 0, 119, 95, 115, 99, 97, - 108, 101, 0, 120, 95, 115, 99, 97, 108, 101, 0, 121, 95, 115, 99, 97, 108, 101, 0, - 117, 115, 101, 95, 114, 101, 103, 117, 108, 97, 114, 95, 110, 111, 110, 95, 109, 97, - 120, 95, 115, 117, 112, 112, 114, 101, 115, 115, 105, 111, 110, 0, 100, 101, 116, - 101, 99, 116, 105, 111, 110, 115, 95, 112, 101, 114, 95, 99, 108, 97, 115, 115, 0, - 11, 22, 87, 164, 180, 120, 141, 104, 61, 86, 79, 72, 11, 0, 0, 0, 1, 0, 0, 0, 11, 0, - 0, 0, 1, 0, 0, 0, 0, 0, 160, 64, 1, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 63, 0, 0, 0, 0, 2, - 0, 0, 0, 1, 0, 0, 0, 0, 0, 160, 64, 0, 0, 32, 65, 0, 0, 32, 65, 6, 14, 6, 6, 14, 14, - 6, 106, 14, 14, 14, 55, 38, 1 + 109, 97, 120, 95, 100, 101, 116, 101, 99, 116, 105, 111, 110, 115, 0, 109, 97, 120, + 95, 99, 108, 97, 115, 115, 101, 115, 95, 112, 101, 114, 95, 100, 101, 116, 101, 99, + 116, 105, 111, 110, 0, 110, 109, 115, 95, 115, 99, 111, 114, 101, 95, 116, 104, 114, + 101, 115, 104, 111, 108, 100, 0, 110, 109, 115, 95, 105, 111, 117, 95, 116, 104, 114, + 101, 115, 104, 111, 108, 100, 0, 110, 117, 109, 95, 99, 108, 97, 115, 115, 101, 115, + 0, 104, 95, 115, 99, 97, 108, 101, 0, 119, 95, 115, 99, 97, 108, 101, 0, 120, 95, 115, + 99, 97, 108, 101, 0, 121, 95, 115, 99, 97, 108, 101, 0, 117, 115, 101, 95, 114, 101, + 103, 117, 108, 97, 114, 95, 110, 109, 115, 0, 10, 49, 126, 142, 82, 103, 66, 23, 48, + 41, 34, 0, 0, 12, 0, 0, 0, 1, 0, 0, 0, 10, 0, 0, 0, 0, 0, 160, 64, 1, 0, 0, 0, 3, 0, + 0, 0, 0, 0, 0, 63, 0, 0, 0, 0, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0, 160, 64, 0, 0, 32, 65, 0, + 0, 32, 65, 14, 6, 6, 14, 14, 6, 106, 14, 14, 14, 50, 38, 1 ], "custom_options_format": "FLEXBUFFERS" }] -- cgit v1.2.1