Skip to content

Commit f1f7361

Browse files
[E-103104] - Port G-API demos to API2.0 - part 1 (#3889)
Port to API2.0 : classification_benchmark_demo, face_detection_mtcnn_demo, interactive_face_detection_demo
1 parent ba07662 commit f1f7361

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

demos/classification_benchmark_demo/cpp_gapi/classification_benchmark_demo_gapi.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ DEFINE_string(res, "1280x720", image_grid_resolution_message);
5151
DEFINE_bool(no_show, false, no_show_message);
5252
DEFINE_uint32(time, std::numeric_limits<gflags::uint32>::max(), execution_time_message);
5353
DEFINE_string(u, "", utilization_monitors_message);
54-
DEFINE_string(backend, "IE", backend_message);
54+
DEFINE_string(backend, "OV", backend_message);
5555
DEFINE_string(mean_values, "", mean_values_message);
5656
DEFINE_string(scale_values, "", scale_values_message);
5757

demos/face_detection_mtcnn_demo/cpp_gapi/main.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include <opencv2/gapi/gstreaming.hpp>
2929
#include <opencv2/gapi/imgproc.hpp>
3030
#include <opencv2/gapi/infer.hpp>
31-
#include <opencv2/gapi/infer/ie.hpp>
31+
#include <opencv2/gapi/infer/ov.hpp>
3232
#include <opencv2/gapi/render/render.hpp>
3333
#include <opencv2/highgui.hpp>
3434
#include <opencv2/imgproc.hpp>
@@ -191,7 +191,7 @@ int main(int argc, char* argv[]) {
191191
// MTCNN Refinement detection network
192192
// clang-format off
193193
auto mtcnnr_net =
194-
cv::gapi::ie::Params<nets::MTCNNRefinement>{
194+
cv::gapi::ov::Params<nets::MTCNNRefinement>{
195195
FLAGS_m_r, // path to topology IR
196196
fileNameNoExt(FLAGS_m_r) + ".bin", // path to weights
197197
FLAGS_d_r, // device specifier
@@ -200,7 +200,7 @@ int main(int argc, char* argv[]) {
200200

201201
// MTCNN Output detection network
202202
auto mtcnno_net =
203-
cv::gapi::ie::Params<nets::MTCNNOutput>{
203+
cv::gapi::ov::Params<nets::MTCNNOutput>{
204204
FLAGS_m_o, // path to topology IR
205205
fileNameNoExt(FLAGS_m_o) + ".bin", // path to weights
206206
FLAGS_d_o, // device specifier
@@ -213,13 +213,13 @@ int main(int argc, char* argv[]) {
213213
for (int i = 0; i < pyramid_levels; ++i) {
214214
std::string net_id = get_pnet_level_name(level_size[i]);
215215
std::vector<size_t> reshape_dims = {1, 3, size_t(level_size[i].width), size_t(level_size[i].height)};
216-
cv::gapi::ie::Params<cv::gapi::Generic> mtcnnp_net{
216+
cv::gapi::ov::Params<cv::gapi::Generic> mtcnnp_net{
217217
net_id, // tag
218218
FLAGS_m_p, // path to topology IR
219219
fileNameNoExt(FLAGS_m_p) + ".bin", // path to weights
220220
FLAGS_d_p, // device specifier
221221
};
222-
mtcnnp_net.cfgInputReshape("data", reshape_dims);
222+
mtcnnp_net.cfgReshape(reshape_dims);
223223
networks_mtcnn += cv::gapi::networks(mtcnnp_net);
224224
}
225225

demos/interactive_face_detection_demo/cpp_gapi/main.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#include <opencv2/gapi/gproto.hpp>
3939
#include <opencv2/gapi/gstreaming.hpp>
4040
#include <opencv2/gapi/infer.hpp>
41-
#include <opencv2/gapi/infer/ie.hpp>
41+
#include <opencv2/gapi/infer/ov.hpp>
4242
#include <opencv2/gapi/infer/parsers.hpp>
4343
#include <opencv2/gapi/streaming/format.hpp>
4444
#include <opencv2/highgui.hpp>
@@ -469,7 +469,7 @@ int main(int argc, char* argv[]) {
469469
auto pipeline = cv::GComputation(cv::GIn(in), std::move(outs));
470470
/** ---------------- End of graph ---------------- **/
471471
/** Configure networks **/
472-
auto det_net = cv::gapi::ie::Params<Faces>{
472+
auto det_net = cv::gapi::ov::Params<Faces>{
473473
FLAGS_m, // path to model
474474
fileNameNoExt(FLAGS_m) + ".bin", // path to weights
475475
FLAGS_d // device to use
@@ -478,7 +478,7 @@ int main(int argc, char* argv[]) {
478478

479479
// clang-format off
480480
auto age_net =
481-
cv::gapi::ie::Params<AgeGender>{
481+
cv::gapi::ov::Params<AgeGender>{
482482
FLAGS_mag, // path to model
483483
fileNameNoExt(FLAGS_mag) + ".bin", // path to weights
484484
FLAGS_dag // device to use
@@ -494,7 +494,7 @@ int main(int argc, char* argv[]) {
494494

495495
// clang-format off
496496
auto hp_net =
497-
cv::gapi::ie::Params<HeadPose>{
497+
cv::gapi::ov::Params<HeadPose>{
498498
FLAGS_mhp, // path to model
499499
fileNameNoExt(FLAGS_mhp) + ".bin", // path to weights
500500
FLAGS_dhp // device to use
@@ -510,7 +510,7 @@ int main(int argc, char* argv[]) {
510510

511511
// clang-format off
512512
auto lm_net =
513-
cv::gapi::ie::Params<FacialLandmark>{
513+
cv::gapi::ov::Params<FacialLandmark>{
514514
FLAGS_mlm, // path to model
515515
fileNameNoExt(FLAGS_mlm) + ".bin", // path to weights
516516
FLAGS_dlm // device to use
@@ -524,7 +524,7 @@ int main(int argc, char* argv[]) {
524524
slog::info << "Facial Landmarks Estimation DISABLED." << slog::endl;
525525
}
526526

527-
auto am_net = cv::gapi::ie::Params<ASpoof>{
527+
auto am_net = cv::gapi::ov::Params<ASpoof>{
528528
FLAGS_mam, // path to model
529529
fileNameNoExt(FLAGS_mam) + ".bin", // path to weights
530530
FLAGS_dam // device to use
@@ -535,7 +535,7 @@ int main(int argc, char* argv[]) {
535535
slog::info << "Anti Spoof DISABLED." << slog::endl;
536536
}
537537

538-
auto emo_net = cv::gapi::ie::Params<Emotions>{
538+
auto emo_net = cv::gapi::ov::Params<Emotions>{
539539
FLAGS_mem, // path to model
540540
fileNameNoExt(FLAGS_mem) + ".bin", // path to weights
541541
FLAGS_dem // device to use

0 commit comments

Comments
 (0)