IVGCVSW-3669 Fix bug parsing multiple InputShapes in ExecuteNetwork

 * Change shape separator from semicolon, a command separator, to colon.
 * Update ExecuteNetwork --help prompts.

Change-Id: I6c6d18007cd219482d8187d69962944b833e302e
Signed-off-by: Francis Murtagh <francis.murtagh@arm.com>

diff --git a/tests/ExecuteNetwork/ExecuteNetwork.cpp b/tests/ExecuteNetwork/ExecuteNetwork.cpp
index 2309a8b..1c1fa10 100644 (file)
--- a/tests/ExecuteNetwork/ExecuteNetwork.cpp
+++ b/tests/ExecuteNetwork/ExecuteNetwork.cpp
@@ -67,12 +67,12 @@ int main(int argc, const char* argv[])
             ("subgraph-number,x", po::value<size_t>(&subgraphId)->default_value(0), "Id of the subgraph to be executed."
               "Defaults to 0")
             ("input-tensor-shape,s", po::value(&inputTensorShapes),
-             "The shape of the input tensors in the network as a flat array of integers separated by comma. "
-             "Several shapes can be passed separating them by semicolon. "
+             "The shape of the input tensors in the network as a flat array of integers separated by comma."
+             "Several shapes can be passed by separating them with a colon (:)."
              "This parameter is optional, depending on the network.")
             ("input-tensor-data,d", po::value(&inputTensorDataFilePaths),
              "Path to files containing the input data as a flat array separated by whitespace. "
-             "Several paths can be passed separating them by comma.")
+             "Several paths can be passed by separating them with a comma.")
             ("input-type,y",po::value(&inputTypes), "The type of the input tensors in the network separated by comma. "
              "If unset, defaults to \"float\" for all defined inputs. "
              "Accepted values (float, int or qasymm8)")

diff --git a/tests/NetworkExecutionUtils/NetworkExecutionUtils.hpp b/tests/NetworkExecutionUtils/NetworkExecutionUtils.hpp
index eefe628..972939b 100644 (file)
--- a/tests/NetworkExecutionUtils/NetworkExecutionUtils.hpp
+++ b/tests/NetworkExecutionUtils/NetworkExecutionUtils.hpp
@@ -464,7 +464,7 @@ int RunTest(const std::string& format,
     std::string modelFormat = boost::trim_copy(format);
     std::string modelPath = boost::trim_copy(path);
     std::vector<std::string> inputNamesVector = ParseStringList(inputNames, ",");
-    std::vector<std::string> inputTensorShapesVector = ParseStringList(inputTensorShapesStr, ";");
+    std::vector<std::string> inputTensorShapesVector = ParseStringList(inputTensorShapesStr, ":");
     std::vector<std::string> inputTensorDataFilePathsVector = ParseStringList(
         inputTensorDataFilePaths, ",");
     std::vector<std::string> outputNamesVector = ParseStringList(outputNames, ",");