commit 59e15b00ea51fee4baeea750dc11ab1952dfab1d
author Nina Drozd <nina.drozd@arm.com> Thu Apr 25 15:45:20 2019 +0100
committer Nina Drozd <nina.drozd@arm.com> Fri May 03 14:43:50 2019 +0100
tree 97e6c9230bf153d404ad3c3e0e285acdb0b6232d
parent 8b194fbe79d44cba566ad8b508d1c8902987ae3c

IVGCVSW-2834 Add dynamic quantization via datasets

* Add QuantizationDataSet class for quantization data parsed from CSV file
* Add QuantizationInput for retrieving quantization data for each layer ID
* Add unit tests for command line processor and QuantizationDataSet

Change-Id: Iaf0a747b5f25a59a766ac04f7158e8cb7909d179
Signed-off-by: Nina Drozd <nina.drozd@arm.com>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6dc1a1f..34dbd91 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -138,12 +138,37 @@
         message(ERROR, "In order to build the ArmNN Quantization Tool you must set BUILD_ARMNN_SERIALIZER = YES")
     endif()
 
-    add_executable_ex(ArmnnQuantizer
+    set(armnn_quantizer_sources)
+    list(APPEND armnn_quantizer_sources
+        src/armnnQuantizer/QuantizationDataSet.hpp
+        src/armnnQuantizer/QuantizationDataSet.cpp
+        src/armnnQuantizer/QuantizationInput.hpp
+        src/armnnQuantizer/QuantizationInput.cpp
         src/armnnQuantizer/CommandLineProcessor.hpp
         src/armnnQuantizer/CommandLineProcessor.cpp
+        )
+
+    add_library_ex(armnnQuantizer SHARED ${armnn_quantizer_sources})
+
+    target_include_directories(armnnQuantizer PRIVATE include/armnnDeserializer)
+    target_include_directories(armnnQuantizer PRIVATE src/armnnUtils)
+    target_include_directories(armnnQuantizer PRIVATE src/armnn)
+
+    include_directories(SYSTEM "${FLATBUFFERS_INCLUDE_PATH}")
+    set_target_properties(armnnQuantizer PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
+
+    target_link_libraries(armnnQuantizer
+            ${Boost_SYSTEM_LIBRARY}
+            ${Boost_PROGRAM_OPTIONS_LIBRARY}
+            ${Boost_FILESYSTEM_LIBRARY}
+            ${Boost_LOG_LIBRARY}
+            ${Boost_THREAD_LIBRARY} )
+
+    add_executable_ex(ArmnnQuantizer
         src/armnnQuantizer/ArmNNQuantizerMain.cpp)
 
     target_include_directories(ArmnnQuantizer PRIVATE include/armnnDeserializer)
+    target_include_directories(ArmnnQuantizer PRIVATE src/armnn)
 
     target_link_libraries(ArmnnQuantizer
             ${Boost_SYSTEM_LIBRARY}
@@ -153,8 +178,10 @@
             ${Boost_THREAD_LIBRARY} )
 
     target_link_libraries(ArmnnQuantizer
+            armnnQuantizer
             armnnSerializer
             armnn
+            armnnUtils
             ${FLATBUFFERS_LIBRARY})
 
     if(Threads_FOUND AND (NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL Android)))
@@ -554,6 +581,12 @@
             )
     endif()
 
+    if(BUILD_ARMNN_QUANTIZER)
+        list(APPEND unittest_sources
+             src/armnnQuantizer/test/QuantizationDataSetTests.cpp
+             )
+    endif()
+
     if(BUILD_ARMNN_SERIALIZER)
         enable_language(ASM)
         list(APPEND unittest_sources
@@ -652,6 +685,12 @@
         target_link_libraries(UnitTests armnnSerializer)
     endif()
 
+    if(BUILD_ARMNN_QUANTIZER)
+        target_include_directories(UnitTests SYSTEM PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/src/armnnQuantizer)
+        target_include_directories(UnitTests SYSTEM PRIVATE "${FLATBUFFERS_INCLUDE_PATH}")
+        target_link_libraries(UnitTests armnnQuantizer armnnSerializer)
+    endif()
+
     if(BUILD_ONNX_PARSER)
         target_link_libraries(UnitTests armnnOnnxParser)
     endif()