Skip to content

Commit 45704ca

Browse files
committed
Remove async from public api side
1 parent ba9141d commit 45704ca

File tree

12 files changed

+1
-167
lines changed

12 files changed

+1
-167
lines changed

examples/cpp/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,5 +94,4 @@ find_package(OpenCV REQUIRED COMPONENTS imgcodecs)
9494

9595
add_subdirectory(../../src/cpp ${Samples_BINARY_DIR}/src/cpp)
9696

97-
add_example(NAME asynchronous_api SOURCES ./asynchronous_api/main.cpp DEPENDENCIES model_api)
98-
add_example(NAME synchronous_api SOURCES ./synchronous_api/main.cpp DEPENDENCIES model_api)
97+
add_example(NAME synchronous_api SOURCES ./main.cpp DEPENDENCIES model_api)
File renamed without changes.

examples/cpp/asynchronous_api/README.md

Lines changed: 0 additions & 55 deletions
This file was deleted.

examples/cpp/asynchronous_api/main.cpp

Lines changed: 0 additions & 51 deletions
This file was deleted.

src/cpp/include/tasks/detection.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,6 @@ class DetectionModel {
6565
static DetectionModel load(const std::string& model_path, const ov::AnyMap& configuration = {});
6666

6767
DetectionResult infer(cv::Mat image);
68-
void inferAsync(cv::Mat image, ov::AnyMap user_data);
69-
void setCallback(std::function<void(DetectionResult, ov::AnyMap)>);
70-
7168
std::vector<DetectionResult> inferBatch(std::vector<cv::Mat> image);
7269

7370
private:

src/cpp/include/tasks/instance_segmentation.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ class InstanceSegmentation {
4343
static InstanceSegmentation load(const std::string& model_path);
4444

4545
InstanceSegmentationResult infer(cv::Mat image);
46-
void inferAsync(cv::Mat image, ov::AnyMap user_data);
47-
void setCallback(std::function<void(InstanceSegmentationResult, ov::AnyMap)>);
4846
std::vector<InstanceSegmentationResult> inferBatch(std::vector<cv::Mat> image);
4947

5048
std::map<std::string, ov::Tensor> preprocess(cv::Mat);

src/cpp/include/tasks/semantic_segmentation.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ class SemanticSegmentation {
5252
std::vector<Contour> getContours(const SemanticSegmentationResult& result);
5353

5454
SemanticSegmentationResult infer(cv::Mat image);
55-
void inferAsync(cv::Mat image, ov::AnyMap user_data);
56-
void setCallback(std::function<void(SemanticSegmentationResult, ov::AnyMap)>);
5755
std::vector<SemanticSegmentationResult> inferBatch(std::vector<cv::Mat> image);
5856

5957
private:

src/cpp/include/utils/vision_pipeline.h

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ class Pipeline {
1212
public:
1313
Pipeline() {}
1414
virtual ResultType infer(cv::Mat image) = 0;
15-
virtual void setCallback(std::function<void(ResultType, ov::AnyMap)> callback) = 0;
16-
virtual void inferAsync(cv::Mat image, ov::AnyMap user_data) = 0;
1715
virtual std::vector<ResultType> inferBatch(std::vector<cv::Mat> images) = 0;
1816
};
1917

@@ -41,26 +39,6 @@ class VisionPipeline : public Pipeline<ResultType> {
4139
return postprocess(result);
4240
}
4341

44-
inline void setCallback(std::function<void(ResultType, ov::AnyMap)> callback) {
45-
adapter->setCallback([&](ov::InferRequest request, CallbackData additional_data) {
46-
InferenceResult result;
47-
size_t index = additional_data->at("index").as<size_t>();
48-
result.inputImageSize = additional_data->at("inputImageSize").as<cv::Size>();
49-
auto user_data = additional_data->at("user_data").as<ov::AnyMap>();
50-
for (const auto& item : adapter->getOutputNames()) {
51-
result.data.emplace(item, request.get_tensor(item));
52-
}
53-
callback(postprocess(result), user_data);
54-
});
55-
}
56-
57-
inline void inferAsync(cv::Mat image, ov::AnyMap user_data) {
58-
auto additional_data = std::make_shared<ov::AnyMap>();
59-
additional_data->insert({"inputImageSize", image.size()});
60-
additional_data->insert({"user_data", user_data});
61-
adapter->inferAsync(preprocess(image), additional_data);
62-
}
63-
6442
inline std::vector<ResultType> inferBatch(std::vector<cv::Mat> images) {
6543
auto results = std::vector<ResultType>(images.size());
6644

@@ -138,12 +116,6 @@ class TilingPipeline : public Pipeline<ResultType> {
138116
return merge_tiling_results(tile_results, image.size(), tile_coords, tiling_info);
139117
}
140118

141-
inline void setCallback(std::function<void(ResultType, ov::AnyMap)> callback) {}
142-
143-
inline void inferAsync(cv::Mat image, ov::AnyMap user_data) {
144-
throw std::runtime_error("No inferAsync for tiling yet.");
145-
}
146-
147119
inline std::vector<ResultType> inferBatch(std::vector<cv::Mat> images) {
148120
std::vector<std::vector<ResultType>> tile_results_for_all_images(images.size());
149121
std::vector<ResultType> output(images.size());

src/cpp/src/tasks/detection.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -204,14 +204,6 @@ DetectionResult DetectionModel::infer(cv::Mat image) {
204204
return pipeline->infer(image);
205205
}
206206

207-
void DetectionModel::inferAsync(cv::Mat image, ov::AnyMap user_data) {
208-
pipeline->inferAsync(image, user_data);
209-
}
210-
211-
void DetectionModel::setCallback(std::function<void(DetectionResult, ov::AnyMap)> callback) {
212-
pipeline->setCallback(callback);
213-
}
214-
215207
std::vector<DetectionResult> DetectionModel::inferBatch(std::vector<cv::Mat> images) {
216208
return pipeline->inferBatch(images);
217209
}

0 commit comments

Comments
 (0)