From 87cb761135387e19ae17c7af4e4020a12c63975a Mon Sep 17 00:00:00 2001 From: Kevin May Date: Mon, 11 Nov 2019 17:30:35 +0000 Subject: IVGCVSW-4115 Fix for armnn-driver-tests Capabilities failure * Add TensorQuant8SymmPerChannel to ArmnnDriverImpl::getCapabilities_1_2 * Add TensorQuant8Symm and TensorQuant8SymmPerChannel to Capabilities supported operands tests Signed-off-by: Kevin May Change-Id: Ifbc742c5562f243172d2f4e6a2f6a8f3b6a405ea --- 1.2/ArmnnDriverImpl.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to '1.2') diff --git a/1.2/ArmnnDriverImpl.cpp b/1.2/ArmnnDriverImpl.cpp index 7309c2a1..6ea9bc43 100644 --- a/1.2/ArmnnDriverImpl.cpp +++ b/1.2/ArmnnDriverImpl.cpp @@ -43,6 +43,11 @@ const char *g_OperandTypeTensorQuant8SymmPerformanceExecTime = const char *g_OperandTypeTensorQuant8SymmPerformancePowerUsage = "Armnn.operandTypeTensorQuant8SymmPerformance.powerUsage"; +const char *g_OperandTypeTensorQuant8SymmPerChannelPerformanceExecTime = + "Armnn.operandTypeTensorQuant8SymmPerChannelPerformance.execTime"; +const char *g_OperandTypeTensorQuant8SymmPerChannelPerformancePowerUsage = + "Armnn.operandTypeTensorQuant8SymmPerChannelPerformance.powerUsage"; + const char *g_OperandTypeTensorInt32PerformanceExecTime = "Armnn.operandTypeTensorInt32Performance.execTime"; const char *g_OperandTypeTensorInt32PerformancePowerUsage = "Armnn.operandTypeTensorInt32Performance.powerUsage"; @@ -274,6 +279,14 @@ Return ArmnnDriverImpl::getCapabilities_1_2(const armnn::IRuntimePtr& runt .powerUsage = ParseSystemProperty(g_OperandTypeTensorQuant16SymmPerformancePowerUsage, defaultValue) }); + update(&capabilities.operandPerformance, OperandType::TENSOR_QUANT8_SYMM_PER_CHANNEL, + { + .execTime = + ParseSystemProperty(g_OperandTypeTensorQuant8SymmPerChannelPerformanceExecTime, defaultValue), + .powerUsage = + ParseSystemProperty(g_OperandTypeTensorQuant8SymmPerChannelPerformancePowerUsage, defaultValue) + }); + update(&capabilities.operandPerformance, OperandType::TENSOR_INT32, { .execTime = ParseSystemProperty(g_OperandTypeTensorInt32PerformanceExecTime, defaultValue), -- cgit v1.2.1