From bbe4c2504b542ab0476ca132906ca5d30dc57cf8 Mon Sep 17 00:00:00 2001 From: Alexander Bengtsson Date: Mon, 31 Mar 2025 10:02:12 +0200 Subject: [PATCH] MLBEDSW-10628: Handle OpType::None in supported-operators - Fix assert in TfLiteSupportedOperators when networks contain unmapped opTypes. Change-Id: Ia17324b288c24aeecc158cb1e2a7bfafe29f6021 Signed-off-by: Alexander Bengtsson --- ethosu/regor/tflite/tflite_supported_operators.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ethosu/regor/tflite/tflite_supported_operators.cpp b/ethosu/regor/tflite/tflite_supported_operators.cpp index e5454b26..6f472221 100644 --- a/ethosu/regor/tflite/tflite_supported_operators.cpp +++ b/ethosu/regor/tflite/tflite_supported_operators.cpp @@ -727,13 +727,19 @@ void TfLiteSupportedOperators::Failure(const Operation *op, const std::string &m assert(op); auto ofmConn = op->Output(TensorUsage::OFM); const char *name = "N/A"; + OpType opType = op->Type(); if ( ofmConn && ofmConn->tensor ) { name = ofmConn->tensor->Name().c_str(); } - auto tfLiteType = TfLiteMapping::OpTypeToBuiltinOperator(op->Type()); + std::string type = OpTypeToString(op->Type()); + if ( opType != OpType::None ) + { + auto tfLiteType = TfLiteMapping::OpTypeToBuiltinOperator(opType); + type = TfLiteMapping::BuiltinOperatorToString(tfLiteType); + } assert(message.size() || constraint.size()); - LOG_WARN("\nWarning (supported operators) operator:{} ofm:{}\n", TfLiteMapping::BuiltinOperatorToString(tfLiteType), name); + LOG_WARN("\nWarning (supported operators) operator:{} ofm:{}\n", std::move(type), name); if ( message.size() ) { LOG_WARN("Reason: {}\n", message); -- GitLab