commit ad323af0e9b47e53d366b85cdf74927f88748d40
author Narumol Prangnawarat <narumol.prangnawarat@arm.com> Fri Sep 29 17:00:38 2023 +0100
committer Narumol Prangnawarat <narumol.prangnawarat@arm.com> Tue Oct 03 09:40:37 2023 +0000
tree c4251570a54ad9c123e4946bc1c69cbdbbf08253
parent edefbc282556021b7ea4db5d88d4cce2f9782b15

IVGCVSW-8033 Update Arm NN to use TOSA v0.60.0

Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
Change-Id: If1504534fbd7d6b317fdb93083dcdbd8b827764b

src/backends/tosaCommon/operatorMappings/Conv2dOperator.cpp

diff --git a/src/backends/tosaCommon/operatorMappings/Conv2dOperator.cpp b/src/backends/tosaCommon/operatorMappings/Conv2dOperator.cpp
index a7af083..fdd6ca4 100644
--- a/src/backends/tosaCommon/operatorMappings/Conv2dOperator.cpp
+++ b/src/backends/tosaCommon/operatorMappings/Conv2dOperator.cpp
@@ -114,7 +114,7 @@
                                static_cast<int>(conv2dDescriptor->m_StrideX)};
     std::vector<int> dilation = {static_cast<int>(conv2dDescriptor->m_DilationY),
                                  static_cast<int>(conv2dDescriptor->m_DilationX)};
-    TosaConvAttribute attribute(pad, stride, dilation, 0, 0, ArmNNToDType(inputs[0]->GetDataType()));
+    TosaConvAttribute attribute(pad, stride, dilation, 0, 0);
 
     auto* op = new TosaSerializationOperator(Op_CONV2D,
                                              Attribute_ConvAttribute,
@@ -126,6 +126,7 @@
     // operatorInputNames/operatorOutputNames ends up being the same as
     // blockInputNames/blockOutputNames for one-to-one ArmNN to TOSA mappings
     return new TosaSerializationBasicBlock(blockName,     // name
+                                           mainName,      // region name
                                            operators,     // operators
                                            tensors,       // tensors
                                            inputNames,    // inputs