diff options
| author | Nikhil Raj <nikhil.raj@arm.com> | 2021-04-02 22:04:39 +0100 |
|---|---|---|
| committer | Nikhil Raj <nikhil.raj@arm.com> | 2021-04-16 14:27:27 +0100 |
| commit | 6dd178f2395b34cfb360eabb0130c19ed258f5fa (patch) | |
| tree | 6814e4729bbd1e652d8b9c18c9db28f3bc2f8a8a /tests/ImageTensorGenerator | |
| parent | ed7fce413410d15c501ea52f9e6bfbbf71b3daf1 (diff) | |
| download | armnn-6dd178f2395b34cfb360eabb0130c19ed258f5fa.tar.gz | |
IVGCVSW-5720 Remove the Caffe Parser from ArmNN
Signed-off-by: Nikhil Raj <nikhil.raj@arm.com>
Change-Id: Ib00be204f549efa9aa5971ecf65c2dec4a10b10f
Diffstat (limited to 'tests/ImageTensorGenerator')
| -rw-r--r-- | tests/ImageTensorGenerator/ImageTensorGenerator.cpp | 8 | ||||
| -rw-r--r-- | tests/ImageTensorGenerator/ImageTensorGenerator.hpp | 9 |
2 files changed, 5 insertions, 12 deletions
diff --git a/tests/ImageTensorGenerator/ImageTensorGenerator.cpp b/tests/ImageTensorGenerator/ImageTensorGenerator.cpp index 754d980423..34dbe1e352 100644 --- a/tests/ImageTensorGenerator/ImageTensorGenerator.cpp +++ b/tests/ImageTensorGenerator/ImageTensorGenerator.cpp @@ -164,7 +164,7 @@ public: ("f,model-format", "Format of the intended model file that uses the images." "Different formats have different image normalization styles." - "Accepted values (caffe, tensorflow, tflite)", + "Accepted values (tensorflow, tflite)", cxxopts::value<std::string>(m_ModelFormat)) ("o,outfile", "Output raw tensor file path", @@ -235,11 +235,7 @@ public: unsigned int GetNewHeight() {return static_cast<unsigned int>(std::stoi(m_NewHeight));} SupportedFrontend GetModelFormat() { - if (m_ModelFormat == "caffe") - { - return SupportedFrontend::Caffe; - } - else if (m_ModelFormat == "tensorflow") + if (m_ModelFormat == "tensorflow") { return SupportedFrontend::TensorFlow; } diff --git a/tests/ImageTensorGenerator/ImageTensorGenerator.hpp b/tests/ImageTensorGenerator/ImageTensorGenerator.hpp index 4793f822fb..f2ee470a7a 100644 --- a/tests/ImageTensorGenerator/ImageTensorGenerator.hpp +++ b/tests/ImageTensorGenerator/ImageTensorGenerator.hpp @@ -24,14 +24,13 @@ struct NormalizationParameters enum class SupportedFrontend { - Caffe = 0, - TensorFlow = 1, - TFLite = 2, + TensorFlow = 0, + TFLite = 1, }; /** Get normalization parameters. * Note that different flavours of models and different model data types have different normalization methods. - * This tool currently only supports Caffe, TF and TFLite models + * This tool currently only supports TF and TFLite models * * @param[in] modelFormat One of the supported frontends * @param[in] outputType Output type of the image tensor, also the type of the intended model @@ -46,8 +45,6 @@ NormalizationParameters GetNormalizationParameters(const SupportedFrontend& mode normParams.stddev = { 1.0, 1.0, 1.0 }; switch (modelFormat) { - case SupportedFrontend::Caffe: - break; case SupportedFrontend::TensorFlow: case SupportedFrontend::TFLite: default: |