diff options
Diffstat (limited to 'tests/ImageTensorGenerator/ImageTensorGenerator.cpp')
| -rw-r--r-- | tests/ImageTensorGenerator/ImageTensorGenerator.cpp | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/tests/ImageTensorGenerator/ImageTensorGenerator.cpp b/tests/ImageTensorGenerator/ImageTensorGenerator.cpp index a2110f9cf3..b4432558c4 100644 --- a/tests/ImageTensorGenerator/ImageTensorGenerator.cpp +++ b/tests/ImageTensorGenerator/ImageTensorGenerator.cpp @@ -164,15 +164,16 @@ public: ("f,model-format", "Format of the intended model file that uses the images." "Different formats have different image normalization styles." + "If unset, defaults to tflite." "Accepted value (tflite)", - cxxopts::value<std::string>(m_ModelFormat)) + cxxopts::value<std::string>(m_ModelFormat)->default_value("tflite")) ("o,outfile", "Output raw tensor file path", cxxopts::value<std::string>(m_OutputFileName)) ("z,output-type", "The data type of the output tensors." "If unset, defaults to \"float\" for all defined inputs. " - "Accepted values (float, int or qasymm8)", + "Accepted values (float, int, qasymms8 or qasymmu8)", cxxopts::value<std::string>(m_OutputType)->default_value("float")) ("new-width", "Resize image to new width. Keep original width if unspecified", @@ -254,10 +255,14 @@ public: { return armnn::DataType::Signed32; } - else if (m_OutputType == "qasymm8") + else if (m_OutputType == "qasymm8" || m_OutputType == "qasymmu8") { return armnn::DataType::QAsymmU8; } + else if (m_OutputType == "qasymms8") + { + return armnn::DataType::QAsymmS8; + } else { throw armnn::Exception("Unsupported input type" + m_OutputType); @@ -292,7 +297,8 @@ int main(int argc, char* argv[]) const unsigned int batchSize = 1; const armnn::DataLayout outputLayout(cmdline.GetLayout()); - using TContainer = mapbox::util::variant<std::vector<float>, std::vector<int>, std::vector<uint8_t>>; + using TContainer = mapbox::util::variant<std::vector<float>, std::vector<int>, std::vector<uint8_t>, + std::vector<int8_t>>; std::vector<TContainer> imageDataContainers; const NormalizationParameters& normParams = GetNormalizationParameters(modelFormat, outputType); try @@ -307,6 +313,10 @@ int main(int argc, char* argv[]) imageDataContainers.push_back(PrepareImageTensor<uint8_t>( imagePath, newWidth, newHeight, normParams, batchSize, outputLayout)); break; + case armnn::DataType::QAsymmS8: + imageDataContainers.push_back(PrepareImageTensor<int8_t>( + imagePath, newWidth, newHeight, normParams, batchSize, outputLayout)); + break; case armnn::DataType::Float32: default: imageDataContainers.push_back(PrepareImageTensor<float>( |