From 0ddf21cbe7ea98e05d3d1b94abe55e0b1a2d3a12 Mon Sep 17 00:00:00 2001 From: Vladimir Paramuzov Date: Fri, 24 Jan 2025 11:36:39 +0400 Subject: [PATCH] Use std::make_unique Signed-off-by: Vladimir Paramuzov --- src/plugins/intel_gpu/include/intel_gpu/runtime/utils.hpp | 5 ----- src/plugins/intel_gpu/src/graph/compilation_context.cpp | 2 +- .../intel_gpu/src/graph/impls/common/condition.cpp | 4 ++-- src/plugins/intel_gpu/src/graph/impls/common/loop.cpp | 4 ++-- .../intel_gpu/src/graph/impls/common/wait_for_events.cpp | 6 +++--- src/plugins/intel_gpu/src/graph/impls/cpu/activation.cpp | 4 ++-- src/plugins/intel_gpu/src/graph/impls/cpu/assign.cpp | 4 ++-- src/plugins/intel_gpu/src/graph/impls/cpu/broadcast.cpp | 4 ++-- src/plugins/intel_gpu/src/graph/impls/cpu/concat.cpp | 4 ++-- src/plugins/intel_gpu/src/graph/impls/cpu/crop.cpp | 4 ++-- .../intel_gpu/src/graph/impls/cpu/detection_output.cpp | 4 ++-- src/plugins/intel_gpu/src/graph/impls/cpu/eltwise.cpp | 4 ++-- .../intel_gpu/src/graph/impls/cpu/fake_convert.cpp | 4 ++-- src/plugins/intel_gpu/src/graph/impls/cpu/gather.cpp | 4 ++-- .../intel_gpu/src/graph/impls/cpu/non_max_suppression.cpp | 8 ++++---- src/plugins/intel_gpu/src/graph/impls/cpu/proposal.cpp | 4 ++-- src/plugins/intel_gpu/src/graph/impls/cpu/range.cpp | 4 ++-- src/plugins/intel_gpu/src/graph/impls/cpu/read_value.cpp | 4 ++-- src/plugins/intel_gpu/src/graph/impls/cpu/reduce.cpp | 4 ++-- src/plugins/intel_gpu/src/graph/impls/cpu/reorder.cpp | 4 ++-- .../intel_gpu/src/graph/impls/cpu/scatter_update.cpp | 4 ++-- src/plugins/intel_gpu/src/graph/impls/cpu/select.cpp | 4 ++-- src/plugins/intel_gpu/src/graph/impls/cpu/shape_of.cpp | 4 ++-- .../intel_gpu/src/graph/impls/cpu/strided_slice.cpp | 4 ++-- src/plugins/intel_gpu/src/graph/impls/cpu/tile.cpp | 4 ++-- .../intel_gpu/src/graph/impls/ocl/custom_primitive.cpp | 4 ++-- src/plugins/intel_gpu/src/graph/impls/ocl/gemm.cpp | 2 +- src/plugins/intel_gpu/src/graph/impls/ocl/kv_cache.cpp | 2 +- src/plugins/intel_gpu/src/graph/impls/ocl/lstm_cell.cpp | 2 +- .../src/graph/impls/ocl/multi_stage_primitive.hpp | 4 ++-- .../intel_gpu/src/graph/impls/ocl/mutable_data.cpp | 4 ++-- .../intel_gpu/src/graph/impls/ocl/paged_attention.cpp | 4 ++-- .../intel_gpu/src/graph/impls/ocl/primitive_base.hpp | 8 ++++---- src/plugins/intel_gpu/src/graph/impls/ocl/reorder.cpp | 2 +- src/plugins/intel_gpu/src/graph/impls/ocl/rnn_seq.cpp | 2 +- .../src/graph/impls/ocl/scaled_dot_product_attention.cpp | 2 +- .../intel_gpu/src/graph/impls/ocl/search_sorted.cpp | 2 +- src/plugins/intel_gpu/src/graph/impls/ocl/stft.cpp | 2 +- .../src/graph/impls/onednn/concatenation_onednn.cpp | 6 +++--- .../src/graph/impls/onednn/convolution_onednn.cpp | 4 ++-- .../src/graph/impls/onednn/deconvolution_onednn.cpp | 4 ++-- .../src/graph/impls/onednn/fully_connected_onednn.cpp | 6 +++--- .../intel_gpu/src/graph/impls/onednn/gemm_onednn.cpp | 4 ++-- .../intel_gpu/src/graph/impls/onednn/lstm_seq_onednn.cpp | 4 ++-- .../intel_gpu/src/graph/impls/onednn/pooling_onednn.cpp | 4 ++-- .../intel_gpu/src/graph/impls/onednn/reduce_onednn.cpp | 4 ++-- .../intel_gpu/src/graph/impls/onednn/reorder_onednn.cpp | 6 +++--- .../intel_gpu/src/graph/impls/sycl/impl_example.cpp | 4 ++-- src/plugins/intel_gpu/src/graph/primitive_inst.cpp | 2 +- src/plugins/intel_gpu/src/graph/program.cpp | 8 ++++---- src/plugins/intel_gpu/src/plugin/compiled_model.cpp | 4 ++-- src/plugins/intel_gpu/src/plugin/plugin.cpp | 4 ++-- src/plugins/intel_gpu/src/runtime/ocl/sycl_engine.cpp | 2 +- src/plugins/intel_gpu/src/runtime/ocl/sycl_stream.cpp | 4 ++-- .../intel_gpu/tests/unit/module_tests/impls_test.cpp | 6 +++--- 55 files changed, 108 insertions(+), 113 deletions(-) diff --git a/src/plugins/intel_gpu/include/intel_gpu/runtime/utils.hpp b/src/plugins/intel_gpu/include/intel_gpu/runtime/utils.hpp index 425f0da3745a4a..03910ce2054784 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/runtime/utils.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/runtime/utils.hpp @@ -129,11 +129,6 @@ constexpr auto round_up_to(T1 val, T2 rounding) return static_cast(ceil_div(val, rounding) * static_cast(rounding)); } -template -std::unique_ptr make_unique(Args&& ... args) { - return std::unique_ptr( new T(std::forward(args)...) ); -} - template ::value, int>::type = 0> inline derived_type* downcast(base_type* base) { if (auto casted = dynamic_cast(base)) diff --git a/src/plugins/intel_gpu/src/graph/compilation_context.cpp b/src/plugins/intel_gpu/src/graph/compilation_context.cpp index d1024d7e8a8ed5..c2554c3c6eef32 100644 --- a/src/plugins/intel_gpu/src/graph/compilation_context.cpp +++ b/src/plugins/intel_gpu/src/graph/compilation_context.cpp @@ -90,7 +90,7 @@ class CompilationContext : public ICompilationContext { }; std::shared_ptr ICompilationContext::create(ov::threading::IStreamsExecutor::Config task_executor_config) { - return cldnn::make_unique(task_executor_config); + return std::make_unique(task_executor_config); } } // namespace cldnn diff --git a/src/plugins/intel_gpu/src/graph/impls/common/condition.cpp b/src/plugins/intel_gpu/src/graph/impls/common/condition.cpp index 0d3a5022de9416..9c5a43338cc85d 100644 --- a/src/plugins/intel_gpu/src/graph/impls/common/condition.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/common/condition.cpp @@ -19,7 +19,7 @@ struct condition_impl : typed_primitive_impl { DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::common::condition_impl) std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } condition_impl() : parent() {} @@ -146,7 +146,7 @@ struct condition_impl : typed_primitive_impl { } static std::unique_ptr create(const condition_node& arg, const kernel_impl_params&) { - return make_unique(arg); + return std::make_unique(arg); } void init_kernels(const kernels_cache& , const kernel_impl_params&) override {} diff --git a/src/plugins/intel_gpu/src/graph/impls/common/loop.cpp b/src/plugins/intel_gpu/src/graph/impls/common/loop.cpp index c0b3d20cf55fec..9be838de1ce118 100644 --- a/src/plugins/intel_gpu/src/graph/impls/common/loop.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/common/loop.cpp @@ -90,7 +90,7 @@ struct loop_impl : typed_primitive_impl { DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::common::loop_impl) std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } void init_kernels(const kernels_cache& , const kernel_impl_params&) override {} @@ -287,7 +287,7 @@ struct loop_impl : typed_primitive_impl { } static std::unique_ptr create(const loop_node& arg, const kernel_impl_params&) { - return make_unique(arg); + return std::make_unique(arg); } void save(BinaryOutputBuffer& ob) const override { diff --git a/src/plugins/intel_gpu/src/graph/impls/common/wait_for_events.cpp b/src/plugins/intel_gpu/src/graph/impls/common/wait_for_events.cpp index 630e5e3364df20..3c39e9898a5fff 100644 --- a/src/plugins/intel_gpu/src/graph/impls/common/wait_for_events.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/common/wait_for_events.cpp @@ -26,7 +26,7 @@ class wait_for_events_impl : public primitive_impl { DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::common::wait_for_events_impl) std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } void init_kernels(const kernels_cache&, const kernel_impl_params&) override {} @@ -41,11 +41,11 @@ class wait_for_events_impl : public primitive_impl { } static std::unique_ptr create_data(const data_node& data, const kernel_impl_params&) { - return make_unique(data); + return std::make_unique(data); } static std::unique_ptr create_input_layout(const input_layout_node& input, const kernel_impl_params&) { - return make_unique(input); + return std::make_unique(input); } void update(primitive_inst& inst, const kernel_impl_params& impl_param) override { } diff --git a/src/plugins/intel_gpu/src/graph/impls/cpu/activation.cpp b/src/plugins/intel_gpu/src/graph/impls/cpu/activation.cpp index a6ef4036c2dfc8..a537644190ceef 100644 --- a/src/plugins/intel_gpu/src/graph/impls/cpu/activation.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/cpu/activation.cpp @@ -61,7 +61,7 @@ struct activation_impl : public typed_primitive_impl { DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::cpu::activation_impl) std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } activation_impl() : parent("activation_cpu_impl") {} @@ -287,7 +287,7 @@ struct activation_impl : public typed_primitive_impl { public: static std::unique_ptr create(const activation_node& arg, const kernel_impl_params& impl_param) { - return make_unique(); + return std::make_unique(); } }; diff --git a/src/plugins/intel_gpu/src/graph/impls/cpu/assign.cpp b/src/plugins/intel_gpu/src/graph/impls/cpu/assign.cpp index 9e1aca1203e7c6..5e4c46776ce5b0 100644 --- a/src/plugins/intel_gpu/src/graph/impls/cpu/assign.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/cpu/assign.cpp @@ -18,7 +18,7 @@ struct assign_impl : public typed_primitive_impl { DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::cpu::assign_impl) std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } assign_impl() : parent() {} @@ -64,7 +64,7 @@ struct assign_impl : public typed_primitive_impl { public: static std::unique_ptr create(const assign_node& arg, const kernel_impl_params& impl_param) { - return make_unique(); + return std::make_unique(); } }; diff --git a/src/plugins/intel_gpu/src/graph/impls/cpu/broadcast.cpp b/src/plugins/intel_gpu/src/graph/impls/cpu/broadcast.cpp index bb159019053124..772fe2751adae0 100644 --- a/src/plugins/intel_gpu/src/graph/impls/cpu/broadcast.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/cpu/broadcast.cpp @@ -25,7 +25,7 @@ struct broadcast_impl : public typed_primitive_impl { DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::cpu::broadcast_impl) std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } broadcast_impl() : parent("broadcast_cpu_impl") {} @@ -121,7 +121,7 @@ struct broadcast_impl : public typed_primitive_impl { public: static std::unique_ptr create(const broadcast_node& arg, const kernel_impl_params& impl_param) { - return make_unique(); + return std::make_unique(); } }; diff --git a/src/plugins/intel_gpu/src/graph/impls/cpu/concat.cpp b/src/plugins/intel_gpu/src/graph/impls/cpu/concat.cpp index c542ab21a20183..ad1f4979141f56 100644 --- a/src/plugins/intel_gpu/src/graph/impls/cpu/concat.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/cpu/concat.cpp @@ -23,7 +23,7 @@ struct concatenation_impl : public typed_primitive_impl { DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::cpu::concatenation_impl) std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } concatenation_impl() : parent("concatenation_cpu_impl") {} @@ -108,7 +108,7 @@ struct concatenation_impl : public typed_primitive_impl { public: static std::unique_ptr create(const concatenation_node& arg, const kernel_impl_params& impl_param) { - return make_unique(); + return std::make_unique(); } }; diff --git a/src/plugins/intel_gpu/src/graph/impls/cpu/crop.cpp b/src/plugins/intel_gpu/src/graph/impls/cpu/crop.cpp index 816f4e1cb1e095..3a40be6b87ea19 100644 --- a/src/plugins/intel_gpu/src/graph/impls/cpu/crop.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/cpu/crop.cpp @@ -21,7 +21,7 @@ struct crop_impl : public typed_primitive_impl { DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::cpu::crop_impl) std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } crop_impl() : parent("crop_cpu_impl") {} @@ -108,7 +108,7 @@ struct crop_impl : public typed_primitive_impl { public: static std::unique_ptr create(const crop_node& arg, const kernel_impl_params& impl_param) { - return make_unique(); + return std::make_unique(); } }; diff --git a/src/plugins/intel_gpu/src/graph/impls/cpu/detection_output.cpp b/src/plugins/intel_gpu/src/graph/impls/cpu/detection_output.cpp index fe1592ef211e73..995c4ebac2e52e 100644 --- a/src/plugins/intel_gpu/src/graph/impls/cpu/detection_output.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/cpu/detection_output.cpp @@ -46,7 +46,7 @@ struct detection_output_impl : typed_primitive_impl { DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::cpu::detection_output_impl) std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } detection_output_impl() : parent() {} @@ -858,7 +858,7 @@ struct detection_output_impl : typed_primitive_impl { void init_kernels(const kernels_cache& , const kernel_impl_params&) override {} static std::unique_ptr create(const detection_output_node& arg, const kernel_impl_params&) { - return make_unique(arg); + return std::make_unique(arg); } }; diff --git a/src/plugins/intel_gpu/src/graph/impls/cpu/eltwise.cpp b/src/plugins/intel_gpu/src/graph/impls/cpu/eltwise.cpp index 314749bf4a9c7b..6c34fdb53ddad0 100644 --- a/src/plugins/intel_gpu/src/graph/impls/cpu/eltwise.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/cpu/eltwise.cpp @@ -50,7 +50,7 @@ struct eltwise_impl : public typed_primitive_impl { DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::cpu::eltwise_impl) std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } eltwise_impl() : parent("eltwise_cpu_impl") {} @@ -221,7 +221,7 @@ struct eltwise_impl : public typed_primitive_impl { public: static std::unique_ptr create(const eltwise_node& arg, const kernel_impl_params& impl_param) { - return make_unique(); + return std::make_unique(); } }; diff --git a/src/plugins/intel_gpu/src/graph/impls/cpu/fake_convert.cpp b/src/plugins/intel_gpu/src/graph/impls/cpu/fake_convert.cpp index a5f94741c40bf5..47a9f1ef02db99 100644 --- a/src/plugins/intel_gpu/src/graph/impls/cpu/fake_convert.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/cpu/fake_convert.cpp @@ -23,7 +23,7 @@ struct fake_convert_impl : public typed_primitive_impl { DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::cpu::fake_convert_impl) std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } fake_convert_impl() : parent("fake_convert_cpu_impl") {} @@ -97,7 +97,7 @@ struct fake_convert_impl : public typed_primitive_impl { public: static std::unique_ptr create(const fake_convert_node& arg, const kernel_impl_params& impl_param) { - return make_unique(); + return std::make_unique(); } }; diff --git a/src/plugins/intel_gpu/src/graph/impls/cpu/gather.cpp b/src/plugins/intel_gpu/src/graph/impls/cpu/gather.cpp index 130ee6f8181cf0..e46a9892d64cb5 100644 --- a/src/plugins/intel_gpu/src/graph/impls/cpu/gather.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/cpu/gather.cpp @@ -24,7 +24,7 @@ struct gather_impl : public typed_primitive_impl { DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::cpu::gather_impl) std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } gather_impl() : parent("gather_cpu_impl") {} @@ -111,7 +111,7 @@ struct gather_impl : public typed_primitive_impl { public: static std::unique_ptr create(const gather_node& arg, const kernel_impl_params& impl_param) { - return make_unique(); + return std::make_unique(); } }; diff --git a/src/plugins/intel_gpu/src/graph/impls/cpu/non_max_suppression.cpp b/src/plugins/intel_gpu/src/graph/impls/cpu/non_max_suppression.cpp index ce1a022c9c5831..031b96d8aafb6c 100644 --- a/src/plugins/intel_gpu/src/graph/impls/cpu/non_max_suppression.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/cpu/non_max_suppression.cpp @@ -395,7 +395,7 @@ struct non_max_suppression_impl : typed_primitive_impl { DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::cpu::non_max_suppression_impl) std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } non_max_suppression_impl() : parent("non_max_suppression_impl") {} @@ -420,7 +420,7 @@ struct non_max_suppression_impl : typed_primitive_impl { } static std::unique_ptr create(const non_max_suppression_node&, const kernel_impl_params&) { - return make_unique(); + return std::make_unique(); } void init_kernels(const kernels_cache&, const kernel_impl_params&) override {} }; @@ -442,7 +442,7 @@ struct non_max_suppression_gather_impl : typed_primitive_impl clone() const override { - return make_unique(*this); + return std::make_unique(*this); } non_max_suppression_gather_impl() : parent("non_max_suppression_gather_impl") {} @@ -464,7 +464,7 @@ struct non_max_suppression_gather_impl : typed_primitive_impl create(const non_max_suppression_gather_node&, const kernel_impl_params&) { - return make_unique(); + return std::make_unique(); } void init_kernels(const kernels_cache&, const kernel_impl_params&) override {} }; diff --git a/src/plugins/intel_gpu/src/graph/impls/cpu/proposal.cpp b/src/plugins/intel_gpu/src/graph/impls/cpu/proposal.cpp index 3d0f23f172f7d0..6ce94b167b9824 100644 --- a/src/plugins/intel_gpu/src/graph/impls/cpu/proposal.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/cpu/proposal.cpp @@ -194,7 +194,7 @@ struct proposal_impl : typed_primitive_impl { DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::cpu::proposal_impl) std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } template @@ -453,7 +453,7 @@ struct proposal_impl : typed_primitive_impl { OPENVINO_ASSERT(one_of(count, {3, 4, 6}), arg.id(), "image_info must have either 3, 4 or 6 items"); } - return make_unique(arg); + return std::make_unique(arg); } }; diff --git a/src/plugins/intel_gpu/src/graph/impls/cpu/range.cpp b/src/plugins/intel_gpu/src/graph/impls/cpu/range.cpp index 9d4aafb812cbc9..c3ec254a48576b 100644 --- a/src/plugins/intel_gpu/src/graph/impls/cpu/range.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/cpu/range.cpp @@ -21,7 +21,7 @@ struct range_impl : public typed_primitive_impl { DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::cpu::range_impl) std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } range_impl() : parent("range_cpu_impl") {} @@ -88,7 +88,7 @@ struct range_impl : public typed_primitive_impl { public: static std::unique_ptr create(const range_node& arg, const kernel_impl_params& impl_param) { - return make_unique(); + return std::make_unique(); } }; 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 index f08fa6a67b6303..5e56d8c372eda2 100644 --- a/src/plugins/intel_gpu/src/graph/impls/cpu/read_value.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/cpu/read_value.cpp @@ -23,7 +23,7 @@ struct read_value_impl : public typed_primitive_impl { DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::cpu::read_value_impl) std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } read_value_impl() : parent() {} @@ -97,7 +97,7 @@ struct read_value_impl : public typed_primitive_impl { public: static std::unique_ptr create(const read_value_node& arg, const kernel_impl_params& impl_param) { - return make_unique(arg); + return std::make_unique(arg); } }; diff --git a/src/plugins/intel_gpu/src/graph/impls/cpu/reduce.cpp b/src/plugins/intel_gpu/src/graph/impls/cpu/reduce.cpp index af1a6d0d950a7c..de590be7b1e19f 100644 --- a/src/plugins/intel_gpu/src/graph/impls/cpu/reduce.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/cpu/reduce.cpp @@ -43,7 +43,7 @@ struct reduce_impl : public typed_primitive_impl { DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::cpu::reduce_impl) std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } reduce_impl() : parent("reduce_cpu_impl") {} @@ -148,7 +148,7 @@ struct reduce_impl : public typed_primitive_impl { public: static std::unique_ptr create(const reduce_node& arg, const kernel_impl_params& impl_param) { - return make_unique(); + return std::make_unique(); } }; diff --git a/src/plugins/intel_gpu/src/graph/impls/cpu/reorder.cpp b/src/plugins/intel_gpu/src/graph/impls/cpu/reorder.cpp index fc7eb5329c362a..abcd6569acb9b7 100644 --- a/src/plugins/intel_gpu/src/graph/impls/cpu/reorder.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/cpu/reorder.cpp @@ -21,7 +21,7 @@ struct reorder_impl : public typed_primitive_impl { DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::cpu::reorder_impl) std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } reorder_impl() : parent("reorder_cpu_impl") {} @@ -81,7 +81,7 @@ struct reorder_impl : public typed_primitive_impl { public: static std::unique_ptr create(const reorder_node& arg, const kernel_impl_params& impl_param) { - return make_unique(); + return std::make_unique(); } }; diff --git a/src/plugins/intel_gpu/src/graph/impls/cpu/scatter_update.cpp b/src/plugins/intel_gpu/src/graph/impls/cpu/scatter_update.cpp index 7e2b2beadf74c0..b27fe10bf64ecc 100644 --- a/src/plugins/intel_gpu/src/graph/impls/cpu/scatter_update.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/cpu/scatter_update.cpp @@ -23,7 +23,7 @@ struct scatter_update_impl : public typed_primitive_impl { DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::cpu::scatter_update_impl) std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } scatter_update_impl() : parent("scatter_update_cpu_impl") {} @@ -103,7 +103,7 @@ struct scatter_update_impl : public typed_primitive_impl { public: static std::unique_ptr create(const scatter_update_node& arg, const kernel_impl_params& impl_param) { - return make_unique(); + return std::make_unique(); } }; diff --git a/src/plugins/intel_gpu/src/graph/impls/cpu/select.cpp b/src/plugins/intel_gpu/src/graph/impls/cpu/select.cpp index 7c9c501bedf8de..6aa27fea1d4990 100644 --- a/src/plugins/intel_gpu/src/graph/impls/cpu/select.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/cpu/select.cpp @@ -22,7 +22,7 @@ struct select_impl : public typed_primitive_impl { public: static std::unique_ptr create(const select_node& arg, const kernel_impl_params& impl_param) { - return make_unique(); + return std::make_unique(); } }; diff --git a/src/plugins/intel_gpu/src/graph/impls/cpu/shape_of.cpp b/src/plugins/intel_gpu/src/graph/impls/cpu/shape_of.cpp index 458abdd3934c53..c2979f6afb7b07 100644 --- a/src/plugins/intel_gpu/src/graph/impls/cpu/shape_of.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/cpu/shape_of.cpp @@ -22,7 +22,7 @@ struct shape_of_impl : public typed_primitive_impl { DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::cpu::shape_of_impl) std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } shape_of_impl() : parent("shape_of_cpu_impl") {} @@ -72,7 +72,7 @@ struct shape_of_impl : public typed_primitive_impl { public: static std::unique_ptr create(const shape_of_node& arg, const kernel_impl_params& impl_param) { - return make_unique(); + return std::make_unique(); } }; diff --git a/src/plugins/intel_gpu/src/graph/impls/cpu/strided_slice.cpp b/src/plugins/intel_gpu/src/graph/impls/cpu/strided_slice.cpp index 3013e591956e52..32e8b6e66b1853 100644 --- a/src/plugins/intel_gpu/src/graph/impls/cpu/strided_slice.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/cpu/strided_slice.cpp @@ -31,7 +31,7 @@ struct strided_slice_impl : public typed_primitive_impl { DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::cpu::strided_slice_impl) std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } strided_slice_impl() : parent("strided_slice_cpu_impl") {} @@ -177,7 +177,7 @@ struct strided_slice_impl : public typed_primitive_impl { public: static std::unique_ptr create(const strided_slice_node& arg, const kernel_impl_params& impl_param) { - return make_unique(); + return std::make_unique(); } }; diff --git a/src/plugins/intel_gpu/src/graph/impls/cpu/tile.cpp b/src/plugins/intel_gpu/src/graph/impls/cpu/tile.cpp index a1877c7b408232..2650c7716546cb 100644 --- a/src/plugins/intel_gpu/src/graph/impls/cpu/tile.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/cpu/tile.cpp @@ -23,7 +23,7 @@ struct tile_impl : public typed_primitive_impl { DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::cpu::tile_impl) std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } tile_impl() : parent("tile_cpu_impl") {} @@ -105,7 +105,7 @@ struct tile_impl : public typed_primitive_impl { public: static std::unique_ptr create(const tile_node& arg, const kernel_impl_params& impl_param) { - return make_unique(); + return std::make_unique(); } }; diff --git a/src/plugins/intel_gpu/src/graph/impls/ocl/custom_primitive.cpp b/src/plugins/intel_gpu/src/graph/impls/ocl/custom_primitive.cpp index 6bba64af115f82..59abbb7e939ecc 100644 --- a/src/plugins/intel_gpu/src/graph/impls/ocl/custom_primitive.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/ocl/custom_primitive.cpp @@ -30,7 +30,7 @@ struct custom_gpu_primitive_impl : typed_primitive_impl { std::vector _kernels; std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } custom_gpu_primitive_impl() @@ -259,7 +259,7 @@ static std::unique_ptr create(const custom_gpu_primitive_node& a cl_kernel->params.arguments.push_back(get_arg(p)); } - return cldnn::make_unique(arg, cl_kernel); + return std::make_unique(arg, cl_kernel); } namespace detail { diff --git a/src/plugins/intel_gpu/src/graph/impls/ocl/gemm.cpp b/src/plugins/intel_gpu/src/graph/impls/ocl/gemm.cpp index 48335bb240ef38..a77243e8dafce3 100644 --- a/src/plugins/intel_gpu/src/graph/impls/ocl/gemm.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/ocl/gemm.cpp @@ -306,7 +306,7 @@ struct gemm_impl : multi_stage_primitive { indirect_kernel_params.is_shape_agnostic = params.is_dynamic(); kernels_data.push_back(kernel_selector.get_best_kernel(indirect_kernel_params)); } - return cldnn::make_unique(kernels_data); + return std::make_unique(kernels_data); } void update_dispatch_data(const kernel_impl_params& impl_param) override { diff --git a/src/plugins/intel_gpu/src/graph/impls/ocl/kv_cache.cpp b/src/plugins/intel_gpu/src/graph/impls/ocl/kv_cache.cpp index 1ffbfbbfbade37..8a86da0d227e43 100644 --- a/src/plugins/intel_gpu/src/graph/impls/ocl/kv_cache.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/ocl/kv_cache.cpp @@ -480,7 +480,7 @@ struct kv_cache_impl : multi_stage_primitive { kernels_data.push_back(concat_scale_zp_kernel_selector.get_best_kernel(concat_zp_kernel_params)); } } - return cldnn::make_unique(kernels_data); + return std::make_unique(kernels_data); } void update_dispatch_data(const kernel_impl_params& impl_param) override { diff --git a/src/plugins/intel_gpu/src/graph/impls/ocl/lstm_cell.cpp b/src/plugins/intel_gpu/src/graph/impls/ocl/lstm_cell.cpp index a41cd1065122de..e3a1befe176fae 100644 --- a/src/plugins/intel_gpu/src/graph/impls/ocl/lstm_cell.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/ocl/lstm_cell.cpp @@ -22,7 +22,7 @@ struct lstm_cell_impl : typed_primitive_impl_ocl { DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::ocl::lstm_cell_impl) std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } protected: diff --git a/src/plugins/intel_gpu/src/graph/impls/ocl/multi_stage_primitive.hpp b/src/plugins/intel_gpu/src/graph/impls/ocl/multi_stage_primitive.hpp index fb3839b6145dc6..adcfa142812f8b 100644 --- a/src/plugins/intel_gpu/src/graph/impls/ocl/multi_stage_primitive.hpp +++ b/src/plugins/intel_gpu/src/graph/impls/ocl/multi_stage_primitive.hpp @@ -143,11 +143,11 @@ struct multi_stage_primitive : public typed_primitive_impl { template static std::unique_ptr make_deep_copy(const ImplType& impl_ocl) { - auto prim_impl = make_unique(impl_ocl); + auto prim_impl = std::make_unique(impl_ocl); for (auto& _kernel_data : (*prim_impl)._kernels_data) { KernelParamsType* params_ptr = dynamic_cast(_kernel_data.params.get()); if (params_ptr != nullptr) { - _kernel_data.params = make_unique(*params_ptr); + _kernel_data.params = std::make_unique(*params_ptr); } } return prim_impl; diff --git a/src/plugins/intel_gpu/src/graph/impls/ocl/mutable_data.cpp b/src/plugins/intel_gpu/src/graph/impls/ocl/mutable_data.cpp index 04677f692f84dc..76399b52b63617 100644 --- a/src/plugins/intel_gpu/src/graph/impls/ocl/mutable_data.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/ocl/mutable_data.cpp @@ -16,12 +16,12 @@ struct mutable_data_impl : public typed_primitive_impl_ocl { DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::ocl::mutable_data_impl) std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } public: static std::unique_ptr create(mutable_data_node const& arg, const kernel_impl_params&) { - return make_unique(kernel_selector::kernel_data{}); + return std::make_unique(kernel_selector::kernel_data{}); } }; diff --git a/src/plugins/intel_gpu/src/graph/impls/ocl/paged_attention.cpp b/src/plugins/intel_gpu/src/graph/impls/ocl/paged_attention.cpp index 0f285f57e9d18f..9214a626b706f1 100644 --- a/src/plugins/intel_gpu/src/graph/impls/ocl/paged_attention.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/ocl/paged_attention.cpp @@ -38,7 +38,7 @@ struct paged_attention_impl : multi_stage_primitive { DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::ocl::paged_attention_impl) std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } paged_attention_impl() = default; @@ -797,7 +797,7 @@ struct paged_attention_impl : multi_stage_primitive { kernels_data.push_back(kv_cache_rotate_kernel_selector.get_best_kernel(kv_cache_rotate_kernel_params)); } - auto impl = cldnn::make_unique(kernels_data); + auto impl = std::make_unique(kernels_data); impl->has_scores_output = desc->has_scores_output(); impl->has_rotated_blocks = desc->has_rotated_blocks; diff --git a/src/plugins/intel_gpu/src/graph/impls/ocl/primitive_base.hpp b/src/plugins/intel_gpu/src/graph/impls/ocl/primitive_base.hpp index 2b2aede4ae6501..d815f476aae297 100644 --- a/src/plugins/intel_gpu/src/graph/impls/ocl/primitive_base.hpp +++ b/src/plugins/intel_gpu/src/graph/impls/ocl/primitive_base.hpp @@ -94,7 +94,7 @@ struct typed_primitive_impl_ocl : public typed_primitive_impl { !((impl_param.is_type() || impl_param.is_type() || impl_param.runtime_skippable()) && impl_param.is_dynamic())) { - return make_unique(kernel_selector::kernel_data{}); + return std::make_unique(kernel_selector::kernel_data{}); } auto kernel_params = ImplType::get_kernel_params(ImplType::static_canonicalize_shapes(impl_param)); kernel_params.is_shape_agnostic = impl_param.is_dynamic(); @@ -102,7 +102,7 @@ struct typed_primitive_impl_ocl : public typed_primitive_impl { auto& kernel_selector = ImplType::kernel_selector_t::Instance(); auto best_kernel = kernel_selector.get_best_kernel(kernel_params); - return make_unique(best_kernel); + return std::make_unique(best_kernel); } void update(primitive_inst& inst, const kernel_impl_params& impl_params) override { @@ -172,10 +172,10 @@ struct typed_primitive_impl_ocl : public typed_primitive_impl { template static std::unique_ptr make_deep_copy(const ImplType& impl_ocl) { - auto prim_impl = make_unique(impl_ocl); + auto prim_impl = std::make_unique(impl_ocl); KernelParamsType* params_ptr = dynamic_cast((*prim_impl)._kernel_data.params.get()); if (params_ptr != nullptr) { - (*prim_impl)._kernel_data.params = make_unique(*params_ptr); + (*prim_impl)._kernel_data.params = std::make_unique(*params_ptr); } return prim_impl; } diff --git a/src/plugins/intel_gpu/src/graph/impls/ocl/reorder.cpp b/src/plugins/intel_gpu/src/graph/impls/ocl/reorder.cpp index 71bf9c12ddd2c5..db098cc6c34e09 100644 --- a/src/plugins/intel_gpu/src/graph/impls/ocl/reorder.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/ocl/reorder.cpp @@ -156,7 +156,7 @@ struct reorder_impl : typed_primitive_impl_ocl { auto best_kernel = kernel_selector.get_best_kernel(r_params); - return make_unique(best_kernel); + return std::make_unique(best_kernel); } }; diff --git a/src/plugins/intel_gpu/src/graph/impls/ocl/rnn_seq.cpp b/src/plugins/intel_gpu/src/graph/impls/ocl/rnn_seq.cpp index d503e20774f9c8..090b164fe40075 100644 --- a/src/plugins/intel_gpu/src/graph/impls/ocl/rnn_seq.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/ocl/rnn_seq.cpp @@ -23,7 +23,7 @@ struct rnn_seq_impl : typed_primitive_impl_ocl { DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::ocl::rnn_seq_impl) std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } protected: diff --git a/src/plugins/intel_gpu/src/graph/impls/ocl/scaled_dot_product_attention.cpp b/src/plugins/intel_gpu/src/graph/impls/ocl/scaled_dot_product_attention.cpp index 86b49484282238..72c02900f904e7 100644 --- a/src/plugins/intel_gpu/src/graph/impls/ocl/scaled_dot_product_attention.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/ocl/scaled_dot_product_attention.cpp @@ -369,7 +369,7 @@ struct scaled_dot_product_attention_impl : multi_stage_primitive(kernels_data); + return std::make_unique(kernels_data); } void update_dispatch_data(const kernel_impl_params& impl_param) override { diff --git a/src/plugins/intel_gpu/src/graph/impls/ocl/search_sorted.cpp b/src/plugins/intel_gpu/src/graph/impls/ocl/search_sorted.cpp index 94f4f1a3f392bf..2c50c019ee87c9 100644 --- a/src/plugins/intel_gpu/src/graph/impls/ocl/search_sorted.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/ocl/search_sorted.cpp @@ -19,7 +19,7 @@ struct search_sorted_impl : typed_primitive_impl_ocl { DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::ocl::search_sorted_impl) std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } void load(BinaryInputBuffer& ib) override { diff --git a/src/plugins/intel_gpu/src/graph/impls/ocl/stft.cpp b/src/plugins/intel_gpu/src/graph/impls/ocl/stft.cpp index 61ca8eb727bdc6..d120b4805c21c1 100644 --- a/src/plugins/intel_gpu/src/graph/impls/ocl/stft.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/ocl/stft.cpp @@ -19,7 +19,7 @@ struct STFT_impl : typed_primitive_impl_ocl { DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::ocl::STFT_impl) std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } void load(BinaryInputBuffer& ib) override { diff --git a/src/plugins/intel_gpu/src/graph/impls/onednn/concatenation_onednn.cpp b/src/plugins/intel_gpu/src/graph/impls/onednn/concatenation_onednn.cpp index ebd9390c1c0e3a..4e18e07f699174 100644 --- a/src/plugins/intel_gpu/src/graph/impls/onednn/concatenation_onednn.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/onednn/concatenation_onednn.cpp @@ -21,7 +21,7 @@ struct concatenation_onednn : typed_primitive_onednn_impl clone() const override { - return make_unique(*this); + return std::make_unique(*this); } std::unordered_map get_arguments(concatenation_inst& instance) const override { @@ -117,12 +117,12 @@ struct concatenation_onednn : typed_primitive_onednn_implget_engine(); auto& config = impl_params.prog->get_config(); if (impl_params.can_be_optimized()) - return make_unique(engine, config); + return std::make_unique(engine, config); auto prim = impl_params.typed_desc(); auto attr = impl_params.attrs_onednn; auto prim_desc = get_concatenation_primitive_descriptor(impl_params, impl_params.prog->get_engine(), *attr, prim->axis); - return cldnn::make_unique(engine, config, attr, *prim_desc); + return std::make_unique(engine, config, attr, *prim_desc); } }; diff --git a/src/plugins/intel_gpu/src/graph/impls/onednn/convolution_onednn.cpp b/src/plugins/intel_gpu/src/graph/impls/onednn/convolution_onednn.cpp index 02c271b2682161..6f8502423047b6 100644 --- a/src/plugins/intel_gpu/src/graph/impls/onednn/convolution_onednn.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/onednn/convolution_onednn.cpp @@ -125,7 +125,7 @@ struct convolution_onednn : typed_primitive_onednn_impl { protected: std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } std::unordered_map get_arguments(convolution_inst& instance) const override { @@ -358,7 +358,7 @@ struct convolution_onednn : typed_primitive_onednn_impl { auto prim_desc = get_convolution_primitive_descriptor(impl_params, *attr); - auto conv_onednn_impl = cldnn::make_unique(engine, config, attr, *prim_desc, + auto conv_onednn_impl = std::make_unique(engine, config, attr, *prim_desc, get_weights_reorder(impl_params, *prim_desc, arg.get_transposed())); conv_onednn_impl->set_zero_point_mask(zero_point_mask); diff --git a/src/plugins/intel_gpu/src/graph/impls/onednn/deconvolution_onednn.cpp b/src/plugins/intel_gpu/src/graph/impls/onednn/deconvolution_onednn.cpp index 74a7eb39228725..7a7301661618a8 100644 --- a/src/plugins/intel_gpu/src/graph/impls/onednn/deconvolution_onednn.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/onednn/deconvolution_onednn.cpp @@ -93,7 +93,7 @@ struct deconvolution_onednn : typed_primitive_onednn_impl { protected: std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } std::unordered_map get_arguments(deconvolution_inst& instance) const override { @@ -218,7 +218,7 @@ struct deconvolution_onednn : typed_primitive_onednn_impl { auto attr = impl_params.attrs_onednn; auto prim_desc = get_deconvolution_primitive_descriptor(impl_params, *attr); - return cldnn::make_unique(engine, config, attr, *prim_desc, get_weights_reorder(impl_params, *prim_desc)); + return std::make_unique(engine, config, attr, *prim_desc, get_weights_reorder(impl_params, *prim_desc)); } }; diff --git a/src/plugins/intel_gpu/src/graph/impls/onednn/fully_connected_onednn.cpp b/src/plugins/intel_gpu/src/graph/impls/onednn/fully_connected_onednn.cpp index 7e8344b3c5f777..0c70177497cfdd 100644 --- a/src/plugins/intel_gpu/src/graph/impls/onednn/fully_connected_onednn.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/onednn/fully_connected_onednn.cpp @@ -41,7 +41,7 @@ struct fully_connected_onednn : typed_primitive_onednn_impl { protected: std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } std::unordered_map get_arguments(fully_connected_inst& instance) const override { @@ -344,7 +344,7 @@ struct fully_connected_onednn : typed_primitive_onednn_impl { auto prim_desc = get_matmul_primitive_descriptor(impl_params, impl_params.prog->get_engine(), prim->input_size, !prim->bias.empty(), *attr); - auto prim_onednn = cldnn::make_unique(engine, config, attr, *prim_desc); + auto prim_onednn = std::make_unique(engine, config, attr, *prim_desc); prim_onednn->_ds_group_size = group_size; prim_onednn->_ds_data_type = ds_data_type; prim_onednn->_dzp_data_type = dzp_data_type; @@ -353,7 +353,7 @@ struct fully_connected_onednn : typed_primitive_onednn_impl { auto prim_desc = get_matmul_primitive_descriptor(impl_params, impl_params.prog->get_engine(), prim->input_size, !prim->bias.empty(), *attr); - return cldnn::make_unique(engine, config, attr, *prim_desc); + return std::make_unique(engine, config, attr, *prim_desc); } } }; diff --git a/src/plugins/intel_gpu/src/graph/impls/onednn/gemm_onednn.cpp b/src/plugins/intel_gpu/src/graph/impls/onednn/gemm_onednn.cpp index 08870434c986dc..e04bef6f75b1bc 100644 --- a/src/plugins/intel_gpu/src/graph/impls/onednn/gemm_onednn.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/onednn/gemm_onednn.cpp @@ -22,7 +22,7 @@ struct gemm_onednn : typed_primitive_onednn_impl { protected: std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } std::unordered_map get_arguments(gemm_inst& instance) const override { @@ -448,7 +448,7 @@ struct gemm_onednn : typed_primitive_onednn_impl { auto attr = impl_params.attrs_onednn; auto prim_desc = get_gemm_primitive_descriptor(impl_params, *attr); - return cldnn::make_unique(engine, config, attr, *prim_desc); + return std::make_unique(engine, config, attr, *prim_desc); } event::ptr execute_impl(const std::vector& events, typed_primitive_inst& instance) override { diff --git a/src/plugins/intel_gpu/src/graph/impls/onednn/lstm_seq_onednn.cpp b/src/plugins/intel_gpu/src/graph/impls/onednn/lstm_seq_onednn.cpp index 8189e6e7b37412..e876345c4cb555 100644 --- a/src/plugins/intel_gpu/src/graph/impls/onednn/lstm_seq_onednn.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/onednn/lstm_seq_onednn.cpp @@ -24,7 +24,7 @@ struct lstm_seq_onednn : typed_primitive_onednn_impl { protected: std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } std::unordered_map get_arguments(lstm_seq_inst& instance) const override { @@ -202,7 +202,7 @@ struct lstm_seq_onednn : typed_primitive_onednn_impl { auto attr = impl_params.attrs_onednn; auto direction = arg.direction(); auto prim_desc = get_lstm_primitive_descriptor(impl_params, engine, *attr, direction); - return cldnn::make_unique(engine, config, attr, *prim_desc, get_weights_reorder(impl_params, *prim_desc)); + return std::make_unique(engine, config, attr, *prim_desc, get_weights_reorder(impl_params, *prim_desc)); } }; diff --git a/src/plugins/intel_gpu/src/graph/impls/onednn/pooling_onednn.cpp b/src/plugins/intel_gpu/src/graph/impls/onednn/pooling_onednn.cpp index 5462ebe5940d79..7e1863056fb18d 100644 --- a/src/plugins/intel_gpu/src/graph/impls/onednn/pooling_onednn.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/onednn/pooling_onednn.cpp @@ -22,7 +22,7 @@ struct pooling_onednn : typed_primitive_onednn_impl { protected: std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } static std::shared_ptr get_pooling_primitive_descriptor(const kernel_impl_params& impl_params, @@ -155,7 +155,7 @@ struct pooling_onednn : typed_primitive_onednn_impl { auto attr = impl_params.attrs_onednn; auto prim_desc = get_pooling_primitive_descriptor(impl_params, *attr); - return cldnn::make_unique(engine, config, attr, *prim_desc); + return std::make_unique(engine, config, attr, *prim_desc); } }; diff --git a/src/plugins/intel_gpu/src/graph/impls/onednn/reduce_onednn.cpp b/src/plugins/intel_gpu/src/graph/impls/onednn/reduce_onednn.cpp index 41a12023937841..aa44a2246c418d 100644 --- a/src/plugins/intel_gpu/src/graph/impls/onednn/reduce_onednn.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/onednn/reduce_onednn.cpp @@ -43,7 +43,7 @@ struct reduction_onednn : typed_primitive_onednn_impl { protected: std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } static std::shared_ptr get_reduction_primitive_descriptor(const kernel_impl_params& impl_params, @@ -153,7 +153,7 @@ struct reduction_onednn : typed_primitive_onednn_impl { auto attr = impl_params.attrs_onednn; auto prim_desc = get_reduction_primitive_descriptor(impl_params, *attr); - return cldnn::make_unique(engine, config, attr, *prim_desc); + return std::make_unique(engine, config, attr, *prim_desc); } }; diff --git a/src/plugins/intel_gpu/src/graph/impls/onednn/reorder_onednn.cpp b/src/plugins/intel_gpu/src/graph/impls/onednn/reorder_onednn.cpp index 6f755abd4ede5e..5812249fae839c 100644 --- a/src/plugins/intel_gpu/src/graph/impls/onednn/reorder_onednn.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/onednn/reorder_onednn.cpp @@ -23,7 +23,7 @@ struct reorder_onednn : typed_primitive_onednn_impl clone() const override { - return make_unique(*this); + return std::make_unique(*this); } std::unordered_map get_arguments(reorder_inst& instance) const override { @@ -119,7 +119,7 @@ struct reorder_onednn : typed_primitive_onednn_implget_config(); auto attr = impl_params.attrs_onednn; auto prim_desc = get_reorder_primitive_descriptor(impl_params, *attr); - return cldnn::make_unique(engine, config, attr, *prim_desc); + return std::make_unique(engine, config, attr, *prim_desc); } } @@ -144,7 +144,7 @@ struct reorder_onednn : typed_primitive_onednn_impl(engine, impl_param.prog->get_config(), attr, *reorder_prim); + return std::make_unique(engine, impl_param.prog->get_config(), attr, *reorder_prim); } }; diff --git a/src/plugins/intel_gpu/src/graph/impls/sycl/impl_example.cpp b/src/plugins/intel_gpu/src/graph/impls/sycl/impl_example.cpp index afcf1b8ad5714e..aace9ea7cae998 100644 --- a/src/plugins/intel_gpu/src/graph/impls/sycl/impl_example.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/sycl/impl_example.cpp @@ -134,7 +134,7 @@ struct fully_connected_sycl_example : typed_primitive_sycl_impl DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::sycl::fully_connected_sycl_example) std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } event::ptr execute_impl(const std::vector& /* events */, typed_primitive_inst& instance) override { @@ -255,7 +255,7 @@ struct fully_connected_sycl_example : typed_primitive_sycl_impl static std::unique_ptr create(const fully_connected_node& arg, const kernel_impl_params& impl_params) { auto& engine = impl_params.prog->get_engine(); auto& config = impl_params.prog->get_config(); - return cldnn::make_unique(engine, config, get_weights_reorder(impl_params)); + return std::make_unique(engine, config, get_weights_reorder(impl_params)); } }; diff --git a/src/plugins/intel_gpu/src/graph/primitive_inst.cpp b/src/plugins/intel_gpu/src/graph/primitive_inst.cpp index e574684e6b4f10..bcf468cea97d03 100644 --- a/src/plugins/intel_gpu/src/graph/primitive_inst.cpp +++ b/src/plugins/intel_gpu/src/graph/primitive_inst.cpp @@ -2031,7 +2031,7 @@ void primitive_inst::configure_shape_of_dependencies() { primitive_inst::primitive_inst(network& network) : _network(network) , _node(nullptr) - , _impl_params(make_unique()) + , _impl_params(std::make_unique()) , _impl(nullptr) , _outputs({}) , _reordered_weights_cache(network.get_weights_cache_capacity()) diff --git a/src/plugins/intel_gpu/src/graph/program.cpp b/src/plugins/intel_gpu/src/graph/program.cpp index a8224c2e363f62..c3de17f8a196d3 100644 --- a/src/plugins/intel_gpu/src/graph/program.cpp +++ b/src/plugins/intel_gpu/src/graph/program.cpp @@ -213,7 +213,7 @@ program::program(engine& engine, const ExecutionConfig& config) init_primitives(); _config.apply_user_properties(_engine.get_device_info()); new_shape_infer = _config.get_property(ov::intel_gpu::allow_new_shape_infer); - _layout_optimizer = cldnn::make_unique(); + _layout_optimizer = std::make_unique(); } program::~program() { @@ -238,13 +238,13 @@ void program::init_program() { _compilation_context = program::make_compilation_context(_config); - _layout_optimizer = cldnn::make_unique(); + _layout_optimizer = std::make_unique(); size_t impls_cache_capacity = _impls_cache_capacity; GPU_DEBUG_IF(debug_config->impls_cache_capacity >= 0) { impls_cache_capacity = debug_config->impls_cache_capacity; } - _impls_cache = cldnn::make_unique(impls_cache_capacity); + _impls_cache = std::make_unique(impls_cache_capacity); // Remove items of compilation context's internal queue when some impl is popped in kernels_cache // compilation context's queue check duplication of inserted task _impls_cache->set_remove_item_callback([this](ImplementationsCache::ItemType& item) { @@ -554,7 +554,7 @@ void program::pre_optimize_graph(bool is_internal) { apply_opt_pass(); } - _layout_optimizer = cldnn::make_unique(output_size_handling_enabled); + _layout_optimizer = std::make_unique(output_size_handling_enabled); set_layout_optimizer_attributes(*_layout_optimizer); reorder_factory rf; diff --git a/src/plugins/intel_gpu/src/plugin/compiled_model.cpp b/src/plugins/intel_gpu/src/plugin/compiled_model.cpp index 0e13452a47fa58..d273ba2b1df6a6 100644 --- a/src/plugins/intel_gpu/src/plugin/compiled_model.cpp +++ b/src/plugins/intel_gpu/src/plugin/compiled_model.cpp @@ -194,8 +194,8 @@ void CompiledModel::export_model(std::ostream& model) const { const bool encryption_enabled = encryption_callbacks.encrypt && cache_mode == ov::CacheMode::OPTIMIZE_SIZE; std::unique_ptr ob_ptr = encryption_enabled - ? cldnn::make_unique(model, encryption_callbacks.encrypt) - : cldnn::make_unique(model); + ? std::make_unique(model, encryption_callbacks.encrypt) + : std::make_unique(model); auto& ob = *ob_ptr; ob << cldnn::make_data(&cache_mode, sizeof(ov::CacheMode)); diff --git a/src/plugins/intel_gpu/src/plugin/plugin.cpp b/src/plugins/intel_gpu/src/plugin/plugin.cpp index 4fdf70fbf18b9e..a99ac1e534312b 100644 --- a/src/plugins/intel_gpu/src/plugin/plugin.cpp +++ b/src/plugins/intel_gpu/src/plugin/plugin.cpp @@ -377,10 +377,10 @@ std::shared_ptr Plugin::import_model(std::istream& model, const bool encryption_enabled = encryption_callbacks.decrypt && cache_mode == ov::CacheMode::OPTIMIZE_SIZE; std::unique_ptr ib_ptr = - encryption_enabled ? cldnn::make_unique(model, + encryption_enabled ? std::make_unique(model, context_impl->get_engine(), encryption_callbacks.decrypt) - : cldnn::make_unique(model, context_impl->get_engine()); + : std::make_unique(model, context_impl->get_engine()); auto& ib = *ib_ptr; ov::CacheMode loaded_cache_mode = ov::CacheMode::OPTIMIZE_SPEED; diff --git a/src/plugins/intel_gpu/src/runtime/ocl/sycl_engine.cpp b/src/plugins/intel_gpu/src/runtime/ocl/sycl_engine.cpp index b5da32efbfa8c0..29b56c0b264d98 100644 --- a/src/plugins/intel_gpu/src/runtime/ocl/sycl_engine.cpp +++ b/src/plugins/intel_gpu/src/runtime/ocl/sycl_engine.cpp @@ -12,7 +12,7 @@ namespace ocl { sycl_engine::sycl_engine(const device::ptr dev, runtime_types runtime_type) : ocl_engine(dev, runtime_type) { - sycl_context = cldnn::make_unique<::sycl::context>(sycl::make_context<::sycl::backend::opencl>(get_cl_context().get())); + sycl_context = std::make_unique<::sycl::context>(sycl::make_context<::sycl::backend::opencl>(get_cl_context().get())); } stream::ptr sycl_engine::create_stream(const ExecutionConfig& config) const { diff --git a/src/plugins/intel_gpu/src/runtime/ocl/sycl_stream.cpp b/src/plugins/intel_gpu/src/runtime/ocl/sycl_stream.cpp index e9be7a060ba2e4..cdccfde8221883 100644 --- a/src/plugins/intel_gpu/src/runtime/ocl/sycl_stream.cpp +++ b/src/plugins/intel_gpu/src/runtime/ocl/sycl_stream.cpp @@ -12,13 +12,13 @@ namespace ocl { sycl_stream::sycl_stream(const sycl_engine& engine, const ExecutionConfig& config) : ocl_stream(engine, config) { - sycl_queue = cldnn::make_unique<::sycl::queue>(::sycl::make_queue<::sycl::backend::opencl>(get_cl_queue().get(), engine.get_sycl_context())); + sycl_queue = std::make_unique<::sycl::queue>(::sycl::make_queue<::sycl::backend::opencl>(get_cl_queue().get(), engine.get_sycl_context())); } sycl_stream::sycl_stream(const sycl_engine &engine, const ExecutionConfig& config, void *handle) : ocl_stream(engine, config, handle) { - sycl_queue = cldnn::make_unique<::sycl::queue>(::sycl::make_queue<::sycl::backend::opencl>(get_cl_queue().get(), engine.get_sycl_context())); + sycl_queue = std::make_unique<::sycl::queue>(::sycl::make_queue<::sycl::backend::opencl>(get_cl_queue().get(), engine.get_sycl_context())); } ::sycl::queue& sycl_stream::get_sycl_queue() { diff --git a/src/plugins/intel_gpu/tests/unit/module_tests/impls_test.cpp b/src/plugins/intel_gpu/tests/unit/module_tests/impls_test.cpp index ff7ee5b100b34f..b97fc5e20fe575 100644 --- a/src/plugins/intel_gpu/tests/unit/module_tests/impls_test.cpp +++ b/src/plugins/intel_gpu/tests/unit/module_tests/impls_test.cpp @@ -83,7 +83,7 @@ struct some_impl : public typed_primitive_impl { DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::some_impl) std::unique_ptr clone() const override { - return make_unique(*this); + return std::make_unique(*this); } some_impl() : parent("some_impl") {} @@ -95,7 +95,7 @@ struct some_impl : public typed_primitive_impl { void init_kernels(const kernels_cache& kernels_cache, const kernel_impl_params& params) override {} static std::unique_ptr create(const program_node& node, const kernel_impl_params& params) { - return cldnn::make_unique(); + return std::make_unique(); } }; @@ -331,7 +331,7 @@ TEST_P(PrimitiveTypeTest, has_impl_for_test) { if (param_value == some_primitive::SomeParameter::SUPPORTED_VALUE_ONEDNN_1 || param_value == some_primitive::SomeParameter::SUPPORTED_VALUE_ONEDNN_2) { p.get_layout_optimizer().enable_onednn_for(); } -#endif +#endif ASSERT_EQ(some_primitive::type_id()->has_impl_for(node, impl_type, shape_type), expected_has_impl) << (int)param_value; if (param_value != some_primitive::SomeParameter::UNSUPPORTED_VALUE_ALL)