Skip to content

Commit f00afa4

Browse files
committed
Satisfy clang
1 parent 61e53f5 commit f00afa4

File tree

6 files changed

+16
-20
lines changed

6 files changed

+16
-20
lines changed

src/cpp/include/tasks/classification.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ class Classification {
1919
std::shared_ptr<InferenceAdapter> adapter;
2020
VisionPipeline<ClassificationResult> pipeline;
2121

22-
Classification(std::shared_ptr<InferenceAdapter> adapter)
23-
: adapter(adapter) {
22+
Classification(std::shared_ptr<InferenceAdapter> adapter) : adapter(adapter) {
2423
pipeline = VisionPipeline<ClassificationResult>(
2524
adapter,
2625
[&](cv::Mat image) {

src/cpp/include/tasks/instance_segmentation.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ class InstanceSegmentation {
1818
std::shared_ptr<InferenceAdapter> adapter;
1919
VisionPipeline<InstanceSegmentationResult> pipeline;
2020

21-
InstanceSegmentation(std::shared_ptr<InferenceAdapter> adapter)
22-
: adapter(adapter) {
21+
InstanceSegmentation(std::shared_ptr<InferenceAdapter> adapter) : adapter(adapter) {
2322
pipeline = VisionPipeline<InstanceSegmentationResult>(
2423
adapter,
2524
[&](cv::Mat image) {

src/cpp/src/tasks/detection.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ DetectionModel DetectionModel::load(const std::string& model_path, const ov::Any
2424

2525
if (utils::model_has_embedded_processing(model)) {
2626
std::cout << "model already was serialized" << std::endl;
27-
//utils::get_input_shape_from_model_info(model);
2827
} else {
2928
SSD::serialize(model);
3029
}

src/cpp/src/tasks/detection/ssd.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ void SSD::serialize(std::shared_ptr<ov::Model> ov_model) {
111111
// prepareMultipleOutputs(ov_model); //This does nothing from what I can see.
112112
}
113113

114-
115114
ov_model->set_rt_info(input_shape[0], "model_info", "orig_width");
116115
ov_model->set_rt_info(input_shape[1], "model_info", "orig_height");
117116
}

src/cpp/src/tasks/instance_segmentation.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,8 @@ void InstanceSegmentation::serialize(std::shared_ptr<ov::Model>& ov_model) {
145145
mean_values = utils::get_from_any_maps("mean_values", config, ov::AnyMap{}, mean_values);
146146
uint8_t pad_value = 0;
147147
bool reverse_input_channels = false;
148-
reverse_input_channels = utils::get_from_any_maps("reverse_input_channels", config, ov::AnyMap{}, reverse_input_channels);
148+
reverse_input_channels =
149+
utils::get_from_any_maps("reverse_input_channels", config, ov::AnyMap{}, reverse_input_channels);
149150

150151
ov_model = utils::embedProcessing(
151152
ov_model,

src/cpp/src/tasks/semantic_segmentation.cpp

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -88,17 +88,17 @@ void SemanticSegmentation::serialize(std::shared_ptr<ov::Model>& ov_model) {
8888
scale_values = utils::get_from_any_maps("scale_values", config, ov::AnyMap{}, scale_values);
8989
mean_values = utils::get_from_any_maps("mean_values", config, ov::AnyMap{}, mean_values);
9090

91-
92-
ov_model = utils::embedProcessing(ov_model,
93-
input.get_any_name(),
94-
layout,
95-
resize_mode,
96-
interpolation_mode,
97-
ov::Shape{shape[ov::layout::width_idx(layout)], shape[ov::layout::height_idx(layout)]},
98-
pad_value,
99-
reverse_input_channels,
100-
mean_values,
101-
scale_values);
91+
ov_model =
92+
utils::embedProcessing(ov_model,
93+
input.get_any_name(),
94+
layout,
95+
resize_mode,
96+
interpolation_mode,
97+
ov::Shape{shape[ov::layout::width_idx(layout)], shape[ov::layout::height_idx(layout)]},
98+
pad_value,
99+
reverse_input_channels,
100+
mean_values,
101+
scale_values);
102102

103103
ov::preprocess::PrePostProcessor ppp = ov::preprocess::PrePostProcessor(ov_model);
104104
ov::Layout out_layout = utils::getLayoutFromShape(ov_model->output(out_name).get_partial_shape());
@@ -112,8 +112,7 @@ void SemanticSegmentation::serialize(std::shared_ptr<ov::Model>& ov_model) {
112112
}
113113
ov_model = ppp.build();
114114

115-
cv::Size input_shape(shape[ov::layout::width_idx(layout)],
116-
shape[ov::layout::height_idx(layout)]);
115+
cv::Size input_shape(shape[ov::layout::width_idx(layout)], shape[ov::layout::height_idx(layout)]);
117116
ov_model->set_rt_info(input_shape.width, "model_info", "orig_width");
118117
ov_model->set_rt_info(input_shape.height, "model_info", "orig_height");
119118
}

0 commit comments

Comments
 (0)