From 81beae3a870004795275e9266bc43d845b9f78db Mon Sep 17 00:00:00 2001 From: Matthew Sloyan Date: Tue, 13 Jul 2021 19:46:11 +0100 Subject: IVGCVSW-6119 ConstTensorsAsInput: FullyConnected * Constant weights and biases are now stored as Constant layers. * Updated Serializer, Deserializer and unit tests to reflect this. * Updated TfLiteDelegate, TfLiteParser and OnnxParser. * Updated Schema with IsConstant and ConstantTensorsAsInputs. * Updated Ref backend to handle constant weights and bias as inputs rather than reading from member variables. * Added dynamic or constant input EndToEnd tests. !android-nn-driver:5959 Signed-off-by: Matthew Sloyan Change-Id: Ibf3cf437df1100e4b322b0d303c575c6339f9696 --- delegate/src/test/FullyConnectedTest.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'delegate/src/test') diff --git a/delegate/src/test/FullyConnectedTest.cpp b/delegate/src/test/FullyConnectedTest.cpp index 3bea250988..c300bc72bf 100644 --- a/delegate/src/test/FullyConnectedTest.cpp +++ b/delegate/src/test/FullyConnectedTest.cpp @@ -34,7 +34,7 @@ void FullyConnectedFp32Test(std::vector& backends, bool consta constantWeights); } -void FullyConnectedActicationTest(std::vector& backends, bool constantWeights = true) +void FullyConnectedActivationTest(std::vector& backends, bool constantWeights = true) { std::vector inputTensorShape { 1, 4, 1, 1 }; std::vector weightsTensorShape { 1, 4 }; @@ -106,7 +106,7 @@ TEST_CASE ("FullyConnected_Int8_GpuAcc_Test") TEST_CASE ("FullyConnected_Activation_GpuAcc_Test") { std::vector backends = { armnn::Compute::GpuAcc }; - FullyConnectedActicationTest(backends); + FullyConnectedActivationTest(backends); } } // End of TEST_SUITE("FullyConnected_GpuAccTests") @@ -129,7 +129,7 @@ TEST_CASE ("FullyConnected_Int8_CpuAcc_Test") TEST_CASE ("FullyConnected_Activation_CpuAcc_Test") { std::vector backends = { armnn::Compute::CpuAcc }; - FullyConnectedActicationTest(backends); + FullyConnectedActivationTest(backends); } } // End of TEST_SUITE("FullyConnected_CpuAccTests") @@ -152,7 +152,7 @@ TEST_CASE ("FullyConnected_Int8_CpuRef_Test") TEST_CASE ("FullyConnected_Activation_CpuRef_Test") { std::vector backends = { armnn::Compute::CpuRef }; - FullyConnectedActicationTest(backends); + FullyConnectedActivationTest(backends); } TEST_CASE ("FullyConnected_Weights_As_Inputs_FP32_CpuRef_Test") @@ -170,7 +170,7 @@ TEST_CASE ("FullyConnected_Weights_As_Inputs_Int8_CpuRef_Test") TEST_CASE ("FullyConnected_Weights_As_Inputs_Activation_CpuRef_Test") { std::vector backends = { armnn::Compute::CpuRef }; - FullyConnectedActicationTest(backends, false); + FullyConnectedActivationTest(backends, false); } } // End of TEST_SUITE("FullyConnected_CpuRefTests") -- cgit v1.2.1