From 5ea9f31a18056cd79c6a57746f1627acaa1a1597 Mon Sep 17 00:00:00 2001
From: James Ward <james.ward@arm.com>
Date: Thu, 29 Oct 2020 16:19:02 +0000
Subject: 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
---
 src/armnn/test/CsvReaderTest.cpp | 130 ---------------------------------------
 1 file changed, 130 deletions(-)
 delete mode 100644 src/armnn/test/CsvReaderTest.cpp

(limited to 'src/armnn')

diff --git a/src/armnn/test/CsvReaderTest.cpp b/src/armnn/test/CsvReaderTest.cpp
deleted file mode 100644
index 96185c8408..0000000000
--- a/src/armnn/test/CsvReaderTest.cpp
+++ /dev/null
@@ -1,130 +0,0 @@
-//
-// Copyright © 2017 Arm Ltd. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-#include "CsvReader.hpp"
-#include "armnn/Optional.hpp"
-#include <Filesystem.hpp>
-
-#include <boost/test/unit_test.hpp>
-
-#include <iostream>
-#include <string>
-
-using namespace armnnUtils;
-
-namespace {
-struct TestHelper {
-
-    TestHelper()
-    {
-        BOOST_TEST_MESSAGE("setup fixture");
-    }
-
-    ~TestHelper()
-    {
-        BOOST_TEST_MESSAGE("teardown fixture");
-        TearDown();
-    }
-
-    std::string CreateTempCsvFile()
-    {
-        fs::path p = armnnUtils::Filesystem::NamedTempFile("Armnn-CreateTempCsvFileTest-TempFile.csv");
-        try
-        {
-            std::ofstream ofs{p};
-            ofs << "airplane, bicycle , bird , \"m,o,n,k,e,y\"\n";
-            ofs << "banana, shoe, \"ice\"";
-            ofs.close();
-        } catch (std::exception &e)
-        {
-            std::cerr << "Unable to write to file at location [" << p.c_str() << "] : " << e.what() << std::endl;
-            BOOST_TEST(false);
-        }
-
-        m_CsvFile = p;
-        return p.string();
-    }
-
-    int CheckStringsMatch(CsvRow &row, unsigned int index, std::string expectedValue)
-    {
-        return row.values.at(index).compare(expectedValue);
-    }
-
-    void TearDown()
-    {
-        RemoveCsvFile();
-    }
-
-    void RemoveCsvFile()
-    {
-        if (m_CsvFile)
-        {
-            try
-            {
-                fs::remove(m_CsvFile.value());
-            }
-            catch (std::exception &e)
-            {
-                std::cerr << "Unable to delete file [" << m_CsvFile.value() << "] : " << e.what() << std::endl;
-                BOOST_TEST(false);
-            }
-        }
-    }
-
-    armnn::Optional<fs::path> m_CsvFile;
-};
-}
-
-BOOST_AUTO_TEST_SUITE(CsvReaderTest)
-
-BOOST_FIXTURE_TEST_CASE(TestParseVector, TestHelper)
-{
-    CsvReader reader;
-    std::vector<std::string> csvStrings;
-    csvStrings.reserve(2);
-    csvStrings.push_back("airplane, automobile , bird , \"c,a,t\"");
-    csvStrings.push_back("banana, shoe, \"ice\"");
-
-    std::vector<CsvRow> row = reader.ParseVector(csvStrings);
-    CsvRow row1 = row[0];
-    CsvRow row2 = row[1];
-
-    BOOST_CHECK(row.size() == 2);
-
-    BOOST_CHECK(row1.values.size() == 4);
-    BOOST_CHECK(CheckStringsMatch(row1, 0, "airplane") == 0);
-    BOOST_CHECK(CheckStringsMatch(row1, 1, "automobile") == 0);
-    BOOST_CHECK(CheckStringsMatch(row1, 2, "bird") == 0);
-    BOOST_CHECK(CheckStringsMatch(row1, 3, "c,a,t") == 0);
-
-    BOOST_CHECK(row2.values.size() == 3);
-    BOOST_CHECK(CheckStringsMatch(row2, 0, "banana") == 0);
-    BOOST_CHECK(CheckStringsMatch(row2, 1, "shoe") == 0);
-    BOOST_CHECK(CheckStringsMatch(row2, 2, "ice") == 0);
-}
-
-BOOST_FIXTURE_TEST_CASE(TestLoadingFileFromDisk, TestHelper)
-{
-    CsvReader reader;
-    std::string theFilePath = TestHelper::CreateTempCsvFile();
-
-    std::vector<CsvRow> row = reader.ParseFile(theFilePath);
-    CsvRow row1 = row[0];
-    CsvRow row2 = row[1];
-
-    BOOST_CHECK(row.size() == 2);
-
-    BOOST_CHECK(row1.values.size() == 4);
-    BOOST_CHECK(CheckStringsMatch(row1, 0, "airplane") == 0);
-    BOOST_CHECK(CheckStringsMatch(row1, 1, "bicycle") == 0);
-    BOOST_CHECK(CheckStringsMatch(row1, 2, "bird") == 0);
-    BOOST_CHECK(CheckStringsMatch(row1, 3, "m,o,n,k,e,y") == 0);
-
-    BOOST_CHECK(row2.values.size() == 3);
-    BOOST_CHECK(CheckStringsMatch(row2, 0, "banana") == 0);
-    BOOST_CHECK(CheckStringsMatch(row2, 1, "shoe") == 0);
-    BOOST_CHECK(CheckStringsMatch(row2, 2, "ice") == 0);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-- 
cgit v1.2.1