Update for recently added primitives

openvinotoolkit · Jul 22, 2022 · eb28f54 · eb28f54
1 parent feced4e
commit eb28f54
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 23 deletions.
diff --git a/src/plugins/intel_gpu/src/graph/impls/cpu/assign.cpp b/src/plugins/intel_gpu/src/graph/impls/cpu/assign.cpp
@@ -38,7 +38,9 @@ struct assign_impl : public typed_primitive_impl<assign> {
     void init_kernels() override {}
 
 public:
-    static primitive_impl* create(assign_node const& arg) { return new assign_impl{}; }
+    static primitive_impl* create(const assign_node& arg, std::shared_ptr<kernel_impl_params> impl_param) {
+        return new assign_impl{};
+    }
 };
 
 

diff --git a/src/plugins/intel_gpu/src/graph/impls/cpu/read_value.cpp b/src/plugins/intel_gpu/src/graph/impls/cpu/read_value.cpp
@@ -39,7 +39,9 @@ struct read_value_impl : public typed_primitive_impl<read_value> {
     void init_kernels() override {}
 
 public:
-    static primitive_impl* create(read_value_node const& arg) { return new read_value_impl{}; }
+    static primitive_impl* create(const read_value_node& arg, std::shared_ptr<kernel_impl_params> impl_param) {
+        return new read_value_impl{};
+    }
 };
 
 namespace detail {

diff --git a/src/plugins/intel_gpu/src/graph/impls/ocl/adaptive_pooling.cpp b/src/plugins/intel_gpu/src/graph/impls/ocl/adaptive_pooling.cpp
@@ -35,8 +35,8 @@ struct adaptive_pooling_impl : public typed_primitive_impl_ocl<adaptive_pooling>
     }
 
 public:
