commit 5ea9f31a18056cd79c6a57746f1627acaa1a1597
author James Ward <james.ward@arm.com> Thu Oct 29 16:19:02 2020 +0000
committer James Ward <james.ward@arm.com> Thu Oct 29 21:30:43 2020 +0000
tree d4e1ba148445b0cb3cea4741259f3efe50a6ac7b
parent 67e95f2aebc827f2e3c571385b9e623f09a65141

IVGCVSW-5468 Rewrite QuantizationDataSet.cpp to avoid use of CsvReader

* Remove armnnUtils/CsvReader and usage
* Remove armnn/CsvReaderTest and usage
* Replace functionality in QuantizationDataSet.cpp

Signed-off-by: James Ward <james.ward@arm.com>
Change-Id: I7213904482afa93ae6d607aa5e69117c8c34ea81

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index abe9bf1..a6d88e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,8 +59,6 @@
     src/armnnUtils/LeakChecking.hpp
     src/armnnUtils/ModelAccuracyChecker.cpp
     src/armnnUtils/ModelAccuracyChecker.hpp
-    src/armnnUtils/CsvReader.cpp
-    src/armnnUtils/CsvReader.hpp
     src/armnnUtils/FloatingPointConverter.cpp
     src/armnnUtils/VerificationHelpers.hpp
     src/armnnUtils/VerificationHelpers.cpp
@@ -177,6 +175,7 @@
     target_include_directories(armnnQuantizer PRIVATE include/armnnDeserializer)
     target_include_directories(armnnQuantizer PRIVATE src/armnnUtils)
     target_include_directories(armnnQuantizer PRIVATE src/armnn)
+    target_include_directories(armnnQuantizer PRIVATE third-party)
 
     include_directories(SYSTEM "${FLATBUFFERS_INCLUDE_PATH}")
     set_target_properties(armnnQuantizer PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
@@ -626,7 +625,6 @@
         src/armnn/test/ConstTensorLayerVisitor.hpp
         src/armnn/test/ConstTensorLayerVisitor.cpp
         src/armnn/test/CreateWorkload.hpp
-        src/armnn/test/CsvReaderTest.cpp
         src/armnn/test/EndToEndTest.cpp
         src/armnn/test/ExecutionFrameTest.cpp
         src/armnn/test/FloatingPointConverterTest.cpp