aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Eilers <jan.eilers@arm.com>2020-11-11 11:44:14 +0000
committerJan Eilers <jan.eilers@arm.com>2020-11-11 13:48:51 +0000
commit3dda41daba5210ebd842115471ecadeb2fb3ae3b (patch)
tree5d9bbbd1a03e6bd2abd6aa1872bc191fbe027299
parentcb4ddef6dc4bac6b3f2fc189a113e9f3c73d1293 (diff)
downloadarmnn-3dda41daba5210ebd842115471ecadeb2fb3ae3b.tar.gz
IVGCVSW-5507 ExecuteNetwork fix
* Allow multiple backends to be defined seperately like " --compute CpuAcc --compute CpuRef " Signed-off-by: Jan Eilers <jan.eilers@arm.com> Change-Id: Ic2a827f6e3463a7413c98a7eefacef8864c1e87b
-rw-r--r--tests/ExecuteNetwork/ExecuteNetworkProgramOptions.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/ExecuteNetwork/ExecuteNetworkProgramOptions.cpp b/tests/ExecuteNetwork/ExecuteNetworkProgramOptions.cpp
index 72b784c72e..e37c4eb42e 100644
--- a/tests/ExecuteNetwork/ExecuteNetworkProgramOptions.cpp
+++ b/tests/ExecuteNetwork/ExecuteNetworkProgramOptions.cpp
@@ -161,7 +161,7 @@ ProgramOptions::ProgramOptions() : m_CxxOptions{"ExecuteNetwork",
+ armnn::BackendRegistryInstance().GetBackendIdsAsString()
+ " NOTE: Compute devices need to be passed as a comma separated list without whitespaces "
"e.g. CpuRef,CpuAcc",
- cxxopts::value<std::string>())
+ cxxopts::value<std::vector<std::string>>())
("f,model-format",
"armnn-binary, caffe-binary, caffe-text, onnx-binary, onnx-text, tflite-binary, tensorflow-binary or "
@@ -352,9 +352,8 @@ void ProgramOptions::ParseOptions(int ac, const char* av[])
CheckOptionDependencies(m_CxxResult);
// Some options can't be assigned directly because they need some post-processing:
- auto computeDevices = GetOptionValue<std::string>("compute", m_CxxResult);
- m_ExNetParams.m_ComputeDevices =
- GetBackendIDs(ParseStringList(computeDevices, ","));
+ auto computeDevices = GetOptionValue<std::vector<std::string>>("compute", m_CxxResult);
+ m_ExNetParams.m_ComputeDevices = GetBackendIDs(computeDevices);
m_ExNetParams.m_ModelFormat =
armnn::stringUtils::StringTrimCopy(GetOptionValue<std::string>("model-format", m_CxxResult));
m_ExNetParams.m_InputNames =