-    static primitive_impl* create(const adaptive_pooling_node& arg) {
-        auto params = get_default_params<kernel_selector::adaptive_pooling_params>(arg);
+    static primitive_impl* create(const adaptive_pooling_node& arg, std::shared_ptr<kernel_impl_params> impl_param) {
+        auto params = get_default_params<kernel_selector::adaptive_pooling_params>(*impl_param);
         auto optional_params = get_default_optional_params<kernel_selector::adaptive_pooling_optional_params>(arg.get_program());
 
         const auto& primitive = arg.get_primitive();

diff --git a/src/plugins/intel_gpu/src/graph/impls/ocl/bucketize.cpp b/src/plugins/intel_gpu/src/graph/impls/ocl/bucketize.cpp
@@ -24,8 +24,8 @@ struct bucketize_impl : typed_primitive_impl_ocl<bucketize> {
         return make_unique<bucketize_impl>(*this);
     }
 
-    static primitive_impl* create(const bucketize_node& arg) {
-        auto params = get_default_params<kernel_selector::bucketize_params>(arg);
+    static primitive_impl* create(const bucketize_node& arg, std::shared_ptr<kernel_impl_params> impl_param) {
+        auto params = get_default_params<kernel_selector::bucketize_params>(*impl_param);
         auto optional_params =
             get_default_optional_params<kernel_selector::bucketize_optional_params>(arg.get_program());
 

diff --git a/src/plugins/intel_gpu/src/graph/impls/ocl/dft.cpp b/src/plugins/intel_gpu/src/graph/impls/ocl/dft.cpp
@@ -22,8 +22,8 @@ struct dft_impl : typed_primitive_impl_ocl<dft> {
         return make_unique<dft_impl>(*this);
     }
 
-    static primitive_impl* create(const dft_node& arg) {
-        auto params = get_default_params<kernel_selector::dft_params>(arg);
+    static primitive_impl* create(const dft_node& arg, std::shared_ptr<kernel_impl_params> impl_param) {
+        auto params = get_default_params<kernel_selector::dft_params>(*impl_param);
         auto primitive = arg.get_primitive();
         params.axes = primitive->axes;
         if (primitive->kind == dft_kind::inverse) {

diff --git a/src/plugins/intel_gpu/src/graph/impls/ocl/experimental_detectron_detection_output.cpp b/src/plugins/intel_gpu/src/graph/impls/ocl/experimental_detectron_detection_output.cpp
@@ -31,8 +31,8 @@ struct experimental_detectron_detection_output_impl
     }
 
 public:
-    static primitive_impl* create(const experimental_detectron_detection_output_node& arg) {
-        auto params = get_default_params<kernel_selector::experimental_detectron_detection_output_params>(arg);
+    static primitive_impl* create(const experimental_detectron_detection_output_node& arg, std::shared_ptr<kernel_impl_params> impl_param) {
+        auto params = get_default_params<kernel_selector::experimental_detectron_detection_output_params>(*impl_param);
         auto optional_params =
             get_default_optional_params<kernel_selector::experimental_detectron_detection_output_optional_params>(
                 arg.get_program());

diff --git a/.../intel_gpu/src/graph/impls/ocl/experimental_detectron_generate_proposals_single_image.cpp b/.../intel_gpu/src/graph/impls/ocl/experimental_detectron_generate_proposals_single_image.cpp
@@ -37,8 +37,8 @@ struct experimental_detectron_generate_proposals_single_image_impl
     }
 
 public:
-    static primitive_impl* create(const experimental_detectron_generate_proposals_single_image_node& arg) {
-        auto params = get_default_params<kernel_selector::experimental_detectron_generate_proposals_single_image_params>(arg);
+    static primitive_impl* create(const experimental_detectron_generate_proposals_single_image_node& arg, std::shared_ptr<kernel_impl_params> impl_param) {
+        auto params = get_default_params<kernel_selector::experimental_detectron_generate_proposals_single_image_params>(*impl_param);
         auto optional_params = get_default_optional_params<
                 kernel_selector::experimental_detectron_generate_proposals_single_image_optional_params>(arg.get_program());
 

diff --git a/src/plugins/intel_gpu/src/graph/impls/ocl/experimental_detectron_prior_grid_generator.cpp b/src/plugins/intel_gpu/src/graph/impls/ocl/experimental_detectron_prior_grid_generator.cpp
@@ -26,8 +26,8 @@ struct experimental_detectron_prior_grid_generator_impl
         return make_unique<experimental_detectron_prior_grid_generator_impl>(*this);
     }
 
-    static primitive_impl* create(const experimental_detectron_prior_grid_generator_node& arg) {
-        auto params = get_default_params<kernel_selector::experimental_detectron_prior_grid_generator_params>(arg);
+    static primitive_impl* create(const experimental_detectron_prior_grid_generator_node& arg, std::shared_ptr<kernel_impl_params> impl_param) {
+        auto params = get_default_params<kernel_selector::experimental_detectron_prior_grid_generator_params>(*impl_param);
         auto primPtr = arg.get_primitive();
         auto& prim = *primPtr;
 

diff --git a/src/plugins/intel_gpu/src/graph/impls/ocl/reverse.cpp b/src/plugins/intel_gpu/src/graph/impls/ocl/reverse.cpp
@@ -24,8 +24,8 @@ struct reverse_impl : typed_primitive_impl_ocl<reverse> {
     }
 
 public:
-    static primitive_impl* create(const reverse_node& arg) {
-        auto params = get_default_params<kernel_selector::reverse_params>(arg);
+    static primitive_impl* create(const reverse_node& arg, std::shared_ptr<kernel_impl_params> impl_param) {
+        auto params = get_default_params<kernel_selector::reverse_params>(*impl_param);
         const auto optional_params =
             get_default_optional_params<kernel_selector::reverse_optional_params>(arg.get_program());
 

diff --git a/src/plugins/intel_gpu/src/graph/impls/ocl/roll.cpp b/src/plugins/intel_gpu/src/graph/impls/ocl/roll.cpp
@@ -24,8 +24,8 @@ struct roll_impl : typed_primitive_impl_ocl<roll> {
         return make_unique<roll_impl>(*this);
     }
 
-    static primitive_impl* create(const roll_node& arg) {
-        auto roll_params = get_default_params<kernel_selector::roll_params>(arg);
+    static primitive_impl* create(const roll_node& arg, std::shared_ptr<kernel_impl_params> impl_param) {
+        auto roll_params = get_default_params<kernel_selector::roll_params>(*impl_param);
         auto roll_optional_params =
             get_default_optional_params<kernel_selector::roll_optional_params>(arg.get_program());
 

diff --git a/src/plugins/intel_gpu/src/graph/impls/onednn/reduction_onednn.cpp b/src/plugins/intel_gpu/src/graph/impls/onednn/reduction_onednn.cpp
@@ -63,7 +63,7 @@ struct reduction_onednn : typed_primitive_onednn_impl<reduce, dnnl::reduction::d
     }
 
 public:
-    static primitive_impl* create(const reduce_node& arg) {
+    static primitive_impl* create(const reduce_node& arg, std::shared_ptr<kernel_impl_params>) {
         auto& engine = arg.get_program().get_engine();
         auto desc = get_reduction_descriptor(arg);
         auto attr = arg.get_onednn_primitive_attributes();

diff --git a/src/plugins/intel_gpu/src/graph/include/primitive_type.h b/src/plugins/intel_gpu/src/graph/include/primitive_type.h
@@ -6,7 +6,7 @@
 #pragma once
 
 #include "intel_gpu/runtime/layout.hpp"
-
+#include "kernel_selector_helper.h"
 #include <memory>
 #include <string>
 

diff --git a/src/plugins/intel_gpu/src/graph/layout_optimizer.cpp b/src/plugins/intel_gpu/src/graph/layout_optimizer.cpp
@@ -822,7 +822,7 @@ static bool is_node_for_onednn(program_node& node, fully_connected_node const& f
     bool is_suitable_for_onednn = true;
     auto out_layout = node.get_output_layout();
     for (auto& fo : node.get_fused_primitives()) {
-        if (fo.node->is_type<eltwise>()) {
+        if (fo.is_type<eltwise>()) {
             // FC checkings
             auto in_layout = node.get_dependency(fo.dep_start_idx).get_output_layout();
             auto in_dt = in_layout.data_type;

diff --git a/src/plugins/intel_gpu/src/graph/program_node.cpp b/src/plugins/intel_gpu/src/graph/program_node.cpp
@@ -899,7 +899,6 @@ void program_node::init_onednn_primitive_attributes() {
                 update_onednn_post_op_list(onednn_post_op_type::eltwise_act, empty_mem);
             }
         } else if (desc.is_type<eltwise>()) {
-            //auto& e_node = node->as<eltwise>();
             auto dep_idx = desc.dep_start_idx;
             auto in = get_dependency(dep_idx).get_output_layout();
 
@@ -932,7 +931,6 @@ void program_node::init_onednn_primitive_attributes() {
                 }
             }
         } else if (desc.is_type<quantize>()) {
-//            auto& q_node = node->as<quantize>();
             auto dep_idx = desc.dep_start_idx;
 
             // ********************************* Common case with output range usage ********************************* //