aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorKevin May <kevin.may@arm.com>2021-04-28 16:16:22 +0100
committerKevin May <kevin.may@arm.com>2021-04-29 12:38:01 +0000
commiteb03e0fa0f6e8d133efe7d54831ad70da9431874 (patch)
tree1cc0b63450ba58a570974c7d3feba7b53cf3f8eb /tests
parenta04a9d7c11f28c7e932435535e80223782f369f2 (diff)
downloadarmnn-eb03e0fa0f6e8d133efe7d54831ad70da9431874.tar.gz
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
Diffstat (limited to 'tests')
-rw-r--r--tests/ExecuteNetwork/ExecuteNetworkParams.cpp10
-rw-r--r--tests/ImageTensorGenerator/ImageTensorGenerator.cpp8
-rw-r--r--tests/ImageTensorGenerator/README.md2
-rw-r--r--tests/ModelAccuracyTool-Armnn/README.md2
4 files changed, 5 insertions, 17 deletions
diff --git a/tests/ExecuteNetwork/ExecuteNetworkParams.cpp b/tests/ExecuteNetwork/ExecuteNetworkParams.cpp
index 8f1cb0b599..944efec17f 100644
--- a/tests/ExecuteNetwork/ExecuteNetworkParams.cpp
+++ b/tests/ExecuteNetwork/ExecuteNetworkParams.cpp
@@ -49,14 +49,6 @@ void CheckModelFormat(const std::string& modelFormat)
"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 @@ void CheckModelFormat(const std::string& modelFormat)
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 34dbe1e352..5417eb4055 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 (tensorflow, tflite)",
+ "Accepted value (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 == "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 b6bc3126b4..312fcddc5d 100644
--- a/tests/ImageTensorGenerator/README.md
+++ b/tests/ImageTensorGenerator/README.md
@@ -9,7 +9,7 @@ To build ModelAccuracyTool, pass the following options to Cmake:
|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 7a29bc8aa5..6383f33096 100644
--- a/tests/ModelAccuracyTool-Armnn/README.md
+++ b/tests/ModelAccuracyTool-Armnn/README.md
@@ -15,7 +15,7 @@ To build ModelAccuracyTool, pass the following options to Cmake:
| ---|---|---|
| -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 |