IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Benchmark] Align comments with command argument 'data_shape' (#9897)

Browse Source
This commit is contained in:
Alexandra Sidorova
2022-02-07 13:31:38 +03:00
committed by GitHub
parent 3d6e90b8f9
commit 57b08583cc
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
samples/cpp/benchmark_app/utils.cpp
View File

@@ -28,7 +28,7 @@ namespace benchmark_app {
bool InputInfo::is_image() const {
if ((layout != "NCHW") && (layout != "NHWC") && (layout != "CHW") && (layout != "HWC"))
return false;
// If tensor_shape is still empty, assume this is still an Image and tensor shape will be filled later
// If data_shape is still empty, assume this is still an Image and tensor shape will be filled later
return (dataShape.empty() || channels() == 3);
}
bool InputInfo::is_image_info() const {
@@ -406,7 +406,7 @@ std::vector<benchmark_app::InputsInfo> get_inputs_info(const std::string& shape_
throw std::logic_error(
"Shapes number for every input should be either 1 or should be equal to shapes number of other inputs");
}
slog::info << "Number of test configurations is calculated basing on -tensor_shape parameter" << slog::endl;
slog::info << "Number of test configurations is calculated basing on -data_shape parameter" << slog::endl;
} else if (fileNames.size() > 0) {
slog::info << "Number of test configurations is calculated basing on number of input images" << slog::endl;
min_size = std::min_element(fileNames.begin(),
@@ -511,7 +511,7 @@ std::vector<benchmark_app::InputsInfo> get_inputs_info(const std::string& shape_
if (contains_binaries(namesVector)) {
throw std::logic_error("Input files list for input " + item.get_any_name() +
" contains binary file(s) and input shape is dynamic. Tensor shape should "
"be defined explicitly (using -tensor_shape).");
"be defined explicitly (using -data_shape).");
}
info.dataShape = ov::Shape(info.partialShape.size(), 0);
@@ -538,12 +538,12 @@ std::vector<benchmark_app::InputsInfo> get_inputs_info(const std::string& shape_
if (fileIdx >= namesVector.size()) {
throw std::logic_error(
"Not enough files to fill in full batch (number of files should be a multiple of batch "
"size if -tensor_shape parameter is omitted and shape is dynamic)");
"size if -data_shape parameter is omitted and shape is dynamic)");
}
FormatReader::ReaderPtr reader(namesVector[fileIdx].c_str());
if ((w && w != reader->width()) || (h && h != reader->height())) {
throw std::logic_error("Image sizes putting into one batch should be of the same size if input "
"shape is dynamic and -tensor_shape is omitted. Problem file: " +
"shape is dynamic and -data_shape is omitted. Problem file: " +
namesVector[fileIdx]);
}
w = reader->width();

8
samples/cpp/benchmark_app/utils.hpp
View File

@@ -78,14 +78,14 @@ std::map<std::string, std::vector<std::string>> parse_input_parameters(const std
/// <param name="shape_string">command-line shape string</param>
/// <param name="layout_string">command-line layout string</param>
/// <param name="batch_size">command-line batch string</param>
/// <param name="tensors_shape_string">command-line tensor_shape string</param>
/// <param name="tensors_shape_string">command-line data_shape string</param>
/// <param name="scale_string">command-line iscale string</param>
/// <param name="mean_string">command-line imean string</param>
/// <param name="input_info">inputs vector obtained from ov::Model</param>
/// <param name="reshape_required">returns true to this parameter if reshape is required</param>
/// <returns>vector of benchmark_app::InputsInfo elements.
/// Each element is a configuration item for every test configuration case
/// (number of cases is calculated basing on tensor_shape and other parameters).
/// (number of cases is calculated basing on data_shape and other parameters).
/// Each element is a map (input_name, configuration) containing data for each input</returns>
std::vector<benchmark_app::InputsInfo> get_inputs_info(const std::string& shape_string,
const std::string& layout_string,
@@ -103,14 +103,14 @@ std::vector<benchmark_app::InputsInfo> get_inputs_info(const std::string& shape_
/// <param name="shape_string">command-line shape string</param>
/// <param name="layout_string">command-line layout string</param>
/// <param name="batch_size">command-line batch string</param>
/// <param name="tensors_shape_string">command-line tensor_shape string</param>
/// <param name="tensors_shape_string">command-line data_shape string</param>
/// <param name="scale_string">command-line iscale string</param>
/// <param name="mean_string">command-line imean string</param>
/// <param name="input_info">inputs vector obtained from ov::Model</param>
/// <param name="reshape_required">returns true to this parameter if reshape is required</param>
/// <returns>vector of benchmark_app::InputsInfo elements.
/// Each element is a configuration item for every test configuration case
/// (number of cases is calculated basing on tensor_shape and other parameters).
/// (number of cases is calculated basing on data_shape and other parameters).
/// Each element is a map (input_name, configuration) containing data for each
/// input</returns>
std::vector<benchmark_app::InputsInfo> get_inputs_info(const std::string& shape_string,