Merge pull request opencv#17756 from ilyachur:feature/ichuraev/fix_ngraph_headers

* Fixed header paths for some nGraph ops

* Added dependency on IE version

Author: ilyachur

modules/dnn/src/layers/detection_output_layer.cpp

@@ -54,9 +54,14 @@
 
 #ifdef HAVE_DNN_NGRAPH
 #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>
 #endif
 
+#endif
+
 namespace cv
 {
 namespace dnn

modules/dnn/src/layers/pooling_layer.cpp

@@ -49,9 +49,14 @@
 
 #ifdef HAVE_DNN_NGRAPH
 #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/psroi_pooling.hpp>
 #endif
+#endif
 
 #include "../op_vkcom.hpp"
 

modules/dnn/src/layers/prior_box_layer.cpp

@@ -47,9 +47,14 @@
 
 #ifdef HAVE_DNN_NGRAPH
 #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_clustered.hpp>
 #endif
+#endif
 
 #include "../op_vkcom.hpp"
 

modules/dnn/src/layers/proposal_layer.cpp

@@ -10,8 +10,12 @@
 
 #ifdef HAVE_DNN_NGRAPH
 #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>
 #endif
+#endif
 
 namespace cv { namespace dnn {
 

modules/dnn/src/layers/reorg_layer.cpp

@@ -46,8 +46,12 @@
 
 #ifdef HAVE_DNN_NGRAPH
 #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>
 #endif
+#endif
 
 #include <opencv2/dnn/shape_utils.hpp>
 #include <opencv2/dnn/all_layers.hpp>

modules/dnn/src/layers/resize_layer.cpp

@@ -12,8 +12,12 @@
 
 #ifdef HAVE_DNN_NGRAPH
 #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>
 #endif
+#endif
 
 #ifdef HAVE_CUDA
 #include "../cuda4dnn/primitives/resize.hpp"