From d31c9b0b3a5a34121ce8186a181d5286f731a652 Mon Sep 17 00:00:00 2001 From: Konstantin Beluchenko Date: Tue, 1 Nov 2022 06:03:35 +0200 Subject: [PATCH] program_node refactoring (#13576) --- .../intel_gpu/src/graph/include/assign_inst.h | 9 --------- .../src/graph/include/average_unpooling_inst.h | 9 --------- .../src/graph/include/batch_to_space_inst.h | 9 --------- .../src/graph/include/custom_gpu_primitive_inst.h | 10 ---------- src/plugins/intel_gpu/src/graph/include/dft_inst.h | 9 --------- ...rimental_detectron_roi_feature_extractor_inst.hpp | 7 ------- .../include/experimental_detectron_topk_rois_inst.h | 9 --------- .../src/graph/include/extract_image_patches_inst.h | 9 --------- src/plugins/intel_gpu/src/graph/include/eye_inst.h | 12 ------------ .../intel_gpu/src/graph/include/gather_nd_inst.h | 9 --------- .../intel_gpu/src/graph/include/gather_tree_inst.h | 10 ---------- src/plugins/intel_gpu/src/graph/include/grn_inst.h | 10 ---------- .../src/graph/include/random_uniform_inst.h | 9 --------- .../intel_gpu/src/graph/include/read_value_inst.h | 9 --------- .../intel_gpu/src/graph/include/reduce_inst.h | 9 --------- .../intel_gpu/src/graph/include/reverse_inst.h | 11 ----------- .../src/graph/include/reverse_sequence_inst.h | 9 --------- .../intel_gpu/src/graph/include/roi_align_inst.h | 10 ---------- .../intel_gpu/src/graph/include/roll_inst.hpp | 10 ---------- .../src/graph/include/scatter_elements_update_inst.h | 9 --------- .../src/graph/include/scatter_nd_update_inst.h | 9 --------- .../src/graph/include/scatter_update_inst.h | 9 --------- .../src/graph/include/shuffle_channels_inst.h | 9 --------- src/plugins/intel_gpu/src/graph/include/slice_inst.h | 10 ---------- .../src/graph/include/space_to_batch_inst.h | 9 --------- .../src/graph/include/space_to_depth_inst.h | 9 --------- src/plugins/intel_gpu/src/graph/include/split_inst.h | 10 ---------- 27 files changed, 253 deletions(-) diff --git a/src/plugins/intel_gpu/src/graph/include/assign_inst.h b/src/plugins/intel_gpu/src/graph/include/assign_inst.h index 6ffc4cef7b9..cf81036da0a 100644 --- a/src/plugins/intel_gpu/src/graph/include/assign_inst.h +++ b/src/plugins/intel_gpu/src/graph/include/assign_inst.h @@ -23,15 +23,6 @@ private: } // namespace memory_state -template<> -struct typed_program_node : public typed_program_node_base { - using parent = typed_program_node_base; -public: - using parent::parent; - - const program_node& input(std::size_t index = 0) const { return get_dependency(index); } -}; - using assign_node = typed_program_node; template<> diff --git a/src/plugins/intel_gpu/src/graph/include/average_unpooling_inst.h b/src/plugins/intel_gpu/src/graph/include/average_unpooling_inst.h index 4cbcd3406d9..1d39955c38a 100644 --- a/src/plugins/intel_gpu/src/graph/include/average_unpooling_inst.h +++ b/src/plugins/intel_gpu/src/graph/include/average_unpooling_inst.h @@ -11,15 +11,6 @@ namespace cldnn { -template <> -struct typed_program_node : public typed_program_node_base { - using parent = typed_program_node_base; - -public: - using parent::parent; - program_node& input() const { return get_dependency(0); } -}; - using average_unpooling_node = typed_program_node; template <> diff --git a/src/plugins/intel_gpu/src/graph/include/batch_to_space_inst.h b/src/plugins/intel_gpu/src/graph/include/batch_to_space_inst.h index 20bf2de1992..83c4b4581e6 100644 --- a/src/plugins/intel_gpu/src/graph/include/batch_to_space_inst.h +++ b/src/plugins/intel_gpu/src/graph/include/batch_to_space_inst.h @@ -10,15 +10,6 @@ #include namespace cldnn { -template <> -struct typed_program_node : public typed_program_node_base { - using parent = typed_program_node_base; - -public: - using parent::parent; - - program_node& input(size_t index = 0) const { return get_dependency(index); } -}; using batch_to_space_node = typed_program_node; diff --git a/src/plugins/intel_gpu/src/graph/include/custom_gpu_primitive_inst.h b/src/plugins/intel_gpu/src/graph/include/custom_gpu_primitive_inst.h index c2ec3b7b2d9..e692f427463 100644 --- a/src/plugins/intel_gpu/src/graph/include/custom_gpu_primitive_inst.h +++ b/src/plugins/intel_gpu/src/graph/include/custom_gpu_primitive_inst.h @@ -11,16 +11,6 @@ namespace cldnn { -template <> -struct typed_program_node : public typed_program_node_base { - using parent = typed_program_node_base; - -public: - using parent::parent; - - program_node& input(size_t idx = 0) const { return get_dependency(idx); } -}; - using custom_gpu_primitive_node = typed_program_node; template <> diff --git a/src/plugins/intel_gpu/src/graph/include/dft_inst.h b/src/plugins/intel_gpu/src/graph/include/dft_inst.h index 86ae5392036..88758aa3dca 100644 --- a/src/plugins/intel_gpu/src/graph/include/dft_inst.h +++ b/src/plugins/intel_gpu/src/graph/include/dft_inst.h @@ -10,15 +10,6 @@ namespace cldnn { -template <> -struct typed_program_node : public typed_program_node_base { - using typed_program_node_base::typed_program_node_base; - - program_node& input() const { - return get_dependency(0); - } -}; - using dft_node = typed_program_node; template <> diff --git a/src/plugins/intel_gpu/src/graph/include/experimental_detectron_roi_feature_extractor_inst.hpp b/src/plugins/intel_gpu/src/graph/include/experimental_detectron_roi_feature_extractor_inst.hpp index bc15f6e8a63..dab68883bc7 100644 --- a/src/plugins/intel_gpu/src/graph/include/experimental_detectron_roi_feature_extractor_inst.hpp +++ b/src/plugins/intel_gpu/src/graph/include/experimental_detectron_roi_feature_extractor_inst.hpp @@ -9,13 +9,6 @@ #include "primitive_inst.h" namespace cldnn { -template <> -struct typed_program_node : public typed_program_node_base { - using parent = typed_program_node_base; - using parent::parent; - - program_node& input(size_t index = 0) const { return get_dependency(index); } -}; using experimental_detectron_roi_feature_extractor_node = typed_program_node; diff --git a/src/plugins/intel_gpu/src/graph/include/experimental_detectron_topk_rois_inst.h b/src/plugins/intel_gpu/src/graph/include/experimental_detectron_topk_rois_inst.h index ab32baa3186..b454afff274 100644 --- a/src/plugins/intel_gpu/src/graph/include/experimental_detectron_topk_rois_inst.h +++ b/src/plugins/intel_gpu/src/graph/include/experimental_detectron_topk_rois_inst.h @@ -10,15 +10,6 @@ namespace cldnn { -template<> -struct typed_program_node : public typed_program_node_base { - using parent = typed_program_node_base; -public: - using parent::parent; - - const program_node &input(std::size_t index = 0) const { return get_dependency(index); } -}; - using experimental_detectron_topk_rois_node = typed_program_node; template<> diff --git a/src/plugins/intel_gpu/src/graph/include/extract_image_patches_inst.h b/src/plugins/intel_gpu/src/graph/include/extract_image_patches_inst.h index 56d68973500..5d1f6b3ca81 100644 --- a/src/plugins/intel_gpu/src/graph/include/extract_image_patches_inst.h +++ b/src/plugins/intel_gpu/src/graph/include/extract_image_patches_inst.h @@ -8,15 +8,6 @@ #include "primitive_inst.h" namespace cldnn { -template <> -struct typed_program_node : public typed_program_node_base { - using parent = typed_program_node_base; - -public: - using parent::parent; - - program_node& input(size_t index = 0) const { return get_dependency(index); } -}; using extract_image_patches_node = typed_program_node; diff --git a/src/plugins/intel_gpu/src/graph/include/eye_inst.h b/src/plugins/intel_gpu/src/graph/include/eye_inst.h index babf1cee966..39c56bf487f 100644 --- a/src/plugins/intel_gpu/src/graph/include/eye_inst.h +++ b/src/plugins/intel_gpu/src/graph/include/eye_inst.h @@ -10,18 +10,6 @@ namespace cldnn { -template <> -struct typed_program_node : public typed_program_node_base { - using parent = typed_program_node_base; - -public: - using parent::parent; - - program_node& input(std::size_t index = 0) const { - return get_dependency(index); - } -}; - using eye_node = typed_program_node; template <> diff --git a/src/plugins/intel_gpu/src/graph/include/gather_nd_inst.h b/src/plugins/intel_gpu/src/graph/include/gather_nd_inst.h index c715d7a4fdb..c0dc83b9683 100644 --- a/src/plugins/intel_gpu/src/graph/include/gather_nd_inst.h +++ b/src/plugins/intel_gpu/src/graph/include/gather_nd_inst.h @@ -8,15 +8,6 @@ #include namespace cldnn { -template <> -struct typed_program_node : public typed_program_node_base { - using parent = typed_program_node_base; - -public: - using parent::parent; - - program_node& input(size_t index = 0) const { return get_dependency(index); } -}; using gather_nd_node = typed_program_node; diff --git a/src/plugins/intel_gpu/src/graph/include/gather_tree_inst.h b/src/plugins/intel_gpu/src/graph/include/gather_tree_inst.h index 8f619c70b82..d32a08f2d38 100644 --- a/src/plugins/intel_gpu/src/graph/include/gather_tree_inst.h +++ b/src/plugins/intel_gpu/src/graph/include/gather_tree_inst.h @@ -10,16 +10,6 @@ #include namespace cldnn { -template <> -struct typed_program_node : typed_program_node_base { -private: - using parent = typed_program_node_base; -public: - using parent::parent; - typed_program_node(const std::shared_ptr prim, program& prog) : parent(prim, prog) { - } - program_node& input() const { return get_dependency(0); } -}; using gather_tree_node = typed_program_node; diff --git a/src/plugins/intel_gpu/src/graph/include/grn_inst.h b/src/plugins/intel_gpu/src/graph/include/grn_inst.h index 5aaebd4c4d1..5e04b9afddd 100644 --- a/src/plugins/intel_gpu/src/graph/include/grn_inst.h +++ b/src/plugins/intel_gpu/src/graph/include/grn_inst.h @@ -11,16 +11,6 @@ namespace cldnn { -template <> -struct typed_program_node : public typed_program_node_base { - using parent = typed_program_node_base; - -public: - using parent::parent; - - program_node& input() const { return get_dependency(0); } -}; - using grn_node = typed_program_node; template <> diff --git a/src/plugins/intel_gpu/src/graph/include/random_uniform_inst.h b/src/plugins/intel_gpu/src/graph/include/random_uniform_inst.h index 15158cd74a2..2391fb6f259 100644 --- a/src/plugins/intel_gpu/src/graph/include/random_uniform_inst.h +++ b/src/plugins/intel_gpu/src/graph/include/random_uniform_inst.h @@ -10,15 +10,6 @@ namespace cldnn { -template<> -struct typed_program_node : public typed_program_node_base { - using parent = typed_program_node_base; -public: - using parent::parent; - - const program_node &input(std::size_t index = 0) const { return get_dependency(index); } -}; - using random_uniform_node = typed_program_node; template<> diff --git a/src/plugins/intel_gpu/src/graph/include/read_value_inst.h b/src/plugins/intel_gpu/src/graph/include/read_value_inst.h index 51ab997948f..22c31219f96 100644 --- a/src/plugins/intel_gpu/src/graph/include/read_value_inst.h +++ b/src/plugins/intel_gpu/src/graph/include/read_value_inst.h @@ -11,15 +11,6 @@ namespace cldnn { -template<> -struct typed_program_node : public typed_program_node_base { - using parent = typed_program_node_base; -public: - using parent::parent; - - const program_node& input(std::size_t index = 0) const { return get_dependency(index); } -}; - using read_value_node = typed_program_node; template<> diff --git a/src/plugins/intel_gpu/src/graph/include/reduce_inst.h b/src/plugins/intel_gpu/src/graph/include/reduce_inst.h index 5c100ba9f84..7dd3526a6e3 100644 --- a/src/plugins/intel_gpu/src/graph/include/reduce_inst.h +++ b/src/plugins/intel_gpu/src/graph/include/reduce_inst.h @@ -10,15 +10,6 @@ #include namespace cldnn { -template <> -struct typed_program_node : public typed_program_node_base { - using parent = typed_program_node_base; - -public: - using parent::parent; - - program_node& input(size_t index = 0) const { return get_dependency(index); } -}; using reduce_node = typed_program_node; diff --git a/src/plugins/intel_gpu/src/graph/include/reverse_inst.h b/src/plugins/intel_gpu/src/graph/include/reverse_inst.h index 102645a1579..64c5b613f07 100644 --- a/src/plugins/intel_gpu/src/graph/include/reverse_inst.h +++ b/src/plugins/intel_gpu/src/graph/include/reverse_inst.h @@ -10,17 +10,6 @@ #include "primitive_inst.h" namespace cldnn { -template <> -struct typed_program_node : public typed_program_node_base { - using parent = typed_program_node_base; - -public: - using parent::parent; - - program_node& input(size_t index = 0) const { - return get_dependency(index); - } -}; using reverse_node = typed_program_node; diff --git a/src/plugins/intel_gpu/src/graph/include/reverse_sequence_inst.h b/src/plugins/intel_gpu/src/graph/include/reverse_sequence_inst.h index a6e5a60377c..944d24e8de9 100644 --- a/src/plugins/intel_gpu/src/graph/include/reverse_sequence_inst.h +++ b/src/plugins/intel_gpu/src/graph/include/reverse_sequence_inst.h @@ -10,15 +10,6 @@ #include namespace cldnn { -template <> -struct typed_program_node : public typed_program_node_base { - using parent = typed_program_node_base; - -public: - using parent::parent; - - program_node& input(size_t index = 0) const { return get_dependency(index); } -}; using reverse_sequence_node = typed_program_node; diff --git a/src/plugins/intel_gpu/src/graph/include/roi_align_inst.h b/src/plugins/intel_gpu/src/graph/include/roi_align_inst.h index 071540ed727..71d8f45ae4a 100644 --- a/src/plugins/intel_gpu/src/graph/include/roi_align_inst.h +++ b/src/plugins/intel_gpu/src/graph/include/roi_align_inst.h @@ -9,16 +9,6 @@ namespace cldnn { -template <> -struct typed_program_node : public typed_program_node_base { - using parent = typed_program_node_base; - -public: - using parent::parent; - - program_node& input(std::size_t index = 0) const { return get_dependency(index); } -}; - using roi_align_node = typed_program_node; template <> diff --git a/src/plugins/intel_gpu/src/graph/include/roll_inst.hpp b/src/plugins/intel_gpu/src/graph/include/roll_inst.hpp index 9a9f1e2d460..ad4c0deda95 100644 --- a/src/plugins/intel_gpu/src/graph/include/roll_inst.hpp +++ b/src/plugins/intel_gpu/src/graph/include/roll_inst.hpp @@ -8,16 +8,6 @@ namespace cldnn { -template <> -struct typed_program_node : typed_program_node_base { - using parent = typed_program_node_base; - using parent::parent; - - program_node& input() const { - return get_dependency(0); - } -}; - using roll_node = typed_program_node; template <> diff --git a/src/plugins/intel_gpu/src/graph/include/scatter_elements_update_inst.h b/src/plugins/intel_gpu/src/graph/include/scatter_elements_update_inst.h index 124dfb1d181..cf0c50a608b 100644 --- a/src/plugins/intel_gpu/src/graph/include/scatter_elements_update_inst.h +++ b/src/plugins/intel_gpu/src/graph/include/scatter_elements_update_inst.h @@ -9,15 +9,6 @@ #include namespace cldnn { -template <> -struct typed_program_node : public typed_program_node_base { - using parent = typed_program_node_base; - -public: - using parent::parent; - - program_node& input(size_t index = 0) const { return get_dependency(index); } -}; using scatter_elements_update_node = typed_program_node; diff --git a/src/plugins/intel_gpu/src/graph/include/scatter_nd_update_inst.h b/src/plugins/intel_gpu/src/graph/include/scatter_nd_update_inst.h index e2716e1f654..6d27fcae28d 100644 --- a/src/plugins/intel_gpu/src/graph/include/scatter_nd_update_inst.h +++ b/src/plugins/intel_gpu/src/graph/include/scatter_nd_update_inst.h @@ -9,15 +9,6 @@ #include namespace cldnn { -template <> -struct typed_program_node : public typed_program_node_base { - using parent = typed_program_node_base; - -public: - using parent::parent; - - program_node& input(size_t index = 0) const { return get_dependency(index); } -}; using scatter_nd_update_node = typed_program_node; diff --git a/src/plugins/intel_gpu/src/graph/include/scatter_update_inst.h b/src/plugins/intel_gpu/src/graph/include/scatter_update_inst.h index 204d2838e56..1aaef332d8c 100644 --- a/src/plugins/intel_gpu/src/graph/include/scatter_update_inst.h +++ b/src/plugins/intel_gpu/src/graph/include/scatter_update_inst.h @@ -10,15 +10,6 @@ #include namespace cldnn { -template <> -struct typed_program_node : public typed_program_node_base { - using parent = typed_program_node_base; - -public: - using parent::parent; - - program_node& input(size_t index = 0) const { return get_dependency(index); } -}; using scatter_update_node = typed_program_node; diff --git a/src/plugins/intel_gpu/src/graph/include/shuffle_channels_inst.h b/src/plugins/intel_gpu/src/graph/include/shuffle_channels_inst.h index 280c47c97cf..4a522d6398e 100644 --- a/src/plugins/intel_gpu/src/graph/include/shuffle_channels_inst.h +++ b/src/plugins/intel_gpu/src/graph/include/shuffle_channels_inst.h @@ -10,15 +10,6 @@ #include namespace cldnn { -template <> -struct typed_program_node : public typed_program_node_base { - using parent = typed_program_node_base; - -public: - using parent::parent; - - program_node& input(size_t index = 0) const { return get_dependency(index); } -}; using shuffle_channels_node = typed_program_node; diff --git a/src/plugins/intel_gpu/src/graph/include/slice_inst.h b/src/plugins/intel_gpu/src/graph/include/slice_inst.h index 1b43031ee96..8c7583f4e1c 100644 --- a/src/plugins/intel_gpu/src/graph/include/slice_inst.h +++ b/src/plugins/intel_gpu/src/graph/include/slice_inst.h @@ -9,16 +9,6 @@ namespace cldnn { -template <> -struct typed_program_node : public typed_program_node_base { - using parent = typed_program_node_base; - -public: - using parent::parent; - - program_node& input(std::size_t index = 0) const { return get_dependency(index); } -}; - using slice_node = typed_program_node; template <> diff --git a/src/plugins/intel_gpu/src/graph/include/space_to_batch_inst.h b/src/plugins/intel_gpu/src/graph/include/space_to_batch_inst.h index 2fe2ede1907..f9d6b7838ae 100644 --- a/src/plugins/intel_gpu/src/graph/include/space_to_batch_inst.h +++ b/src/plugins/intel_gpu/src/graph/include/space_to_batch_inst.h @@ -11,15 +11,6 @@ #include namespace cldnn { -template <> -struct typed_program_node : public typed_program_node_base { - using parent = typed_program_node_base; - -public: - using parent::parent; - - program_node& input(size_t index = 0) const { return get_dependency(index); } -}; using space_to_batch_node = typed_program_node; diff --git a/src/plugins/intel_gpu/src/graph/include/space_to_depth_inst.h b/src/plugins/intel_gpu/src/graph/include/space_to_depth_inst.h index 0f6123f3337..16b7b3d9e88 100644 --- a/src/plugins/intel_gpu/src/graph/include/space_to_depth_inst.h +++ b/src/plugins/intel_gpu/src/graph/include/space_to_depth_inst.h @@ -11,15 +11,6 @@ #include namespace cldnn { -template <> -struct typed_program_node : public typed_program_node_base { - using parent = typed_program_node_base; - -public: - using parent::parent; - - program_node& input(size_t index = 0) const { return get_dependency(index); } -}; using space_to_depth_node = typed_program_node; diff --git a/src/plugins/intel_gpu/src/graph/include/split_inst.h b/src/plugins/intel_gpu/src/graph/include/split_inst.h index fb53016c078..5c00c952d65 100644 --- a/src/plugins/intel_gpu/src/graph/include/split_inst.h +++ b/src/plugins/intel_gpu/src/graph/include/split_inst.h @@ -12,16 +12,6 @@ namespace cldnn { -template <> -class typed_program_node : public typed_program_node_base { - using parent = typed_program_node_base; - -public: - using parent::parent; - - program_node& input() const { return get_dependency(0); } -}; - using split_node = typed_program_node; template <>