IVGCVSW-5744 Remove Tensorflow, Caffe and Quantizer from documentation
* Remove from .md files and Doxygen
* Remove from armnn/docker build
* Remove Tensorflow model format from ExecuteNetworkParams
* Remove Tensorflow model format from ImageTensorGenerator
Signed-off-by: Kevin May <kevin.may@arm.com>
Change-Id: Id6ed4a7d90366c396e8e0395d0ce43a3bcddcee6
diff --git a/tests/ExecuteNetwork/ExecuteNetworkParams.cpp b/tests/ExecuteNetwork/ExecuteNetworkParams.cpp
index 8f1cb0b..944efec 100644
--- a/tests/ExecuteNetwork/ExecuteNetworkParams.cpp
+++ b/tests/ExecuteNetwork/ExecuteNetworkParams.cpp
@@ -49,14 +49,6 @@
"built with Onnx parser support.");
#endif
}
- else if (modelFormat.find("tensorflow") != std::string::npos)
- {
-#if defined(ARMNN_TF_PARSER)
-#else
- throw armnn::InvalidArgumentException("Can't run model in onnx format without a "
- "built with Tensorflow parser support.");
-#endif
- }
else if (modelFormat.find("tflite") != std::string::npos)
{
#if defined(ARMNN_TF_LITE_PARSER)
@@ -75,7 +67,7 @@
else
{
throw armnn::InvalidArgumentException(fmt::format("Unknown model format: '{}'. "
- "Please include 'tensorflow', 'tflite' or 'onnx'",
+ "Please include 'tflite' or 'onnx'",
modelFormat));
}
}
diff --git a/tests/ImageTensorGenerator/ImageTensorGenerator.cpp b/tests/ImageTensorGenerator/ImageTensorGenerator.cpp
index 34dbe1e..5417eb4 100644
--- a/tests/ImageTensorGenerator/ImageTensorGenerator.cpp
+++ b/tests/ImageTensorGenerator/ImageTensorGenerator.cpp
@@ -164,7 +164,7 @@
("f,model-format",
"Format of the intended model file that uses the images."
"Different formats have different image normalization styles."
- "Accepted values (tensorflow, tflite)",
+ "Accepted value (tflite)",
cxxopts::value<std::string>(m_ModelFormat))
("o,outfile",
"Output raw tensor file path",
@@ -235,11 +235,7 @@
unsigned int GetNewHeight() {return static_cast<unsigned int>(std::stoi(m_NewHeight));}
SupportedFrontend GetModelFormat()
{
- if (m_ModelFormat == "tensorflow")
- {
- return SupportedFrontend::TensorFlow;
- }
- else if (m_ModelFormat == "tflite")
+ if (m_ModelFormat == "tflite")
{
return SupportedFrontend::TFLite;
}
diff --git a/tests/ImageTensorGenerator/README.md b/tests/ImageTensorGenerator/README.md
index b6bc312..312fcdd 100644
--- a/tests/ImageTensorGenerator/README.md
+++ b/tests/ImageTensorGenerator/README.md
@@ -9,7 +9,7 @@
|Cmd:|||
| ---|---|---|
| -h | --help | Display help messages |
-| -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) |
+| -f | --model-format | Format of the intended model file that uses the images.Different formats have different image normalization styles.Accepted values (tflite) |
| -i | --infile | Input image file to generate tensor from |
| -o | --outfile | Output raw tensor file path |
| -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)
diff --git a/tests/ModelAccuracyTool-Armnn/README.md b/tests/ModelAccuracyTool-Armnn/README.md
index 7a29bc8..6383f33 100644
--- a/tests/ModelAccuracyTool-Armnn/README.md
+++ b/tests/ModelAccuracyTool-Armnn/README.md
@@ -15,7 +15,7 @@
| ---|---|---|
| -h | --help | Display help messages |
| -m | --model-path | Path to armnn format model file |
-| -f | --model-format | The model format. Supported values: caffe, tensorflow, tflite |
+| -f | --model-format | The model format. Supported values: tflite |
| -i | --input-name | Identifier of the input tensors in the network separated by comma |
| -o | --output-name | Identifier of the output tensors in the network separated by comma |
| -d | --data-dir | Path to directory containing the ImageNet test data |