IVGCVSW-6124 ConstTensorsAsInput: Conv2d - FrontEnd

 * Update Front-end and Tools.
 * Updated Serializer, Deserializer and unit tests to reflect this.
 * Updated TfLiteDelegate, TfLiteParser and OnnxParser.
 * Updated Ref.
 * Fixed resulting Neon / CL tests
 * Unified optimizers for conv2d ops
 * Optimizer Fix - Fp32ToBf16
 * Partial implementation for ACL backends to fix VTS failures

!android-nn-driver:7477

Signed-off-by: Keith Davis <keith.davis@arm.com>
Change-Id: I5fb18877f7ee32643e15a9818945356274bb401b

1 files changed, 9 insertions, 5 deletions

diff --git a/src/armnn/Graph.cpp b/src/armnn/Graph.cpp
index c1cec482b6..8500e529b0 100644
--- a/src/armnn/Graph.cpp
+++ b/src/armnn/Graph.cpp
@@ -603,16 +603,19 @@ void Graph::ConstructErrorMessageForUnconnectedInputs(Layer* const layer,
     bool noWeightsAndBias = false;
 
     if ((layer->GetType() == armnn::LayerType::FullyConnected ||
+         layer->GetType() == armnn::LayerType::Convolution2d  ||
          layer->GetType() == armnn::LayerType::Convolution3d  ||
          layer->GetType() == armnn::LayerType::DepthwiseConvolution2d) && slotIndex > 0)
     {
+        message << std::endl;
+
         // If weights are not set and is bias enabled, also check if bias is set
         if (slotIndex == 1 && layer->GetNumInputSlots() == 3)
         {
             const IOutputSlot* biasSource = layer->GetInputSlot(2).GetConnectedOutputSlot();
             if (biasSource == NULL)
             {
-                message << layer->GetName() << " layer weights and bias not set: ";
+                message << "Weights and bias layers not set." << std::endl;
                 noWeightsAndBias = true;
             }
         }
@@ -622,11 +625,11 @@ void Graph::ConstructErrorMessageForUnconnectedInputs(Layer* const layer,
         {
             if (slotIndex == 1)
             {
-                message << layer->GetName() << " layer weights not set: ";
+                message << "Weights layer not set." << std::endl;
             }
             else
             {
-                message << layer->GetName() << " layer bias not set: ";
+                message << "Bias layer not set." << std::endl;
             }
         }
     }
@@ -634,9 +637,10 @@ void Graph::ConstructErrorMessageForUnconnectedInputs(Layer* const layer,
     std::string slotString = noWeightsAndBias ? "1 & 2" : std::to_string(slotIndex);
     message << "Input slot(s) "
             << slotString
-            << " not connected to an output slot on "
+            << " for "
             << GetLayerTypeAsCString(layer->GetType())
-            << " layer "
+            << " not connected to an output slot. " << std::endl
+            << "Layer name: "
             << std::quoted(layer->GetName());
     throw LayerValidationException(message.str());
 }