From da824cc0211beb69b6e94a8b1e5c76e8c4eda3a1 Mon Sep 17 00:00:00 2001
From: Matthew Sloyan <matthew.sloyan@arm.com>
Date: Mon, 10 Oct 2022 12:43:20 +0100
Subject: IVGCVSW-7273 Fix TOSA Serialization Library integration

 * half.hpp is now required as an include for numpy_utils.h
 * DType_FLOAT was changed to DType_FP32.
 * DType_FP16 support has been added to ArmNNToDType utility function.

Signed-off-by: Matthew Sloyan <matthew.sloyan@arm.com>
Change-Id: Ib25be9a5abfbd9db2a90b3e42d592259a6df0e01
---
 src/backends/tosaCommon/CMakeLists.txt                         | 1 +
 src/backends/tosaCommon/operatorMappings/TosaOperatorUtils.hpp | 5 +++--
 src/backends/tosaCommon/test/TosaOperatorMappingTests.cpp      | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/backends/tosaCommon')

diff --git a/src/backends/tosaCommon/CMakeLists.txt b/src/backends/tosaCommon/CMakeLists.txt
index 61434edc96..83737d3bd3 100644
--- a/src/backends/tosaCommon/CMakeLists.txt
+++ b/src/backends/tosaCommon/CMakeLists.txt
@@ -4,6 +4,7 @@
 #
 
 include_directories(SYSTEM ${FLATBUFFERS_INCLUDE_PATH})
+include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/third-party/half)
 include_directories(SYSTEM ${TOSA_SERIALIZATION_LIB_INCLUDE})
 
 list(APPEND armnnTosaBackend_sources
diff --git a/src/backends/tosaCommon/operatorMappings/TosaOperatorUtils.hpp b/src/backends/tosaCommon/operatorMappings/TosaOperatorUtils.hpp
index b887721648..e11f293b12 100644
--- a/src/backends/tosaCommon/operatorMappings/TosaOperatorUtils.hpp
+++ b/src/backends/tosaCommon/operatorMappings/TosaOperatorUtils.hpp
@@ -19,9 +19,10 @@ DType ArmNNToDType(const DataType& type)
     switch (type)
     {
         case DataType::Float16:
-        case DataType::Float32:
         case DataType::BFloat16:
-            return DType_FLOAT;
+            return DType_FP16;
+        case DataType::Float32:
+            return DType_FP32;
         case DataType::QAsymmU8:
             return DType_UINT8;
         case DataType::QSymmS8:
diff --git a/src/backends/tosaCommon/test/TosaOperatorMappingTests.cpp b/src/backends/tosaCommon/test/TosaOperatorMappingTests.cpp
index a2949d61ac..f4435bdf42 100644
--- a/src/backends/tosaCommon/test/TosaOperatorMappingTests.cpp
+++ b/src/backends/tosaCommon/test/TosaOperatorMappingTests.cpp
@@ -18,7 +18,7 @@ void AssertTosaOneToOneMappingBasicBlock(TosaSerializationBasicBlock* basicBlock
                                          uint32_t numOutputs,
                                          Op tosaOp,
                                          std::string operatorString,
-                                         DType dataType = DType_FLOAT)
+                                         DType dataType = DType_FP32)
 {
     std::string blockStr = operatorString + "_block_";
     CHECK(basicBlock->GetName().find(blockStr)  != std::string::npos);
-- 
cgit v1.2.1