commit 43a799ca3ab5ffb60a381172dba2536ebb87708a
author Kevin May <kevin.may@arm.com> Fri Feb 08 16:31:42 2019 +0000
committer Saoirse Stewart Arm <saoirse.stewart@arm.com> Mon Feb 11 09:25:03 2019 +0000
tree e50a86c603003f75ef56041809ed7517a3a8772b
parent c602f29d57f34b6bf0805d379b2174667d8bf52f

IVGCVSW-2581 Create Deserializer

	* Add deserialize parser for input, output and add layers
	* Add Unit Tests for simple network

Change-Id: Ia0e2a234896bbe401ed0da5f18c065cb5df51bfb
Signed-off-by: Kevin May <kevin.may@arm.com>
Signed-off-by: Saoirse Stewart <saoirse.stewart@arm.com>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8d63b9..ea0f2c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -159,6 +159,9 @@
     set(armnn_serializer_sources)
     list(APPEND armnn_serializer_sources
         src/armnnSerializer/Schema_generated.h
+        include/armnnDeserializeParser/IDeserializeParser.hpp
+        src/armnnDeserializeParser/DeserializeParser.hpp
+        src/armnnDeserializeParser/DeserializeParser.cpp
         )
 
     add_library_ex(armnnSerializer SHARED ${armnn_serializer_sources})
@@ -539,6 +542,17 @@
             )
     endif()
 
+    if(BUILD_ARMNN_SERIALIZER)
+        enable_language(ASM)
+        list(APPEND unittest_sources
+                src/armnnSerializer/Schema_generated.h
+                src/armnnDeserializeParser/test/DeserializeAdd.cpp
+                src/armnnDeserializeParser/test/ParserFlatbuffersSerializeFixture.hpp
+                src/armnnDeserializeParser/test/SchemaSerialize.s
+                )
+        set_source_files_properties(src/armnnDeserializeParser/test/SchemaSerialize.s PROPERTIES COMPILE_FLAGS "-x assembler-with-cpp")
+    endif()
+
     if(BUILD_ONNX_PARSER)
         list(APPEND unittest_sources
             src/armnnOnnxParser/test/Constructor.cpp
@@ -567,6 +581,10 @@
     target_include_directories(UnitTests PRIVATE src/armnnUtils)
     target_include_directories(UnitTests PRIVATE src/backends)
 
+    if(BUILD_ARMNN_SERIALIZER)
+        target_include_directories(UnitTests SYSTEM PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/src/armnnSerializer")
+    endif()
+
     if(BUILD_TF_LITE_PARSER)
         target_include_directories(UnitTests SYSTEM PRIVATE "${TF_LITE_SCHEMA_INCLUDE_PATH}")
     endif()
@@ -594,6 +612,10 @@
         target_link_libraries(UnitTests armnnCaffeParser)
     endif()
 
+    if(BUILD_ARMNN_SERIALIZER)
+        target_link_libraries(UnitTests armnnSerializer)
+    endif()
+
     if(BUILD_TF_LITE_PARSER)
         target_link_libraries(UnitTests armnnTfLiteParser)
     endif()