mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-18 14:13:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed header paths for some nGraph ops

Browse Source 
* Added dependency on IE version

backport of commit: 992c908b56
This commit is contained in:
Ilya Churaev 2020-07-06 11:11:59 +03:00 committed by Alexander Alekhin
parent 65dbbf712d
commit d69a7a3bbf
6 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/dnn/src/layers/detection_output_layer.cpp
View File

@ -54,9 +54,14 @@
#ifdef HAVE_DNN_NGRAPH #ifdef HAVE_DNN_NGRAPH
#include "../ie_ngraph.hpp" #include "../ie_ngraph.hpp"
#if INF_ENGINE_VER_MAJOR_GT(INF_ENGINE_RELEASE_2020_4)
#include <ngraph/op/detection_output.hpp>
#else
#include <ngraph/op/experimental/layers/detection_output.hpp> #include <ngraph/op/experimental/layers/detection_output.hpp>
#endif #endif
#endif
namespace cv namespace cv
{ {
namespace dnn namespace dnn

5
modules/dnn/src/layers/pooling_layer.cpp
View File

@ -48,9 +48,14 @@
#ifdef HAVE_DNN_NGRAPH #ifdef HAVE_DNN_NGRAPH
#include "../ie_ngraph.hpp" #include "../ie_ngraph.hpp"
#if INF_ENGINE_VER_MAJOR_GT(INF_ENGINE_RELEASE_2020_4)
#include <ngraph/op/roi_pooling.hpp>
#include <ngraph/op/psroi_pooling.hpp>
#else
#include <ngraph/op/experimental/layers/roi_pooling.hpp> #include <ngraph/op/experimental/layers/roi_pooling.hpp>
#include <ngraph/op/experimental/layers/psroi_pooling.hpp> #include <ngraph/op/experimental/layers/psroi_pooling.hpp>
#endif #endif
#endif
#include <float.h> #include <float.h>
#include <algorithm> #include <algorithm>

5
modules/dnn/src/layers/prior_box_layer.cpp
View File

@ -46,9 +46,14 @@
#ifdef HAVE_DNN_NGRAPH #ifdef HAVE_DNN_NGRAPH
#include "../ie_ngraph.hpp" #include "../ie_ngraph.hpp"
#if INF_ENGINE_VER_MAJOR_GT(INF_ENGINE_RELEASE_2020_4)
#include <ngraph/op/prior_box.hpp>
#include <ngraph/op/prior_box_clustered.hpp>
#else
#include <ngraph/op/experimental/layers/prior_box.hpp> #include <ngraph/op/experimental/layers/prior_box.hpp>
#include <ngraph/op/experimental/layers/prior_box_clustered.hpp> #include <ngraph/op/experimental/layers/prior_box_clustered.hpp>
#endif #endif
#endif
#include <float.h> #include <float.h>
#include <algorithm> #include <algorithm>

4
modules/dnn/src/layers/proposal_layer.cpp
View File

@ -10,8 +10,12 @@
#ifdef HAVE_DNN_NGRAPH #ifdef HAVE_DNN_NGRAPH
#include "../ie_ngraph.hpp" #include "../ie_ngraph.hpp"
#if INF_ENGINE_VER_MAJOR_GT(INF_ENGINE_RELEASE_2020_4)
#include <ngraph/op/proposal.hpp>
#else
#include <ngraph/op/experimental/layers/proposal.hpp> #include <ngraph/op/experimental/layers/proposal.hpp>
#endif #endif
#endif
namespace cv { namespace dnn { namespace cv { namespace dnn {

6
modules/dnn/src/layers/reorg_layer.cpp
View File

@ -41,7 +41,6 @@
//M*/ //M*/
#include "../precomp.hpp" #include "../precomp.hpp"
#include "../op_inf_engine.hpp"
#include <opencv2/dnn/shape_utils.hpp> #include <opencv2/dnn/shape_utils.hpp>
#include <opencv2/dnn/all_layers.hpp> #include <opencv2/dnn/all_layers.hpp>
@ -50,10 +49,15 @@
#include "opencl_kernels_dnn.hpp" #include "opencl_kernels_dnn.hpp"
#endif #endif
#include "../op_inf_engine.hpp"
#ifdef HAVE_DNN_NGRAPH #ifdef HAVE_DNN_NGRAPH
#include "../ie_ngraph.hpp" #include "../ie_ngraph.hpp"
#if INF_ENGINE_VER_MAJOR_GT(INF_ENGINE_RELEASE_2020_4)
#include <ngraph/op/reorg_yolo.hpp>
#else
#include <ngraph/op/experimental/layers/reorg_yolo.hpp> #include <ngraph/op/experimental/layers/reorg_yolo.hpp>
#endif #endif
#endif
namespace cv namespace cv
{ {

4
modules/dnn/src/layers/resize_layer.cpp
View File

@ -11,8 +11,12 @@
#ifdef HAVE_DNN_NGRAPH #ifdef HAVE_DNN_NGRAPH
#include "../ie_ngraph.hpp" #include "../ie_ngraph.hpp"
#if INF_ENGINE_VER_MAJOR_GT(INF_ENGINE_RELEASE_2020_4)
#include <ngraph/op/interpolate.hpp>
#else
#include <ngraph/op/experimental/layers/interpolate.hpp> #include <ngraph/op/experimental/layers/interpolate.hpp>
#endif #endif
#endif
namespace cv { namespace dnn { namespace cv { namespace dnn {