potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

Merge pull request #18716 from dmatveev:dm/upstream_onnx

Browse Source 
* G-API: Introduce ONNX backend for Inference

- Basic operations are implemented (Infer, -ROI, -List, -List2);
- Implemented automatic preprocessing for ONNX models;
- Test suite is extended with `OPENCV_GAPI_ONNX_MODEL_PATH` env for test data
  (test data is an ONNX Model Zoo repo snapshot);
- Fixed kernel lookup logic in core G-API:
  - Lookup NN kernels not in the default package, but in the associated
    backend's aux package. Now two NN backends can work in the same graph.
- Added Infer SSD demo and a combined ONNX/IE demo;

* G-API/ONNX: Fix some of CMake issues

Co-authored-by: Pashchenkov, Maxim <maxim.pashchenkov@intel.com>
This commit is contained in:
Dmitry Matveev
2020-11-03 21:39:16 +03:00
committed by GitHub
parent 2a3cdba724
commit a110ede0a2
10 changed files with 1920 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gapi/src/compiler/passes/kernels.cpp
+19 -6
View File
@@ -141,6 +141,7 @@ void cv::gimpl::passes::bindNetParams(ade::passes::PassContext &ctx,
continue;
pgr.metadata(nh).set(NetworkParams{it->params});
op.backend = it->backend;
}
}
}
@@ -181,13 +182,25 @@ void cv::gimpl::passes::resolveKernels(ade::passes::PassContext &ctx,
// of the same kernel to be presented in the kernel
// package (as it was designed originally).
cv::gapi::GBackend selected_backend;
cv::GKernelImpl selected_impl;
std::tie(selected_backend, selected_impl) = kernels.lookup(op.k.name);
cv::GKernelImpl selected_impl;
selected_backend.priv().unpackKernel(ctx.graph, nh, selected_impl);
op.backend = selected_backend;
active_backends.insert(selected_backend);
if (op.backend == cv::gapi::GBackend()) {
std::tie(op.backend, selected_impl) = kernels.lookup(op.k.name);
} else {
// FIXME: This needs to be reworked properly
// Lookup for implementation from the pre-assinged backend
cv::gapi::GBackend dummy;
std::tie(dummy, selected_impl) = op.backend.priv()
.auxiliaryKernels().lookup(op.k.name);
// FIXME: Warning here!
// This situation may happen when NN (infer) backend was assigned
// by tag in bindNetParams (see above) but at this stage the operation
// lookup resulted in another backend (and it is perfectly valid when
// we have multiple NN backends available).
}
op.backend.priv().unpackKernel(ctx.graph, nh, selected_impl);
active_backends.insert(op.backend);
if (gr.metadata().contains<Deserialized>())
{