diff options
Diffstat (limited to 'tests/NetworkExecutionUtils')
-rw-r--r-- | tests/NetworkExecutionUtils/NetworkExecutionUtils.cpp | 28 | ||||
-rw-r--r-- | tests/NetworkExecutionUtils/NetworkExecutionUtils.hpp | 5 |
2 files changed, 31 insertions, 2 deletions
diff --git a/tests/NetworkExecutionUtils/NetworkExecutionUtils.cpp b/tests/NetworkExecutionUtils/NetworkExecutionUtils.cpp index 2afd941636..d902d23d86 100644 --- a/tests/NetworkExecutionUtils/NetworkExecutionUtils.cpp +++ b/tests/NetworkExecutionUtils/NetworkExecutionUtils.cpp @@ -52,6 +52,16 @@ auto ParseDataArray<armnn::DataType::QAsymmU8>(std::istream& stream) [](const std::string& s) { return armnn::numeric_cast<uint8_t>(std::stoi(s)); }); } + +template<> +auto ParseDataArray<armnn::DataType::QSymmS8>(std::istream& stream) +{ + return ParseArrayImpl<int8_t>(stream, + [](const std::string& s) { return armnn::numeric_cast<int8_t>(std::stoi(s)); }); +} + + + template<> auto ParseDataArray<armnn::DataType::QAsymmU8>(std::istream& stream, const float& quantizationScale, @@ -130,6 +140,15 @@ void TensorPrinter::operator()(const std::vector<uint8_t>& values) } } +void TensorPrinter::operator()(const std::vector<int8_t>& values) +{ + ForEachValue(values, [](int8_t value) + { + printf("%d ", value); + }); + WriteToFile(values); +} + void TensorPrinter::operator()(const std::vector<int>& values) { ForEachValue(values, [](int value) @@ -170,7 +189,8 @@ void TensorPrinter::WriteToFile(const std::vector<T>& values) } } -using TContainer = mapbox::util::variant<std::vector<float>, std::vector<int>, std::vector<unsigned char>>; +using TContainer = + mapbox::util::variant<std::vector<float>, std::vector<int>, std::vector<unsigned char>, std::vector<int8_t>>; using QuantizationParams = std::pair<float, int32_t>; void PopulateTensorWithData(TContainer& tensorData, @@ -212,6 +232,12 @@ void PopulateTensorWithData(TContainer& tensorData, ParseDataArray<armnn::DataType::Signed32>(inputTensorFile) : GenerateDummyTensorData<armnn::DataType::Signed32>(numElements); } + else if (dataTypeStr.compare("qsymms8") == 0) + { + tensorData = readFromFile ? + ParseDataArray<armnn::DataType::QSymmS8>(inputTensorFile) : + GenerateDummyTensorData<armnn::DataType::QSymmS8>(numElements); + } else if (dataTypeStr.compare("qasymm8") == 0) { tensorData = readFromFile ? diff --git a/tests/NetworkExecutionUtils/NetworkExecutionUtils.hpp b/tests/NetworkExecutionUtils/NetworkExecutionUtils.hpp index 742f968a7a..d92c17c5e5 100644 --- a/tests/NetworkExecutionUtils/NetworkExecutionUtils.hpp +++ b/tests/NetworkExecutionUtils/NetworkExecutionUtils.hpp @@ -34,6 +34,8 @@ struct TensorPrinter void operator()(const std::vector<int>& values); + void operator()(const std::vector<int8_t>& values); + private: template<typename Container, typename Delegate> void ForEachValue(const Container& c, Delegate delegate); @@ -48,7 +50,8 @@ private: bool m_DequantizeOutput; }; -using TContainer = mapbox::util::variant<std::vector<float>, std::vector<int>, std::vector<unsigned char>>; +using TContainer = + mapbox::util::variant<std::vector<float>, std::vector<int>, std::vector<unsigned char>, std::vector<int8_t>>; using QuantizationParams = std::pair<float, int32_t>; void PopulateTensorWithData(TContainer& tensorData, |