From 4edf328495904fb844b56da1a9bea6142b22b5f6 Mon Sep 17 00:00:00 2001 From: Vladimir Paramuzov Date: Fri, 17 Jan 2025 11:49:39 +0400 Subject: [PATCH 1/4] [GPU] Use std::optional Signed-off-by: Vladimir Paramuzov --- .../include/intel_gpu/plugin/common_utils.hpp | 2 +- .../intel_gpu/primitives/fully_connected.hpp | 6 +- .../include/intel_gpu/primitives/gather.hpp | 4 +- .../intel_gpu/primitives/paged_attention.hpp | 4 +- .../intel_gpu/primitives/primitive.hpp | 2 +- .../include/intel_gpu/runtime/format.hpp | 5 +- .../include/intel_gpu/runtime/layout.hpp | 5 +- .../include/intel_gpu/runtime/optionals.hpp | 74 ------------------- .../src/graph/impls/sycl/impl_example.cpp | 4 +- src/plugins/intel_gpu/src/graph/kv_cache.cpp | 2 +- .../src/plugin/ops/paged_attention.cpp | 2 +- .../ocl/ocl_command_queues_builder.hpp | 6 +- .../intel_gpu/src/runtime/ocl/ocl_event.hpp | 4 +- 13 files changed, 24 insertions(+), 96 deletions(-) delete mode 100644 src/plugins/intel_gpu/include/intel_gpu/runtime/optionals.hpp diff --git a/src/plugins/intel_gpu/include/intel_gpu/plugin/common_utils.hpp b/src/plugins/intel_gpu/include/intel_gpu/plugin/common_utils.hpp index 2794cb2dc93e2b..159e2c5aa28bd5 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/plugin/common_utils.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/plugin/common_utils.hpp @@ -8,7 +8,7 @@ #include #include "intel_gpu/runtime/layout.hpp" #include "intel_gpu/runtime/memory.hpp" -#include "intel_gpu/runtime/optionals.hpp" + #include "intel_gpu/runtime/shape_predictor.hpp" #include "openvino/core/layout.hpp" #include "openvino/core/node.hpp" diff --git a/src/plugins/intel_gpu/include/intel_gpu/primitives/fully_connected.hpp b/src/plugins/intel_gpu/include/intel_gpu/primitives/fully_connected.hpp index 8ff6d346f1a7ba..66c952e68ee85a 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/primitives/fully_connected.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/primitives/fully_connected.hpp @@ -3,7 +3,7 @@ // #pragma once -#include "intel_gpu/runtime/optionals.hpp" + #include "primitive.hpp" #include @@ -154,7 +154,7 @@ struct fully_connected : public primitive_base { bool dynamic_quantized_activation_zp = false; input_info activation_scale = {"", 0}; input_info activation_zero_point = {"", 0}; - optional_value decompression_zero_point_scalar = optional_value(); + std::optional decompression_zero_point_scalar = std::optional(); /// @brief Primitive dimension size. size_t input_size = 2; @@ -237,7 +237,7 @@ struct fully_connected : public primitive_base { ib >> decompression_zero_point_value; decompression_zero_point_scalar = decompression_zero_point_value; } else { - decompression_zero_point_scalar = optional_value(); + decompression_zero_point_scalar = std::optional(); } } diff --git a/src/plugins/intel_gpu/include/intel_gpu/primitives/gather.hpp b/src/plugins/intel_gpu/include/intel_gpu/primitives/gather.hpp index e31a5d705a5661..20d47292a12a7c 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/primitives/gather.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/primitives/gather.hpp @@ -90,7 +90,7 @@ struct gather : public primitive_base { ov::element::Type decompressed_type; input_info decompression_scale; input_info decompression_zero_point; - optional_value decompression_zero_point_scalar = optional_value(); + std::optional decompression_zero_point_scalar = std::optional(); size_t hash() const override { size_t seed = primitive::hash(); @@ -162,7 +162,7 @@ struct gather : public primitive_base { ib >> make_data(&decompression_zero_point_value, sizeof(float)); decompression_zero_point_scalar = decompression_zero_point_value; } else { - decompression_zero_point_scalar = optional_value(); + decompression_zero_point_scalar = std::optional(); } } diff --git a/src/plugins/intel_gpu/include/intel_gpu/primitives/paged_attention.hpp b/src/plugins/intel_gpu/include/intel_gpu/primitives/paged_attention.hpp index 095f5f1271ae56..5d5954bc0400c6 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/primitives/paged_attention.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/primitives/paged_attention.hpp @@ -5,7 +5,7 @@ #pragma once #include "primitive.hpp" #include "intel_gpu/graph/program.hpp" -#include "intel_gpu/runtime/optionals.hpp" + #include @@ -52,7 +52,7 @@ struct paged_attention : public primitive_base { ib >> has_rotated_blocks; } - optional_value scale_val{}; + std::optional scale_val{}; size_t head_size = 0; size_t heads_num = 0; size_t kv_heads_num = 0; diff --git a/src/plugins/intel_gpu/include/intel_gpu/primitives/primitive.hpp b/src/plugins/intel_gpu/include/intel_gpu/primitives/primitive.hpp index e38f160b86e196..407e6a6831dc5b 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/primitives/primitive.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/primitives/primitive.hpp @@ -12,7 +12,7 @@ #include "intel_gpu/graph/serialization/vector_serializer.hpp" #include "intel_gpu/runtime/compounds.hpp" #include "intel_gpu/runtime/layout.hpp" -#include "intel_gpu/runtime/optionals.hpp" + #include #include diff --git a/src/plugins/intel_gpu/include/intel_gpu/runtime/format.hpp b/src/plugins/intel_gpu/include/intel_gpu/runtime/format.hpp index 37880a03c293b0..65bcce76209698 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/runtime/format.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/runtime/format.hpp @@ -9,11 +9,12 @@ #include #include #include +#include #include #include #include #include -#include "intel_gpu/runtime/optionals.hpp" + namespace cldnn { /// @addtogroup cpp_api C++ API @@ -367,7 +368,7 @@ struct format { type value; - optional_value custom_traits = {}; + std::optional custom_traits = {}; /// @brief Implicit conversion from format::type. format(type t) : value(t) {} diff --git a/src/plugins/intel_gpu/include/intel_gpu/runtime/layout.hpp b/src/plugins/intel_gpu/include/intel_gpu/runtime/layout.hpp index 278e8bf130f55d..ac86689c64517f 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/runtime/layout.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/runtime/layout.hpp @@ -15,6 +15,7 @@ #include #include #include +#include #include "openvino/core/partial_shape.hpp" #include "openvino/core/type/element_type.hpp" @@ -474,8 +475,8 @@ inline ::std::ostream& operator<<(::std::ostream& os, const std::vector& return os << ss.str(); } -using optional_data_type = optional_value; -using optional_layout = optional_value; +using optional_data_type = std::optional; +using optional_layout = std::optional; /// @} /// @} diff --git a/src/plugins/intel_gpu/include/intel_gpu/runtime/optionals.hpp b/src/plugins/intel_gpu/include/intel_gpu/runtime/optionals.hpp deleted file mode 100644 index 3057abf45cd15d..00000000000000 --- a/src/plugins/intel_gpu/include/intel_gpu/runtime/optionals.hpp +++ /dev/null @@ -1,74 +0,0 @@ -// Copyright (C) 2022 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#pragma once - -#include "openvino/core/except.hpp" - -#include - -namespace cldnn { - -// This class is supposed to be compatible with std::optional, so can be removed after migration to c++17 -template -class optional_value { -public: - optional_value() {} - ~optional_value() {} - - optional_value(const T& v) : storage(new T(v)) {} - optional_value(T&& v) : storage(new T(std::move(v))) {} - - optional_value(optional_value&& other) : storage(std::move(other.storage)) {} - optional_value(const optional_value& other) { - storage = nullptr; - if (other.has_value()) - storage.reset(new T(other.value())); - } - - optional_value& operator=(const optional_value& other) { - storage = nullptr; - if (other.has_value()) - storage.reset(new T(other.value())); - return *this; - } - - optional_value& operator=(optional_value&& other) { - storage = std::move(other.storage); - return *this; - } - - optional_value& operator=(const T& value) { - storage.reset(new T(value)); - return *this; - } - - optional_value& operator=(T&& value) { - storage.reset(new T(std::move(value))); - return *this; - } - - const T& value() const { - OPENVINO_ASSERT(has_value(), "[GPU] Tried to get value from empty optional_value"); - return *storage; - } - - const T& operator*() const { - return value(); - } - - const T& value_or(const T& default_value) const noexcept { - if (has_value()) - return *storage; - return default_value; - } - - bool has_value() const noexcept { return storage != nullptr; } - operator bool() const noexcept { return storage != nullptr; } - -private: - std::unique_ptr storage = nullptr; -}; - -} // namespace cldnn 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 235149f8c51940..afcf1b8ad5714e 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 @@ -48,7 +48,7 @@ template<> struct AccumulatorType<::sycl::half, int8_t> { template ::sycl::event run_fc_int4_woq(::sycl::queue& queue, bool enqueue_barrier, const AType* a, const WType* w, const ZPType* zp, const ScaleType* s, DType* dst, - size_t M, size_t N, size_t K, size_t group_size, size_t groups_num, const ov::Shape& out_shape, optional_value dzp_s) { + size_t M, size_t N, size_t K, size_t group_size, size_t groups_num, const ov::Shape& out_shape, std::optional dzp_s) { if (enqueue_barrier) { queue.submit([=](::sycl::handler& cgh) { cgh.ext_oneapi_barrier(); @@ -91,7 +91,7 @@ ::sycl::event run_fc_int4_woq(::sycl::queue& queue, bool enqueue_barrier, const template ::sycl::event run_fc_int8_woq(::sycl::queue& queue, bool enqueue_barrier, const AType* a, const WType* w, const ZPType* zp, const ScaleType* s, DType* dst, - size_t M, size_t N, size_t K, size_t group_size, size_t groups_num, const ov::Shape& out_shape, optional_value dzp_s) { + size_t M, size_t N, size_t K, size_t group_size, size_t groups_num, const ov::Shape& out_shape, std::optional dzp_s) { if (enqueue_barrier) { queue.submit([=](::sycl::handler& cgh) { cgh.ext_oneapi_barrier(); diff --git a/src/plugins/intel_gpu/src/graph/kv_cache.cpp b/src/plugins/intel_gpu/src/graph/kv_cache.cpp index 808a593c601ad0..c9600c2233abd0 100644 --- a/src/plugins/intel_gpu/src/graph/kv_cache.cpp +++ b/src/plugins/intel_gpu/src/graph/kv_cache.cpp @@ -6,7 +6,7 @@ #include "intel_gpu/op/kv_cache_compressed.hpp" #include "intel_gpu/plugin/common_utils.hpp" #include "intel_gpu/plugin/multi_tensor_variable_state.hpp" -#include "intel_gpu/runtime/optionals.hpp" + #include "kv_cache_inst.h" #include "primitive_type_base.h" #include diff --git a/src/plugins/intel_gpu/src/plugin/ops/paged_attention.cpp b/src/plugins/intel_gpu/src/plugin/ops/paged_attention.cpp index 36e802a59d1884..1460807d52e9a9 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/paged_attention.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/paged_attention.cpp @@ -54,7 +54,7 @@ static void CreatePagedAttentionExtensionOp(ProgramBuilder& p, const std::shared OPENVINO_ASSERT(ov::shape_size(scale_const->get_output_shape(0)) == 1); prim.scale_val = scale_const->cast_vector()[0]; } else { - prim.scale_val = cldnn::optional_value(); + prim.scale_val = std::optional(); } std::shared_ptr alibi_const = ov::as_type_ptr(op->get_input_node_shared_ptr(alibi_idx)); diff --git a/src/plugins/intel_gpu/src/runtime/ocl/ocl_command_queues_builder.hpp b/src/plugins/intel_gpu/src/runtime/ocl/ocl_command_queues_builder.hpp index f215fdb1af9c2b..1082056e7a374d 100644 --- a/src/plugins/intel_gpu/src/runtime/ocl/ocl_command_queues_builder.hpp +++ b/src/plugins/intel_gpu/src/runtime/ocl/ocl_command_queues_builder.hpp @@ -6,7 +6,7 @@ #include "ocl_common.hpp" #include "intel_gpu/runtime/engine.hpp" -#include "intel_gpu/runtime/optionals.hpp" + namespace cldnn { namespace ocl { @@ -25,8 +25,8 @@ class command_queues_builder { bool _profiling; bool _out_of_order; bool _supports_queue_families; - optional_value _priority_mode; - optional_value _throttle_mode; + std::optional _priority_mode; + std::optional _throttle_mode; #if CL_TARGET_OPENCL_VERSION >= 200 std::vector get_properties(const cl::Device& device, uint16_t stream_id = 0); #else diff --git a/src/plugins/intel_gpu/src/runtime/ocl/ocl_event.hpp b/src/plugins/intel_gpu/src/runtime/ocl/ocl_event.hpp index e8a70a21a05b26..dd487fceacb98b 100644 --- a/src/plugins/intel_gpu/src/runtime/ocl/ocl_event.hpp +++ b/src/plugins/intel_gpu/src/runtime/ocl/ocl_event.hpp @@ -6,7 +6,7 @@ #include "ocl_common.hpp" #include "ocl_base_event.hpp" -#include "intel_gpu/runtime/optionals.hpp" + #include #include @@ -42,7 +42,7 @@ struct ocl_event : public ocl_base_event { protected: cl::Event _event; - optional_value duration_nsec; + std::optional duration_nsec; }; struct ocl_events : public ocl_base_event { From 8e53f2618cd7897d5e756552f2b83d388f6084f1 Mon Sep 17 00:00:00 2001 From: Vladimir Paramuzov Date: Fri, 17 Jan 2025 13:04:42 +0400 Subject: [PATCH 2/4] [GPU] Use nested namespace Signed-off-by: Vladimir Paramuzov --- .../intel_gpu/include/intel_gpu/op/convolution.hpp | 8 ++------ .../intel_gpu/include/intel_gpu/op/fully_connected.hpp | 8 ++------ .../include/intel_gpu/op/fully_connected_compressed.hpp | 8 ++------ src/plugins/intel_gpu/include/intel_gpu/op/gemm.hpp | 8 ++------ .../intel_gpu/include/intel_gpu/op/indirect_gemm.hpp | 8 ++------ .../intel_gpu/include/intel_gpu/op/indirect_sdpa.hpp | 8 ++------ src/plugins/intel_gpu/include/intel_gpu/op/kv_cache.hpp | 8 ++------ .../include/intel_gpu/op/kv_cache_compressed.hpp | 8 ++------ .../intel_gpu/include/intel_gpu/op/placeholder.hpp | 8 ++------ .../intel_gpu/include/intel_gpu/op/read_value.hpp | 8 ++------ .../intel_gpu/include/intel_gpu/op/read_values.hpp | 8 ++------ src/plugins/intel_gpu/include/intel_gpu/op/sdpa.hpp | 8 ++------ .../include/intel_gpu/plugin/async_infer_request.hpp | 8 ++------ .../include/intel_gpu/plugin/compiled_model.hpp | 6 ++---- .../intel_gpu/include/intel_gpu/plugin/custom_layer.hpp | 9 +++------ src/plugins/intel_gpu/include/intel_gpu/plugin/graph.hpp | 9 ++------- .../intel_gpu/plugin/multi_tensor_variable_state.hpp | 6 ++---- .../intel_gpu/include/intel_gpu/plugin/plugin.hpp | 6 ++---- .../include/intel_gpu/plugin/program_builder.hpp | 6 ++---- .../include/intel_gpu/plugin/remote_context.hpp | 6 ++---- .../intel_gpu/include/intel_gpu/plugin/remote_tensor.hpp | 6 ++---- .../include/intel_gpu/plugin/sync_infer_request.hpp | 6 ++---- .../intel_gpu/plugin/transformations_pipeline.hpp | 6 ++---- .../include/intel_gpu/plugin/usm_host_tensor.hpp | 6 ++---- .../include/intel_gpu/plugin/variable_state.hpp | 6 ++---- .../include/intel_gpu/primitives/implementation_desc.hpp | 6 ++---- .../include/intel_gpu/primitives/paged_attention.hpp | 1 - .../intel_gpu/include/intel_gpu/primitives/primitive.hpp | 1 - .../include/intel_gpu/runtime/debug_configuration.hpp | 6 ++---- .../include/intel_gpu/runtime/execution_config.hpp | 6 ++---- .../intel_gpu/include/intel_gpu/runtime/file_util.hpp | 6 ++---- .../include/intel_gpu/runtime/internal_properties.hpp | 6 ++---- src/plugins/intel_gpu/include/intel_gpu/runtime/itt.hpp | 6 ++---- .../include/intel_gpu/runtime/shape_predictor.hpp | 6 ++---- .../src/graph/impls/registry/activations_impls.cpp | 6 ++---- .../src/graph/impls/registry/arg_max_min_impls.cpp | 6 ++---- .../src/graph/impls/registry/broadcast_impls.cpp | 6 ++---- .../src/graph/impls/registry/concatenation_impls.cpp | 6 ++---- .../src/graph/impls/registry/convolution_impls.cpp | 6 ++---- .../intel_gpu/src/graph/impls/registry/crop_impls.cpp | 6 ++---- .../src/graph/impls/registry/deconvolution_impls.cpp | 6 ++---- .../src/graph/impls/registry/detection_output_impls.cpp | 6 ++---- .../intel_gpu/src/graph/impls/registry/eltwise_impls.cpp | 6 ++---- .../src/graph/impls/registry/fake_convert_impls.cpp | 6 ++---- .../src/graph/impls/registry/fully_connected_impls.cpp | 6 ++---- .../intel_gpu/src/graph/impls/registry/gather_impls.cpp | 6 ++---- .../src/graph/impls/registry/gather_nd_impls.cpp | 6 ++---- .../intel_gpu/src/graph/impls/registry/gemm_impls.cpp | 6 ++---- .../src/graph/impls/registry/lstm_cell_impls.cpp | 6 ++---- .../src/graph/impls/registry/lstm_seq_impls.cpp | 6 ++---- .../graph/impls/registry/non_max_suppression_impls.cpp | 6 ++---- .../intel_gpu/src/graph/impls/registry/pooling_impls.cpp | 6 ++---- .../intel_gpu/src/graph/impls/registry/range_impls.cpp | 6 ++---- .../intel_gpu/src/graph/impls/registry/reduce_impls.cpp | 6 ++---- .../intel_gpu/src/graph/impls/registry/registry.hpp | 6 ++---- .../intel_gpu/src/graph/impls/registry/reorder_impls.cpp | 6 ++---- .../intel_gpu/src/graph/impls/registry/reshape_impls.cpp | 6 ++---- .../impls/registry/scatter_elements_update_impls.cpp | 6 ++---- .../src/graph/impls/registry/scatter_update_impls.cpp | 6 ++---- .../intel_gpu/src/graph/impls/registry/select_impls.cpp | 6 ++---- .../src/graph/impls/registry/shape_of_impls.cpp | 6 ++---- .../intel_gpu/src/graph/impls/registry/softmax_impls.cpp | 6 ++---- .../src/graph/impls/registry/strided_slice_impls.cpp | 6 ++---- .../intel_gpu/src/graph/impls/registry/tile_impls.cpp | 6 ++---- .../intel_gpu/src/graph/include/sliding_window_utils.hpp | 6 ++---- src/plugins/intel_gpu/src/graph/kv_cache.cpp | 1 - src/plugins/intel_gpu/src/plugin/async_infer_request.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/common_utils.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/compiled_model.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/custom_layer.cpp | 7 +++---- src/plugins/intel_gpu/src/plugin/graph.cpp | 6 ++---- .../intel_gpu/src/plugin/multi_tensor_variable_state.cpp | 6 ++---- .../intel_gpu/src/plugin/ops/adaptive_pooling.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/batch_to_space.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/broadcast.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/bucketize.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/concat.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/condition.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/constant.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/convert.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/convert_color.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/convolution.cpp | 6 ++---- .../intel_gpu/src/plugin/ops/ctc_greedy_decoder.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/ctc_loss.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/cum_sum.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/custom.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/depth_to_space.cpp | 6 ++---- .../intel_gpu/src/plugin/ops/detection_output.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/dft.cpp | 6 ++---- .../intel_gpu/src/plugin/ops/dynamic_quantize.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/eltwise.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/embedding_bag.cpp | 6 ++---- .../ops/experimental_detectron_detection_output.cpp | 6 ++---- ...imental_detectron_generate_proposals_single_image.cpp | 6 ++---- .../ops/experimental_detectron_prior_grid_generator.cpp | 6 ++---- .../ops/experimental_detectron_roi_feature_extractor.cpp | 6 ++---- .../src/plugin/ops/experimental_detectron_topk_rois.cpp | 6 ++---- .../intel_gpu/src/plugin/ops/extract_image_patches.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/eye.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/fake_convert.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/fake_quantize.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/fully_connected.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/gather tree.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/gather.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/gather_elements.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/gather_nd.cpp | 6 ++---- .../intel_gpu/src/plugin/ops/generate_proposals.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/grid_sample.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/grn.cpp | 6 ++---- .../intel_gpu/src/plugin/ops/group_normalization.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/interpolate.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/kv_cache.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/loop.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/lrn.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/matmul.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/matrix_nms.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/multiclass_nms.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/multinomial.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/mvn.cpp | 6 ++---- .../intel_gpu/src/plugin/ops/non_max_suppression.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/non_zero.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/normalize_l2.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/one_hot.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/pad.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/paged_attention.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/parameter.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/placeholder.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/pooling.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/prior_box.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/proposal.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/random_uniform.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/range.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/reduce.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/region_yolo.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/reorg_yolo.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/reshape.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/result.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/reverse.cpp | 6 ++---- .../intel_gpu/src/plugin/ops/reverse_sequence.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/rms.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/rnn.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/roi_align.cpp | 6 ++---- .../intel_gpu/src/plugin/ops/roi_align_rotated.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/roi_pooling.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/roll.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/rope.cpp | 6 ++---- .../src/plugin/ops/scaled_dot_product_attention.cpp | 6 ++---- .../intel_gpu/src/plugin/ops/scatter_elements_update.cpp | 6 ++---- .../intel_gpu/src/plugin/ops/scatter_nd_update.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/scatter_update.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/search_sorted.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/select.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/shape_of.cpp | 6 ++---- .../intel_gpu/src/plugin/ops/shuffle_channels.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/slice.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/softmax.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/space_to_batch.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/space_to_depth.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/split.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/stft.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/strided_slice.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/swiglu.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/tile.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/topk.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/transpose.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/unary.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/unique.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/variable.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/plugin.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/program_builder.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/remote_context.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/remote_tensor.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/sync_infer_request.cpp | 6 ++---- .../plugin/transformations/bcast_and_pad_zp_buffers.cpp | 6 ++---- .../plugin/transformations/bcast_and_pad_zp_buffers.hpp | 6 ++---- .../src/plugin/transformations/binary_conv_to_conv.cpp | 6 ++---- .../src/plugin/transformations/binary_conv_to_conv.hpp | 6 ++---- .../src/plugin/transformations/clamp_fp16_output.cpp | 6 ++---- .../src/plugin/transformations/clamp_fp16_output.hpp | 6 ++---- .../src/plugin/transformations/convert_convolution.cpp | 6 ++---- .../src/plugin/transformations/convert_convolution.hpp | 6 ++---- .../plugin/transformations/convert_fc_to_compressed.cpp | 6 ++---- .../plugin/transformations/convert_fc_to_compressed.hpp | 6 ++---- .../src/plugin/transformations/convert_matmul_to_fc.cpp | 6 ++---- .../src/plugin/transformations/convert_matmul_to_fc.hpp | 6 ++---- .../plugin/transformations/convert_pooling_to_reduce.hpp | 6 ++---- .../src/plugin/transformations/convert_shapeof.hpp | 6 ++---- .../convert_stridedslices_to_variadicsplit.cpp | 6 ++---- .../convert_stridedslices_to_variadicsplit.hpp | 6 ++---- .../decompose_reduce_for_false_keepdims.cpp | 6 ++---- .../decompose_reduce_for_false_keepdims.hpp | 6 ++---- .../transformations/decompose_reduce_scalar_output.hpp | 6 ++---- .../transformations/dynamic_quantize_fully_connected.cpp | 6 ++---- .../transformations/dynamic_quantize_fully_connected.hpp | 6 ++---- .../src/plugin/transformations/einsum_decomposition.cpp | 6 ++---- .../src/plugin/transformations/einsum_decomposition.hpp | 6 ++---- .../src/plugin/transformations/fc_convert_fusion.cpp | 6 ++---- .../src/plugin/transformations/fc_convert_fusion.hpp | 6 ++---- .../src/plugin/transformations/fc_horizontal_fusion.cpp | 6 ++---- .../src/plugin/transformations/fc_horizontal_fusion.hpp | 6 ++---- .../src/plugin/transformations/fc_per_layer_scaling.cpp | 6 ++---- .../src/plugin/transformations/fc_per_layer_scaling.hpp | 6 ++---- .../plugin/transformations/group_norm_composition.cpp | 6 ++---- .../plugin/transformations/group_norm_composition.hpp | 6 ++---- .../transformations/increase_position_ids_precision.cpp | 6 ++---- .../transformations/increase_position_ids_precision.hpp | 6 ++---- .../src/plugin/transformations/indirect_kv_cache.cpp | 6 ++---- .../src/plugin/transformations/indirect_kv_cache.hpp | 7 +++---- .../src/plugin/transformations/kv_cache_compression.cpp | 6 ++---- .../src/plugin/transformations/kv_cache_compression.hpp | 6 ++---- .../src/plugin/transformations/kv_cache_fusion.cpp | 6 ++---- .../src/plugin/transformations/kv_cache_fusion.hpp | 6 ++---- .../plugin/transformations/lora_horizontal_fusion.cpp | 6 ++---- .../plugin/transformations/lora_horizontal_fusion.hpp | 6 ++---- .../transformations/move_fc_reshape_to_weights.cpp | 6 ++---- .../transformations/move_fc_reshape_to_weights.hpp | 6 ++---- .../src/plugin/transformations/op/convolution.cpp | 8 ++------ .../src/plugin/transformations/op/fully_connected.cpp | 8 ++------ .../transformations/op/fully_connected_compressed.cpp | 8 ++------ .../intel_gpu/src/plugin/transformations/op/gemm.cpp | 8 ++------ .../src/plugin/transformations/op/indirect_gemm.cpp | 8 ++------ .../src/plugin/transformations/op/indirect_sdpa.cpp | 8 ++------ .../intel_gpu/src/plugin/transformations/op/kv_cache.cpp | 8 ++------ .../src/plugin/transformations/op/placeholder.cpp | 8 ++------ .../src/plugin/transformations/op/read_value.cpp | 8 ++------ .../intel_gpu/src/plugin/transformations/op/sdpa.cpp | 8 ++------ .../transformations/optimize_subsequent_reshapes.cpp | 6 ++---- .../transformations/optimize_subsequent_reshapes.hpp | 6 ++---- .../plugin/transformations/print_model_statistics.cpp | 6 ++---- .../plugin/transformations/print_model_statistics.hpp | 6 ++---- .../src/plugin/transformations/transpose_fusion.cpp | 6 ++---- .../src/plugin/transformations/transpose_fusion.hpp | 6 ++---- .../unsqueeze_broadcast_reshape_matmul_fusion.cpp | 6 ++---- .../unsqueeze_broadcast_reshape_matmul_fusion.hpp | 6 ++---- .../unsqueeze_broadcast_reshape_sdpa_fusion.cpp | 6 ++---- .../unsqueeze_broadcast_reshape_sdpa_fusion.hpp | 6 ++---- .../intel_gpu/src/plugin/transformations/utils.hpp | 6 ++---- .../intel_gpu/src/plugin/transformations_pipeline.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/usm_host_tensor.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/variable_state.cpp | 6 ++---- src/plugins/intel_gpu/src/runtime/execution_config.cpp | 6 ++---- src/plugins/intel_gpu/src/runtime/file_util.cpp | 6 ++---- .../src/runtime/ocl/ocl_command_queues_builder.hpp | 1 - src/plugins/intel_gpu/src/runtime/ocl/ocl_event.hpp | 1 - 244 files changed, 481 insertions(+), 1012 deletions(-) diff --git a/src/plugins/intel_gpu/include/intel_gpu/op/convolution.hpp b/src/plugins/intel_gpu/include/intel_gpu/op/convolution.hpp index 62d639c5d0c76d..fedd482e8d762b 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/op/convolution.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/op/convolution.hpp @@ -6,9 +6,7 @@ #include "openvino/op/util/convolution_base.hpp" -namespace ov { -namespace intel_gpu { -namespace op { +namespace ov::intel_gpu::op { // Common node for v1::Convolution and v1::GroupConvolution with few extensions // - Relaxed type requirements @@ -76,6 +74,4 @@ std::vector shape_infer(const Convolution* op, CoordinateDiff& pads_begin, CoordinateDiff& pads_end); -} // namespace op -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu::op diff --git a/src/plugins/intel_gpu/include/intel_gpu/op/fully_connected.hpp b/src/plugins/intel_gpu/include/intel_gpu/op/fully_connected.hpp index 877ddf93308ac4..14dd564302715d 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/op/fully_connected.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/op/fully_connected.hpp @@ -7,9 +7,7 @@ #include "openvino/core/node.hpp" #include "openvino/op/op.hpp" -namespace ov { -namespace intel_gpu { -namespace op { +namespace ov::intel_gpu::op { class FullyConnected : public ov::op::Op { public: @@ -34,6 +32,4 @@ class FullyConnected : public ov::op::Op { ov::element::Type m_output_type; }; -} // namespace op -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu::op diff --git a/src/plugins/intel_gpu/include/intel_gpu/op/fully_connected_compressed.hpp b/src/plugins/intel_gpu/include/intel_gpu/op/fully_connected_compressed.hpp index 32fb4a3a96585a..4b741715c3de7b 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/op/fully_connected_compressed.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/op/fully_connected_compressed.hpp @@ -6,9 +6,7 @@ #include "fully_connected.hpp" -namespace ov { -namespace intel_gpu { -namespace op { +namespace ov::intel_gpu::op { class FullyConnectedCompressed : public FullyConnected { public: @@ -42,6 +40,4 @@ class FullyConnectedCompressed : public FullyConnected { std::shared_ptr clone_with_new_inputs(const ov::OutputVector& new_args) const override; }; -} // namespace op -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu::op diff --git a/src/plugins/intel_gpu/include/intel_gpu/op/gemm.hpp b/src/plugins/intel_gpu/include/intel_gpu/op/gemm.hpp index 7c44af618b2133..6d45da459bdec8 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/op/gemm.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/op/gemm.hpp @@ -9,9 +9,7 @@ #include "openvino/op/matmul.hpp" #include "openvino/op/op.hpp" -namespace ov { -namespace intel_gpu { -namespace op { +namespace ov::intel_gpu::op { class Gemm : public ov::op::v0::MatMul { public: @@ -56,6 +54,4 @@ std::vector shape_infer(const Gemm* op, const std::vector& order_b, const std::vector& order_c); -} // namespace op -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu::op diff --git a/src/plugins/intel_gpu/include/intel_gpu/op/indirect_gemm.hpp b/src/plugins/intel_gpu/include/intel_gpu/op/indirect_gemm.hpp index 501d78a151f7cb..7ebefd1802ef3c 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/op/indirect_gemm.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/op/indirect_gemm.hpp @@ -9,9 +9,7 @@ #include "openvino/core/partial_shape.hpp" #include "openvino/op/op.hpp" -namespace ov { -namespace intel_gpu { -namespace op { +namespace ov::intel_gpu::op { class IndirectGemm : public ov::intel_gpu::op::Gemm { public: @@ -49,6 +47,4 @@ class IndirectGemm : public ov::intel_gpu::op::Gemm { int64_t m_indirect_axis = 0; }; -} // namespace op -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu::op diff --git a/src/plugins/intel_gpu/include/intel_gpu/op/indirect_sdpa.hpp b/src/plugins/intel_gpu/include/intel_gpu/op/indirect_sdpa.hpp index 315cec11d5c135..5580906d6fe80d 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/op/indirect_sdpa.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/op/indirect_sdpa.hpp @@ -9,9 +9,7 @@ #include "openvino/core/partial_shape.hpp" #include "openvino/op/op.hpp" -namespace ov { -namespace intel_gpu { -namespace op { +namespace ov::intel_gpu::op { class IndirectSDPA : public ov::intel_gpu::op::SDPA { public: @@ -55,6 +53,4 @@ class IndirectSDPA : public ov::intel_gpu::op::SDPA { int64_t m_indirect_axis = -1; }; -} // namespace op -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu::op diff --git a/src/plugins/intel_gpu/include/intel_gpu/op/kv_cache.hpp b/src/plugins/intel_gpu/include/intel_gpu/op/kv_cache.hpp index 7048d5229f25db..74c67209cec655 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/op/kv_cache.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/op/kv_cache.hpp @@ -9,9 +9,7 @@ #include "openvino/op/util/variable_extension.hpp" #include "ov_ops/dynamic_quantize.hpp" -namespace ov { -namespace intel_gpu { -namespace op { +namespace ov::intel_gpu::op { /// \brief Operator that implements Key-Values cache subgraph for large language models. /// This operation updates data of the corresponding Variable @@ -71,6 +69,4 @@ class KVCache : public ov::op::Op, public ov::op::util::VariableExtension { std::vector shape_infer(const KVCache* op, const std::vector& input_shapes); -} // namespace op -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu::op diff --git a/src/plugins/intel_gpu/include/intel_gpu/op/kv_cache_compressed.hpp b/src/plugins/intel_gpu/include/intel_gpu/op/kv_cache_compressed.hpp index ee8e9d0e026b8f..f45aef80cc292a 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/op/kv_cache_compressed.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/op/kv_cache_compressed.hpp @@ -7,9 +7,7 @@ #include "intel_gpu/op/kv_cache.hpp" #include "ov_ops/dynamic_quantize.hpp" -namespace ov { -namespace intel_gpu { -namespace op { +namespace ov::intel_gpu::op { /// \brief Operator that implements Key-Values cache subgraph for large language models. /// This operation updates data of the corresponding Variable @@ -51,6 +49,4 @@ class KVCacheCompressed : public ov::intel_gpu::op::KVCache { std::vector shape_infer(const KVCacheCompressed* op, const std::vector& input_shapes); -} // namespace op -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu::op diff --git a/src/plugins/intel_gpu/include/intel_gpu/op/placeholder.hpp b/src/plugins/intel_gpu/include/intel_gpu/op/placeholder.hpp index 5e2bdc3ff87dda..3ef055eac4d6a7 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/op/placeholder.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/op/placeholder.hpp @@ -6,9 +6,7 @@ #include "openvino/op/op.hpp" -namespace ov { -namespace intel_gpu { -namespace op { +namespace ov::intel_gpu::op { class Placeholder : public ov::op::Op { public: @@ -21,6 +19,4 @@ class Placeholder : public ov::op::Op { std::shared_ptr clone_with_new_inputs(const ov::OutputVector& new_args) const override; }; -} // namespace op -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu::op diff --git a/src/plugins/intel_gpu/include/intel_gpu/op/read_value.hpp b/src/plugins/intel_gpu/include/intel_gpu/op/read_value.hpp index 419c18118229ff..83c9735dc4f2ff 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/op/read_value.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/op/read_value.hpp @@ -8,9 +8,7 @@ #include "openvino/op/util/variable.hpp" #include "openvino/op/util/variable_extension.hpp" -namespace ov { -namespace intel_gpu { -namespace op { +namespace ov::intel_gpu::op { /// \brief Similar to common v6::ReadValue, but it's not derived from ReadValueBase class to avoid ReadValue-Assign pairing check /// This is needed to have ReadValue-KVCache pair instead of ReadValue-Assign @@ -42,6 +40,4 @@ class ReadValue : public ov::op::Op, public ov::op::util::VariableExtension { } }; -} // namespace op -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu::op diff --git a/src/plugins/intel_gpu/include/intel_gpu/op/read_values.hpp b/src/plugins/intel_gpu/include/intel_gpu/op/read_values.hpp index 6cf6c14f2b1d2f..f9d8050983f6e0 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/op/read_values.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/op/read_values.hpp @@ -6,9 +6,7 @@ #include "intel_gpu/op/read_value.hpp" -namespace ov { -namespace intel_gpu { -namespace op { +namespace ov::intel_gpu::op { /// \brief This operation handles the OpenVINO GPU Plugin's custom variable // representation (which can store multiple states in a single variable) at the graph level. @@ -37,6 +35,4 @@ class ReadValues : public ReadValue { std::vector m_internal_states_infos; }; -} // namespace op -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu::op diff --git a/src/plugins/intel_gpu/include/intel_gpu/op/sdpa.hpp b/src/plugins/intel_gpu/include/intel_gpu/op/sdpa.hpp index 15766148d31e39..80457e2203dafd 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/op/sdpa.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/op/sdpa.hpp @@ -10,9 +10,7 @@ #include "openvino/op/scaled_dot_product_attention.hpp" #include "ov_ops/dynamic_quantize.hpp" -namespace ov { -namespace intel_gpu { -namespace op { +namespace ov::intel_gpu::op { class SDPA : public ov::op::v13::ScaledDotProductAttention { public: @@ -83,6 +81,4 @@ std::vector shape_infer(const SDPA* op, const std::vector& order_out); -} // namespace op -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu::op diff --git a/src/plugins/intel_gpu/include/intel_gpu/plugin/async_infer_request.hpp b/src/plugins/intel_gpu/include/intel_gpu/plugin/async_infer_request.hpp index a9ded292811387..040581ef8fb88c 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/plugin/async_infer_request.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/plugin/async_infer_request.hpp @@ -6,11 +6,8 @@ #include "openvino/runtime/iasync_infer_request.hpp" #include "intel_gpu/plugin/sync_infer_request.hpp" -#include -#include -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { class AsyncInferRequest : public ov::IAsyncInferRequest { public: @@ -29,5 +26,4 @@ class AsyncInferRequest : public ov::IAsyncInferRequest { std::shared_ptr m_wait_executor; }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/include/intel_gpu/plugin/compiled_model.hpp b/src/plugins/intel_gpu/include/intel_gpu/plugin/compiled_model.hpp index 9b1593c1ed4041..971c0f54d33aec 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/plugin/compiled_model.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/plugin/compiled_model.hpp @@ -17,8 +17,7 @@ #include "intel_gpu/runtime/execution_config.hpp" #include "openvino/runtime/icompiled_model.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { class CompiledModel : public ov::ICompiledModel { public: @@ -74,5 +73,4 @@ class CompiledModel : public ov::ICompiledModel { bool m_loaded_from_cache; }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/include/intel_gpu/plugin/custom_layer.hpp b/src/plugins/intel_gpu/include/intel_gpu/plugin/custom_layer.hpp index b3a01803b110a8..e5b83bca100951 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/plugin/custom_layer.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/plugin/custom_layer.hpp @@ -5,14 +5,12 @@ #pragma once #include #include -#include #include #include #include "pugixml.hpp" -#include "intel_gpu/runtime/tensor.hpp" +#include "intel_gpu/runtime/format.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { using CustomLayerPtr = std::shared_ptr; using CustomLayerMap = std::map; @@ -82,5 +80,4 @@ class CustomLayer{ std::string m_ErrorMessage; }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/include/intel_gpu/plugin/graph.hpp b/src/plugins/intel_gpu/include/intel_gpu/plugin/graph.hpp index 33c1dd78a531ce..2458b0e19ce069 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/plugin/graph.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/plugin/graph.hpp @@ -9,22 +9,18 @@ #endif #include "intel_gpu/graph/network.hpp" -#include "intel_gpu/graph/topology.hpp" -#include "intel_gpu/plugin/custom_layer.hpp" #include "intel_gpu/plugin/remote_context.hpp" #include "intel_gpu/plugin/program_builder.hpp" #include #include -#include #include #include #include #include #include -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { struct HostTimeProfilingEntry { int64_t inputs_processing = 0; int64_t enqueue = 0; @@ -106,5 +102,4 @@ class Graph final { std::shared_ptr get_runtime_model(std::vector& pi, bool filter_const_primitives = true); }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/include/intel_gpu/plugin/multi_tensor_variable_state.hpp b/src/plugins/intel_gpu/include/intel_gpu/plugin/multi_tensor_variable_state.hpp index 26d15d733102ad..b25a7f1fbcae21 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/plugin/multi_tensor_variable_state.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/plugin/multi_tensor_variable_state.hpp @@ -6,8 +6,7 @@ #include "intel_gpu/plugin/variable_state.hpp" #include "openvino/core/partial_shape.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { class MultiTensorState : public VariableStateBase { public: @@ -72,5 +71,4 @@ class VariableStateIndirectKVCacheCompressed : public VariableStateIndirectKVCac private: bool m_has_zp_state = false; }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/include/intel_gpu/plugin/plugin.hpp b/src/plugins/intel_gpu/include/intel_gpu/plugin/plugin.hpp index e2b128eca032d9..869d32825b8761 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/plugin/plugin.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/plugin/plugin.hpp @@ -11,8 +11,7 @@ #include #include -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { class Plugin : public ov::IPlugin { private: @@ -67,5 +66,4 @@ class Plugin : public ov::IPlugin { ov::SoPtr get_default_context(const ov::AnyMap& remote_properties) const override; }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/include/intel_gpu/plugin/program_builder.hpp b/src/plugins/intel_gpu/include/intel_gpu/plugin/program_builder.hpp index 6d3f5151a3f14a..51087405f09769 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/plugin/program_builder.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/plugin/program_builder.hpp @@ -48,8 +48,7 @@ void __register ## _ ## op_name ## _ ## op_version() { }); \ } -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { template struct is_smart_pointer : std::false_type {}; @@ -195,5 +194,4 @@ inline bool ends_with(const std::string& value, const std::string& suffix) { return std::equal(suffix.rbegin(), suffix.rend(), value.rbegin()); } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/include/intel_gpu/plugin/remote_context.hpp b/src/plugins/intel_gpu/include/intel_gpu/plugin/remote_context.hpp index e595f067c755b4..8440bd6824ef9e 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/plugin/remote_context.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/plugin/remote_context.hpp @@ -21,8 +21,7 @@ #include #include -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { class RemoteContextImpl : public ov::IRemoteContext { public: @@ -74,5 +73,4 @@ inline RemoteContextImpl::Ptr get_context_impl(ov::SoPtr ptr return casted; } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/include/intel_gpu/plugin/remote_tensor.hpp b/src/plugins/intel_gpu/include/intel_gpu/plugin/remote_tensor.hpp index 44bef310805f54..430224ee8677fc 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/plugin/remote_tensor.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/plugin/remote_tensor.hpp @@ -24,8 +24,7 @@ #include #include -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { class RemoteContextImpl; class RemoteTensorImpl : public ov::IRemoteTensor { @@ -89,5 +88,4 @@ class RemoteTensorImpl : public ov::IRemoteTensor { static TensorType allocation_type_to_tensor_type(cldnn::allocation_type t); }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/include/intel_gpu/plugin/sync_infer_request.hpp b/src/plugins/intel_gpu/include/intel_gpu/plugin/sync_infer_request.hpp index 279b9a761fcb7e..73a92d98e6a7e9 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/plugin/sync_infer_request.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/plugin/sync_infer_request.hpp @@ -15,8 +15,7 @@ #include #include -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { class CompiledModel; @@ -121,5 +120,4 @@ class SyncInferRequest : public ov::ISyncInferRequest { uint64_t total_output_bytes = 0; }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/include/intel_gpu/plugin/transformations_pipeline.hpp b/src/plugins/intel_gpu/include/intel_gpu/plugin/transformations_pipeline.hpp index 29e2b88d1642f6..743ca31fbee01a 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/plugin/transformations_pipeline.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/plugin/transformations_pipeline.hpp @@ -12,8 +12,7 @@ #include "intel_gpu/runtime/execution_config.hpp" #include "intel_gpu/runtime/device.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { class TransformationsPipeline { public: @@ -27,5 +26,4 @@ class TransformationsPipeline { cldnn::device_info device_info; }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/include/intel_gpu/plugin/usm_host_tensor.hpp b/src/plugins/intel_gpu/include/intel_gpu/plugin/usm_host_tensor.hpp index d410fa046651e5..c19340af329b4b 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/plugin/usm_host_tensor.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/plugin/usm_host_tensor.hpp @@ -8,8 +8,7 @@ #include -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { class RemoteContextImpl; class RemoteTensorImpl; @@ -38,5 +37,4 @@ class USMHostTensor : public ov::ITensor { std::shared_ptr m_impl; }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/include/intel_gpu/plugin/variable_state.hpp b/src/plugins/intel_gpu/include/intel_gpu/plugin/variable_state.hpp index 355d68b86692c0..7cdc5e39ac9583 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/plugin/variable_state.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/plugin/variable_state.hpp @@ -11,8 +11,7 @@ #include #include -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { class RemoteContextImpl; struct VariableStateInfo { @@ -84,5 +83,4 @@ class VariableState : public VariableStateBase { using VariablesMap = std::unordered_map>; using VariablesInfoMap = std::unordered_map; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/include/intel_gpu/primitives/implementation_desc.hpp b/src/plugins/intel_gpu/include/intel_gpu/primitives/implementation_desc.hpp index b2e6f3115c484c..b605d1baf800ca 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/primitives/implementation_desc.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/primitives/implementation_desc.hpp @@ -108,8 +108,7 @@ inline std::ostream& operator<<(std::ostream& out, const shape_types& shape_type } // namespace cldnn -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { struct ImplementationDesc { cldnn::format::type output_format; ///< Output format. @@ -136,5 +135,4 @@ inline std::ostream& operator<<(std::ostream& out, const ImplementationDesc& des using ImplForcingMap = std::map; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/include/intel_gpu/primitives/paged_attention.hpp b/src/plugins/intel_gpu/include/intel_gpu/primitives/paged_attention.hpp index 5d5954bc0400c6..0dc980abec06b3 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/primitives/paged_attention.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/primitives/paged_attention.hpp @@ -6,7 +6,6 @@ #include "primitive.hpp" #include "intel_gpu/graph/program.hpp" - #include namespace cldnn { diff --git a/src/plugins/intel_gpu/include/intel_gpu/primitives/primitive.hpp b/src/plugins/intel_gpu/include/intel_gpu/primitives/primitive.hpp index 407e6a6831dc5b..1f92d44ac0eab0 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/primitives/primitive.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/primitives/primitive.hpp @@ -13,7 +13,6 @@ #include "intel_gpu/runtime/compounds.hpp" #include "intel_gpu/runtime/layout.hpp" - #include #include #include diff --git a/src/plugins/intel_gpu/include/intel_gpu/runtime/debug_configuration.hpp b/src/plugins/intel_gpu/include/intel_gpu/runtime/debug_configuration.hpp index f81ff30b242da7..2ce1397c44bb68 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/runtime/debug_configuration.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/runtime/debug_configuration.hpp @@ -10,8 +10,7 @@ #include #include -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { // Verbose log levels: // DISABLED - silent mode (Default) @@ -40,8 +39,7 @@ enum class LogLevel : int8_t { TRACE_DETAIL = 4 }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu #ifdef GPU_DEBUG_CONFIG #if defined(_WIN32) diff --git a/src/plugins/intel_gpu/include/intel_gpu/runtime/execution_config.hpp b/src/plugins/intel_gpu/include/intel_gpu/runtime/execution_config.hpp index e725f3658dfda2..96e09605eaa998 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/runtime/execution_config.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/runtime/execution_config.hpp @@ -7,8 +7,7 @@ #include "intel_gpu/runtime/internal_properties.hpp" #include "intel_gpu/runtime/device.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { enum class PropertyVisibility { INTERNAL = 0, @@ -171,8 +170,7 @@ class ExecutionConfig { bool finalized = false; }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu namespace cldnn { using ov::intel_gpu::ExecutionConfig; diff --git a/src/plugins/intel_gpu/include/intel_gpu/runtime/file_util.hpp b/src/plugins/intel_gpu/include/intel_gpu/runtime/file_util.hpp index ef2e201f099542..934d9deecd2bd0 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/runtime/file_util.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/runtime/file_util.hpp @@ -9,11 +9,9 @@ #include "openvino/util/file_util.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { // Version of save_binary that don't trow an exception if attempt to open file fails void save_binary(const std::string& path, std::vector binary); -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/include/intel_gpu/runtime/internal_properties.hpp b/src/plugins/intel_gpu/include/intel_gpu/runtime/internal_properties.hpp index 554b82041c9ad6..765333e971842e 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/runtime/internal_properties.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/runtime/internal_properties.hpp @@ -8,8 +8,7 @@ #include "openvino/runtime/intel_gpu/properties.hpp" #include "intel_gpu/primitives/implementation_desc.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { /** * @brief Read-only property to get GPU driver version @@ -58,8 +57,7 @@ static constexpr Property buffers_preallocation_r static constexpr Property max_kernels_per_batch{"GPU_MAX_KERNELS_PER_BATCH"}; static constexpr Property use_onednn{"USE_ONEDNN"}; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu namespace cldnn { using ov::intel_gpu::QueueTypes; diff --git a/src/plugins/intel_gpu/include/intel_gpu/runtime/itt.hpp b/src/plugins/intel_gpu/include/intel_gpu/runtime/itt.hpp index 56623184dee396..49a1c8aaf627d5 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/runtime/itt.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/runtime/itt.hpp @@ -11,12 +11,10 @@ #include -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { namespace itt { namespace domains { OV_ITT_DOMAIN(intel_gpu_plugin); } // namespace domains } // namespace itt -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/include/intel_gpu/runtime/shape_predictor.hpp b/src/plugins/intel_gpu/include/intel_gpu/runtime/shape_predictor.hpp index c29bef20b248aa..469c676b4b0311 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/runtime/shape_predictor.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/runtime/shape_predictor.hpp @@ -84,8 +84,6 @@ struct ShapePredictor { } // namespace cldnn -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { using ShapePredictor = cldnn::ShapePredictor; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/graph/impls/registry/activations_impls.cpp b/src/plugins/intel_gpu/src/graph/impls/registry/activations_impls.cpp index 6fa4304aec9cec..8dd8a946794c72 100644 --- a/src/plugins/intel_gpu/src/graph/impls/registry/activations_impls.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/registry/activations_impls.cpp @@ -7,8 +7,7 @@ #include "intel_gpu/primitives/activation.hpp" #include "primitive_inst.h" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { using namespace cldnn; @@ -23,5 +22,4 @@ const std::vector>& Registry>& Registry>& Registry>& Registry>& Registry>& Registry return impls; } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/graph/impls/registry/deconvolution_impls.cpp b/src/plugins/intel_gpu/src/graph/impls/registry/deconvolution_impls.cpp index a3d3ad12e15d7c..4e8b0a0d273033 100644 --- a/src/plugins/intel_gpu/src/graph/impls/registry/deconvolution_impls.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/registry/deconvolution_impls.cpp @@ -10,8 +10,7 @@ #include "impls/onednn/deconvolution_onednn.hpp" #endif -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { using namespace cldnn; @@ -24,5 +23,4 @@ const std::vector>& Registry>& Registry>& Registry>& Registry>& Registry>& Registry>& Registry>& Registry return impls; } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/graph/impls/registry/lstm_cell_impls.cpp b/src/plugins/intel_gpu/src/graph/impls/registry/lstm_cell_impls.cpp index 09ba1f670b29d3..b1c647bf3bbb9d 100644 --- a/src/plugins/intel_gpu/src/graph/impls/registry/lstm_cell_impls.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/registry/lstm_cell_impls.cpp @@ -10,8 +10,7 @@ #include "impls/ocl/lstm_cell.hpp" #endif -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { using namespace cldnn; @@ -23,5 +22,4 @@ const std::vector>& Registry>& Registry>& Registry>& Registry>& Registry>& Registry>& get_implementations(); \ } -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { // Global list of implementations for given primitive type // List must be sorted by priority of implementations @@ -121,8 +120,7 @@ struct Registry { } }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu REGISTER_IMPLS(activation); REGISTER_IMPLS(arg_max_min); diff --git a/src/plugins/intel_gpu/src/graph/impls/registry/reorder_impls.cpp b/src/plugins/intel_gpu/src/graph/impls/registry/reorder_impls.cpp index eab8c1f3d9c3f8..dd88ee9ecc3853 100644 --- a/src/plugins/intel_gpu/src/graph/impls/registry/reorder_impls.cpp +++ b/src/plugins/intel_gpu/src/graph/impls/registry/reorder_impls.cpp @@ -14,8 +14,7 @@ #include "impls/ocl/reorder.hpp" #endif -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { using namespace cldnn; @@ -48,5 +47,4 @@ const std::vector>& Registry>& Registry>& Registry>& Registry>& Registry>& Registry>& Registry>& Registry>& Registry return impls; } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/graph/include/sliding_window_utils.hpp b/src/plugins/intel_gpu/src/graph/include/sliding_window_utils.hpp index 1a8ace1d84d278..dc39197b29ab82 100644 --- a/src/plugins/intel_gpu/src/graph/include/sliding_window_utils.hpp +++ b/src/plugins/intel_gpu/src/graph/include/sliding_window_utils.hpp @@ -16,8 +16,7 @@ #include #include -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { using cldnn::tensor; using cldnn::padding; @@ -455,5 +454,4 @@ inline padding calc_sliding_window_needed_input_padding(const layout& actual_inp std::max(needed_upad.spatial[0], actual_upad[2])}); } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/graph/kv_cache.cpp b/src/plugins/intel_gpu/src/graph/kv_cache.cpp index c9600c2233abd0..382f2a305acb6b 100644 --- a/src/plugins/intel_gpu/src/graph/kv_cache.cpp +++ b/src/plugins/intel_gpu/src/graph/kv_cache.cpp @@ -6,7 +6,6 @@ #include "intel_gpu/op/kv_cache_compressed.hpp" #include "intel_gpu/plugin/common_utils.hpp" #include "intel_gpu/plugin/multi_tensor_variable_state.hpp" - #include "kv_cache_inst.h" #include "primitive_type_base.h" #include diff --git a/src/plugins/intel_gpu/src/plugin/async_infer_request.cpp b/src/plugins/intel_gpu/src/plugin/async_infer_request.cpp index 68c1e32ddb5997..6423cc885926f0 100644 --- a/src/plugins/intel_gpu/src/plugin/async_infer_request.cpp +++ b/src/plugins/intel_gpu/src/plugin/async_infer_request.cpp @@ -6,8 +6,7 @@ #include "intel_gpu/runtime/itt.hpp" #include -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { AsyncInferRequest::AsyncInferRequest(const std::shared_ptr& infer_request, const std::shared_ptr& task_executor, @@ -38,5 +37,4 @@ AsyncInferRequest::~AsyncInferRequest() { stop_and_wait(); } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/common_utils.cpp b/src/plugins/intel_gpu/src/plugin/common_utils.cpp index f67cbb1129458d..f4304514ab1c5a 100644 --- a/src/plugins/intel_gpu/src/plugin/common_utils.cpp +++ b/src/plugins/intel_gpu/src/plugin/common_utils.cpp @@ -95,8 +95,7 @@ void convert_and_copy(const void* src_ptr, ov::element::Type src_et, void* dst_p } // namespace -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { bool is_supported(ov::element::Type_t et) { switch (et) { @@ -255,5 +254,4 @@ std::vector get_output_data_types(const ov::Node* op, return output_data_types; } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/compiled_model.cpp b/src/plugins/intel_gpu/src/plugin/compiled_model.cpp index ed973666fd2e76..0e13452a47fa58 100644 --- a/src/plugins/intel_gpu/src/plugin/compiled_model.cpp +++ b/src/plugins/intel_gpu/src/plugin/compiled_model.cpp @@ -15,8 +15,7 @@ #include -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { namespace { std::shared_ptr create_task_executor(const std::shared_ptr& plugin, @@ -322,5 +321,4 @@ void CompiledModel::release_memory() { dnnl::set_primitive_cache_capacity(capacity); #endif } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/custom_layer.cpp b/src/plugins/intel_gpu/src/plugin/custom_layer.cpp index abeb5442928803..5d23c936cc8d73 100644 --- a/src/plugins/intel_gpu/src/plugin/custom_layer.cpp +++ b/src/plugins/intel_gpu/src/plugin/custom_layer.cpp @@ -6,6 +6,7 @@ #include "intel_gpu/plugin/simple_math.hpp" #include "intel_gpu/runtime/itt.hpp" +#include "openvino/core/except.hpp" #include "openvino/util/xml_parse_utils.hpp" #include @@ -31,8 +32,7 @@ using namespace ov::util::pugixml; #define CheckIntAttrAndReturnError(node, attr, value) \ CheckAndReturnError(get_int_attr(node, attr, -1) != (value), "Wrong attribute value! expected: " << value << " found: " << get_int_attr(node, attr, -1)) -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { void CustomLayer::LoadSingleLayer(const pugi::xml_node & node) { // Root checks @@ -280,5 +280,4 @@ void CustomLayer::LoadFromFile(const std::string configFile, CustomLayerMap& cus } } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/graph.cpp b/src/plugins/intel_gpu/src/plugin/graph.cpp index 2993524a8b358b..6859728076fb6a 100644 --- a/src/plugins/intel_gpu/src/plugin/graph.cpp +++ b/src/plugins/intel_gpu/src/plugin/graph.cpp @@ -32,8 +32,7 @@ #include #include -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { Graph::Graph(std::shared_ptr model, const RemoteContextImpl::Ptr& context, const ExecutionConfig& config, uint16_t stream_id) : m_context(context) @@ -838,5 +837,4 @@ std::string Graph::out_port_index_to_internal(size_t out_port_index) const { OPENVINO_THROW("[GPU] Unable to map output port index ", out_port_index, " to the internal primitive id"); } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/multi_tensor_variable_state.cpp b/src/plugins/intel_gpu/src/plugin/multi_tensor_variable_state.cpp index bde0c37145ff21..286c3bce72b631 100644 --- a/src/plugins/intel_gpu/src/plugin/multi_tensor_variable_state.cpp +++ b/src/plugins/intel_gpu/src/plugin/multi_tensor_variable_state.cpp @@ -19,8 +19,7 @@ #include -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { MultiTensorState::MultiTensorState(const std::vector& infos, std::shared_ptr context, @@ -211,5 +210,4 @@ ov::SoPtr VariableStateIndirectKVCacheCompressed::get_state() const OPENVINO_THROW("[GPU] get_state API is supported only when KV-cache compression is disabled"); } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/ops/adaptive_pooling.cpp b/src/plugins/intel_gpu/src/plugin/ops/adaptive_pooling.cpp index 5fccdb9be3fb31..411af81450534a 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/adaptive_pooling.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/adaptive_pooling.cpp @@ -11,8 +11,7 @@ #include "intel_gpu/primitives/mutable_data.hpp" #include "intel_gpu/primitives/adaptive_pooling.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { static void CreateAdaptiveAvgPoolOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {2}); @@ -93,5 +92,4 @@ static void CreateAdaptiveMaxPoolOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {4}); @@ -68,5 +67,4 @@ static void CreateBatchToSpaceOp(ProgramBuilder& p, const std::shared_ptr& op, const ov::AxisSet axis_mapping) { auto inputs = p.GetInputInfo(op); @@ -124,5 +123,4 @@ static void CreateBroadcastOp(ProgramBuilder& p, const std::shared_ptr& op) { auto inputs = p.GetInputInfo(op); @@ -30,5 +29,4 @@ static void CreateConcatOp(ProgramBuilder& p, const std::shared_ptr& REGISTER_FACTORY_IMPL(v8, If); -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/ops/constant.cpp b/src/plugins/intel_gpu/src/plugin/ops/constant.cpp index d477f1f90b70c8..33ca930215001c 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/constant.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/constant.cpp @@ -28,8 +28,7 @@ #include "intel_gpu/primitives/data.hpp" #include "intel_gpu/runtime/debug_configuration.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { static cldnn::tensor getConstTensor(const ov::Shape constDims) { std::vector shuffled_dims(constDims.size()); @@ -249,5 +248,4 @@ static void CreateConstantOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {2}); @@ -49,5 +48,4 @@ static void CreateConvertOp(ProgramBuilder& p, const std::shared_ptr& op, const cldnn::convert_color::color_format from_color, @@ -85,5 +84,4 @@ REGISTER_FACTORY_IMPL(v8, NV12toBGR); REGISTER_FACTORY_IMPL(v8, I420toRGB); REGISTER_FACTORY_IMPL(v8, I420toBGR); -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/ops/convolution.cpp b/src/plugins/intel_gpu/src/plugin/ops/convolution.cpp index 64caaa56907319..0c44a524f17289 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/convolution.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/convolution.cpp @@ -23,8 +23,7 @@ using Convolution = ov::intel_gpu::op::Convolution; } // namespace op } // namespace ov -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { static void CreateConvolutionOp(ProgramBuilder& p, const std::shared_ptr& op) { @@ -339,5 +338,4 @@ REGISTER_FACTORY_IMPL(v1, GroupConvolutionBackpropData); REGISTER_FACTORY_IMPL(v1, DeformableConvolution); REGISTER_FACTORY_IMPL(v8, DeformableConvolution); -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/ops/ctc_greedy_decoder.cpp b/src/plugins/intel_gpu/src/plugin/ops/ctc_greedy_decoder.cpp index ec93abdb7a117b..ace00ee1e38075 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/ctc_greedy_decoder.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/ctc_greedy_decoder.cpp @@ -15,8 +15,7 @@ #include "transformations/utils/utils.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { static void CreateCommonCTCGreedyDecoderOp(ProgramBuilder& p, const std::shared_ptr& op, bool ctc_merge_repeated) { validate_inputs_count(op, {2, 3}); @@ -144,5 +143,4 @@ static void CreateCTCGreedyDecoderSeqLenOp(ProgramBuilder& p, const std::shared_ REGISTER_FACTORY_IMPL(v0, CTCGreedyDecoder); REGISTER_FACTORY_IMPL(v6, CTCGreedyDecoderSeqLen); -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/ops/ctc_loss.cpp b/src/plugins/intel_gpu/src/plugin/ops/ctc_loss.cpp index a343a513a1a4b1..8600fca1edf3bd 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/ctc_loss.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/ctc_loss.cpp @@ -6,8 +6,7 @@ #include "intel_gpu/primitives/ctc_loss.hpp" #include "intel_gpu/plugin/program_builder.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { namespace { @@ -27,5 +26,4 @@ void CreateCTCLossOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {1, 2}); @@ -39,5 +38,4 @@ static void CreateCumSumOp(ProgramBuilder& p, const std::shared_ptr static inline std::string vecToString(std::vector vec) { @@ -243,5 +242,4 @@ void CreateCustomOp(ProgramBuilder& p, const std::shared_ptr& op, Cust } } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/ops/depth_to_space.cpp b/src/plugins/intel_gpu/src/plugin/ops/depth_to_space.cpp index f5f0853137260b..eb8977c11ed7b1 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/depth_to_space.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/depth_to_space.cpp @@ -9,8 +9,7 @@ #include "intel_gpu/primitives/depth_to_space.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { static cldnn::depth_to_space_mode GetDepthMode(ov::op::v0::DepthToSpace::DepthToSpaceMode mode) { switch (mode) { @@ -41,5 +40,4 @@ static void CreateDepthToSpaceOp(ProgramBuilder& p, const std::shared_ptr CodeNameToType = { @@ -96,5 +95,4 @@ static void CreateDetectionOutputOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {1}); @@ -28,5 +27,4 @@ static void CreateDynamicQuantizeOp(ProgramBuilder& p, const std::shared_ptr& op, @@ -250,5 +249,4 @@ REGISTER_FACTORY_IMPL(v13, BitwiseXor); REGISTER_FACTORY_IMPL(v15, BitwiseRightShift); REGISTER_FACTORY_IMPL(v15, BitwiseLeftShift); -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/ops/embedding_bag.cpp b/src/plugins/intel_gpu/src/plugin/ops/embedding_bag.cpp index 97181332c957b7..29bfcf9b7c5c9f 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/embedding_bag.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/embedding_bag.cpp @@ -14,8 +14,7 @@ #include "transformations/utils/utils.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { static void CreateEmbeddingBagOffsetsSumOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {3, 4, 5}); @@ -155,5 +154,4 @@ REGISTER_FACTORY_IMPL(v3, EmbeddingBagOffsetsSum); REGISTER_FACTORY_IMPL(v3, EmbeddingBagPackedSum); REGISTER_FACTORY_IMPL(v3, EmbeddingSegmentsSum); -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/ops/experimental_detectron_detection_output.cpp b/src/plugins/intel_gpu/src/plugin/ops/experimental_detectron_detection_output.cpp index 853e86a0a1cf3e..5872950feaa922 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/experimental_detectron_detection_output.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/experimental_detectron_detection_output.cpp @@ -9,8 +9,7 @@ #include "intel_gpu/primitives/experimental_detectron_detection_output.hpp" #include "intel_gpu/primitives/mutable_data.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { static void CreateExperimentalDetectronDetectionOutputOp( ProgramBuilder& p, @@ -106,5 +105,4 @@ static void CreateExperimentalDetectronDetectionOutputOp( REGISTER_FACTORY_IMPL(v6, ExperimentalDetectronDetectionOutput); -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/ops/experimental_detectron_generate_proposals_single_image.cpp b/src/plugins/intel_gpu/src/plugin/ops/experimental_detectron_generate_proposals_single_image.cpp index b386b08feb6652..ee30922b911d2e 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/experimental_detectron_generate_proposals_single_image.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/experimental_detectron_generate_proposals_single_image.cpp @@ -10,8 +10,7 @@ #include "intel_gpu/primitives/mutable_data.hpp" #include "intel_gpu/primitives/experimental_detectron_generate_proposals_single_image.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { static void CreateExperimentalDetectronGenerateProposalsSingleImageOp( ProgramBuilder& p, @@ -64,5 +63,4 @@ static void CreateExperimentalDetectronGenerateProposalsSingleImageOp( REGISTER_FACTORY_IMPL(v6, ExperimentalDetectronGenerateProposalsSingleImage); -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/ops/experimental_detectron_prior_grid_generator.cpp b/src/plugins/intel_gpu/src/plugin/ops/experimental_detectron_prior_grid_generator.cpp index 0f30999fec428d..9d8a7f80b3d645 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/experimental_detectron_prior_grid_generator.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/experimental_detectron_prior_grid_generator.cpp @@ -6,8 +6,7 @@ #include #include "openvino/op/experimental_detectron_prior_grid_generator.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { namespace { static void CreateExperimentalDetectronPriorGridGeneratorOp( @@ -36,5 +35,4 @@ static void CreateExperimentalDetectronPriorGridGeneratorOp( REGISTER_FACTORY_IMPL(v6, ExperimentalDetectronPriorGridGenerator); -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/ops/experimental_detectron_roi_feature_extractor.cpp b/src/plugins/intel_gpu/src/plugin/ops/experimental_detectron_roi_feature_extractor.cpp index 98fc7c573e3f7d..d469b75f6c4cf2 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/experimental_detectron_roi_feature_extractor.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/experimental_detectron_roi_feature_extractor.cpp @@ -10,8 +10,7 @@ #include "intel_gpu/primitives/mutable_data.hpp" #include "intel_gpu/primitives/experimental_detectron_roi_feature_extractor.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { static void CreateExperimentalDetectronROIFeatureExtractorOp(ProgramBuilder& p, const std::shared_ptr& op) { @@ -63,5 +62,4 @@ static void CreateExperimentalDetectronROIFeatureExtractorOp(ProgramBuilder& p, REGISTER_FACTORY_IMPL(v6, ExperimentalDetectronROIFeatureExtractor); -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/ops/experimental_detectron_topk_rois.cpp b/src/plugins/intel_gpu/src/plugin/ops/experimental_detectron_topk_rois.cpp index 5c1fd684986ae6..4f7c63f9b87022 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/experimental_detectron_topk_rois.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/experimental_detectron_topk_rois.cpp @@ -10,8 +10,7 @@ #include "intel_gpu/primitives/experimental_detectron_topk_rois.hpp" #include "intel_gpu/primitives/arg_max_min.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { namespace { @@ -42,5 +41,4 @@ void CreateExperimentalDetectronTopKROIsOp(ProgramBuilder &p, REGISTER_FACTORY_IMPL(v6, ExperimentalDetectronTopKROIs); -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/ops/extract_image_patches.cpp b/src/plugins/intel_gpu/src/plugin/ops/extract_image_patches.cpp index 6008becc7183fc..3d630191ba6302 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/extract_image_patches.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/extract_image_patches.cpp @@ -9,8 +9,7 @@ #include "intel_gpu/primitives/extract_image_patches.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { static void CreateExtractImagePatchesOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {1}); @@ -30,5 +29,4 @@ static void CreateExtractImagePatchesOp(ProgramBuilder& p, const std::shared_ptr REGISTER_FACTORY_IMPL(v3, ExtractImagePatches); -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/ops/eye.cpp b/src/plugins/intel_gpu/src/plugin/ops/eye.cpp index 333b7ed5673e7e..618b2f58d41b4d 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/eye.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/eye.cpp @@ -12,8 +12,7 @@ #include "intel_gpu/primitives/eye.hpp" #include "intel_gpu/runtime/layout.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { namespace { @@ -59,5 +58,4 @@ static void CreateEyeOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {2, 3}); const auto inputs = p.GetInputInfo(op); @@ -35,5 +34,4 @@ static void CreateFakeConvertOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {5}); @@ -39,5 +38,4 @@ static void CreateFakeQuantizeOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {4, 5, 6, 7}); @@ -157,5 +156,4 @@ static void CreateFullyConnectedOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {4}); @@ -50,5 +49,4 @@ static void CreateGatherTreeOp(ProgramBuilder& p, const std::shared_ptr void CreateGatherOpBase(ProgramBuilder& p, const std::shared_ptr& op, const int64_t batch_dim = 0, bool support_neg_ind = false, @@ -228,5 +227,4 @@ static void CreateGatherCompressedOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {2}); @@ -43,5 +42,4 @@ static void CreateGatherElementsOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {2}); @@ -56,5 +55,4 @@ static void CreateGatherNDOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {1}); @@ -27,5 +26,4 @@ static void CreateGRNOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {3}); @@ -26,5 +25,4 @@ static void CreateGroupNormalizationOp(ProgramBuilder& p, const std::shared_ptr< REGISTER_FACTORY_IMPL(v12, GroupNormalization); -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/ops/interpolate.cpp b/src/plugins/intel_gpu/src/plugin/ops/interpolate.cpp index b4a54488ee52e5..3a1d035ee78283 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/interpolate.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/interpolate.cpp @@ -11,8 +11,7 @@ #include "openvino/op/constant.hpp" #include "openvino/op/interpolate.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { static std::vector ExtractAxes(const std::shared_ptr& op, size_t axes_index) { std::vector axes; @@ -227,5 +226,4 @@ static void CreateInterpolateOp(ProgramBuilder& p, const std::shared_ptr static DATA_TYPE CreateScalarData(ProgramBuilder &p, const cldnn::primitive_id& id, ov::Shape& shape, cldnn::data_types dtype, int64_t num, int64_t rank) { @@ -344,5 +343,4 @@ static void CreateTensorIteratorOp(ProgramBuilder& p, const std::shared_ptr axis_value) { if (axis_value.size() == 1 && axis_value[0] == 1) { @@ -44,5 +43,4 @@ static void CreateLRNOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {2}); @@ -214,5 +213,4 @@ REGISTER_FACTORY_IMPL(v0, MatMul); REGISTER_FACTORY_IMPL(internal, Gemm); REGISTER_FACTORY_IMPL(internal, IndirectGemm); -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/ops/matrix_nms.cpp b/src/plugins/intel_gpu/src/plugin/ops/matrix_nms.cpp index aa2bf0494f9610..3c38f1b5ad4bda 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/matrix_nms.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/matrix_nms.cpp @@ -20,8 +20,7 @@ using NmsStaticShapeIE8 = ov::op::internal::NmsStaticShapeIE& op) { @@ -87,5 +86,4 @@ void CreateNmsStaticShapeIE8Op(ProgramBuilder& p, const std::shared_ptr& op) { @@ -82,5 +81,4 @@ static void CreateMulticlassNmsIEInternalOp(ProgramBuilder& p, const std::shared REGISTER_FACTORY_IMPL(internal, MulticlassNmsIEInternal); -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/ops/multinomial.cpp b/src/plugins/intel_gpu/src/plugin/ops/multinomial.cpp index 3b0ea4ce0bf16b..307ece93ec20c2 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/multinomial.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/multinomial.cpp @@ -21,8 +21,7 @@ #include #include -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { namespace { template @@ -148,5 +147,4 @@ static void CreateMultinomialOp(ProgramBuilder& p, const std::shared_ptr& op, std::vector axes, bool normalize_variance, float eps, bool eps_inside_sqrt = true) { @@ -66,5 +65,4 @@ static void CreateMVNOp(ProgramBuilder& p, const std::shared_ptr& op) { cldnn::non_max_suppression::Rotation rotation = cldnn::non_max_suppression::Rotation::NONE; @@ -192,5 +191,4 @@ static void CreateNonMaxSuppressionIEInternalOp(ProgramBuilder& p, const std::sh REGISTER_FACTORY_IMPL(internal, NonMaxSuppressionIEInternal); -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/ops/non_zero.cpp b/src/plugins/intel_gpu/src/plugin/ops/non_zero.cpp index f839cc2d25e169..c8f4db01c80ab3 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/non_zero.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/non_zero.cpp @@ -9,8 +9,7 @@ #include "intel_gpu/primitives/non_zero.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { static void CreateNonZeroOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {1}); @@ -31,5 +30,4 @@ static void CreateNonZeroOp(ProgramBuilder& p, const std::shared_ptr& REGISTER_FACTORY_IMPL(v3, NonZero); -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/ops/normalize_l2.cpp b/src/plugins/intel_gpu/src/plugin/ops/normalize_l2.cpp index b3d4a947923f36..2256b028ed2633 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/normalize_l2.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/normalize_l2.cpp @@ -11,8 +11,7 @@ #include "intel_gpu/primitives/normalize.hpp" #include "intel_gpu/primitives/data.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { static void CreateNormalizeL2Op(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {2}); @@ -58,5 +57,4 @@ static void CreateNormalizeL2Op(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {4}); @@ -79,5 +78,4 @@ static void CreateOneHotOp(ProgramBuilder& p, const std::shared_ptr& op, bool allow_negative_pad) { validate_inputs_count(op, {3, 4}); @@ -78,5 +77,4 @@ static void CreatePadOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {13, 16}); @@ -77,5 +76,4 @@ static void CreatePagedAttentionExtensionOp(ProgramBuilder& p, const std::shared REGISTER_FACTORY_IMPL(internal, PagedAttentionExtension) -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/ops/parameter.cpp b/src/plugins/intel_gpu/src/plugin/ops/parameter.cpp index 9fb0d6182eb285..1b234a19d9b5f0 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/parameter.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/parameter.cpp @@ -19,8 +19,7 @@ #include "intel_gpu/primitives/data.hpp" #include "intel_gpu/primitives/concatenation.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { static void CreateParameterOp(ProgramBuilder& p, const std::shared_ptr& op) { auto input_pshape = op->get_partial_shape(); @@ -144,5 +143,4 @@ static void CreateParameterOp(ProgramBuilder& p, const std::shared_ptr&) { } REGISTER_FACTORY_IMPL(internal, Placeholder); -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/ops/pooling.cpp b/src/plugins/intel_gpu/src/plugin/ops/pooling.cpp index 4ed592d16f5fd9..82d2567466acdb 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/pooling.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/pooling.cpp @@ -11,8 +11,7 @@ #include "intel_gpu/primitives/mutable_data.hpp" #include "intel_gpu/primitives/pooling.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { static void CreateAvgPoolOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {1}); @@ -125,5 +124,4 @@ REGISTER_FACTORY_IMPL(v1, MaxPool); REGISTER_FACTORY_IMPL(v8, MaxPool); REGISTER_FACTORY_IMPL(v1, AvgPool); -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/ops/prior_box.cpp b/src/plugins/intel_gpu/src/plugin/ops/prior_box.cpp index c458d6b38171a3..1d48b17e093c2f 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/prior_box.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/prior_box.cpp @@ -10,8 +10,7 @@ #include "intel_gpu/plugin/common_utils.hpp" #include "intel_gpu/primitives/prior_box.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { static void CreatePriorBoxClusteredOp(ProgramBuilder& p, const std::shared_ptr& op) { OPENVINO_ASSERT(false, "[GPU] PriorBoxClustered op is not supported in GPU plugin yet."); @@ -255,5 +254,4 @@ REGISTER_FACTORY_IMPL(v0, PriorBoxClustered); REGISTER_FACTORY_IMPL(v0, PriorBox); REGISTER_FACTORY_IMPL(v8, PriorBox); -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/ops/proposal.cpp b/src/plugins/intel_gpu/src/plugin/ops/proposal.cpp index fbaf282ee9b280..fa24308398e971 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/proposal.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/proposal.cpp @@ -10,8 +10,7 @@ #include "intel_gpu/primitives/mutable_data.hpp" #include "intel_gpu/runtime/debug_configuration.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { static void CreateProposalOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {3}); @@ -176,5 +175,4 @@ static void CreateProposalOp(ProgramBuilder& p, const std::shared_ptr #include -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { static void CreateRangeOp(ProgramBuilder &p, const std::shared_ptr &op) { validate_inputs_count(op, { 3 }); @@ -32,5 +31,4 @@ static void CreateRangeOp(ProgramBuilder &p, const std::shared_ptr& op, cldnn::reduce_mode mode, bool keep_dims) { validate_inputs_count(op, {2}); @@ -140,5 +139,4 @@ REGISTER_FACTORY_IMPL(v1, ReduceSum); REGISTER_FACTORY_IMPL(v4, ReduceL1); REGISTER_FACTORY_IMPL(v4, ReduceL2); -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/ops/region_yolo.cpp b/src/plugins/intel_gpu/src/plugin/ops/region_yolo.cpp index 72aaa044cfdb55..922b898ef69818 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/region_yolo.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/region_yolo.cpp @@ -9,8 +9,7 @@ #include "intel_gpu/primitives/region_yolo.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { static void CreateRegionYoloOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {1}); @@ -42,5 +41,4 @@ static void CreateRegionYoloOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {1}); @@ -28,5 +27,4 @@ static void CreateReorgYoloOp(ProgramBuilder& p, const std::shared_ptr& op, cldnn::reshape::reshape_mode mode, bool special_zero = false) { validate_inputs_count(op, {1, 2}); @@ -105,5 +104,4 @@ REGISTER_FACTORY_IMPL(v1, Reshape); REGISTER_FACTORY_IMPL(v0, Squeeze); REGISTER_FACTORY_IMPL(v0, Unsqueeze); -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/ops/result.cpp b/src/plugins/intel_gpu/src/plugin/ops/result.cpp index 0acd839d95d574..66402933c5ca89 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/result.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/result.cpp @@ -13,8 +13,7 @@ #include "intel_gpu/primitives/reorder.hpp" #include "transformations/utils/utils.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { static void CreateResultOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {1}); @@ -48,5 +47,4 @@ static void CreateResultOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {2}); @@ -25,5 +24,4 @@ static void CreateReverseOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {2}); @@ -30,5 +29,4 @@ static void CreateReverseSequenceOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {2}); @@ -27,5 +26,4 @@ static void CreateRMSOp(ProgramBuilder& p, const std::shared_ptr& op) { REGISTER_FACTORY_IMPL(internal, RMS); -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/ops/rnn.cpp b/src/plugins/intel_gpu/src/plugin/ops/rnn.cpp index 1927d4360ae733..44e6ad8a008d6e 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/rnn.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/rnn.cpp @@ -19,8 +19,7 @@ #include "intel_gpu/primitives/permute.hpp" #include "intel_gpu/primitives/slice.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { static cldnn::activation_func GetActivationFunc(std::string name) { static const std::map name_mapping = { {"sigmoid", cldnn::activation_func::logistic}, @@ -102,5 +101,4 @@ static void CreateLSTMSequenceOp(ProgramBuilder& p, const std::shared_ptr& op REGISTER_FACTORY_IMPL(v7, Roll); -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/ops/rope.cpp b/src/plugins/intel_gpu/src/plugin/ops/rope.cpp index 04eae769612bfc..ed2c4f3b828cd9 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/rope.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/rope.cpp @@ -16,8 +16,7 @@ using RoPE = ov::op::internal::RoPE; } // namespace op } // namespace ov -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { static void CreateRoPEOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {3, 4}); @@ -41,5 +40,4 @@ static void CreateRoPEOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {3, 4, 5}); @@ -88,5 +87,4 @@ REGISTER_FACTORY_IMPL(internal, SDPA); REGISTER_FACTORY_IMPL(internal, IndirectSDPA); REGISTER_FACTORY_IMPL(v13, ScaledDotProductAttention); -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/ops/scatter_elements_update.cpp b/src/plugins/intel_gpu/src/plugin/ops/scatter_elements_update.cpp index fbc9087ca39a1d..5f2e43b588e316 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/scatter_elements_update.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/scatter_elements_update.cpp @@ -9,8 +9,7 @@ #include "openvino/op/constant.hpp" #include "openvino/op/scatter_elements_update.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { static void CreateScatterElementsUpdateOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {4}); @@ -45,5 +44,4 @@ static void CreateScatterElementsUpdateOp(ProgramBuilder& p, const std::shared_p REGISTER_FACTORY_IMPL(v3, ScatterElementsUpdate); REGISTER_FACTORY_IMPL(v12, ScatterElementsUpdate); -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/ops/scatter_nd_update.cpp b/src/plugins/intel_gpu/src/plugin/ops/scatter_nd_update.cpp index 23a03cdc8bf89f..923b62865b9ec7 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/scatter_nd_update.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/scatter_nd_update.cpp @@ -10,8 +10,7 @@ #include "intel_gpu/primitives/scatter_nd_update.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { static void CreateScatterNDUpdateOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {3}); @@ -30,5 +29,4 @@ static void CreateScatterNDUpdateOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {4}); @@ -32,5 +31,4 @@ static void CreateScatterUpdateOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {2}); @@ -21,5 +20,4 @@ static void CreateSearchSortedOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {3}); @@ -84,5 +83,4 @@ static void CreateSelectOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {1, 2}); @@ -35,5 +34,4 @@ static void CreateShapeOfOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {1, 2}); @@ -29,5 +28,4 @@ static void CreateShuffleChannelsOp(ProgramBuilder& p, const std::shared_ptr -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { namespace { @@ -27,5 +26,4 @@ static void CreateSliceOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {1}); @@ -58,5 +57,4 @@ REGISTER_FACTORY_IMPL(v1, Softmax); REGISTER_FACTORY_IMPL(v8, Softmax); REGISTER_FACTORY_IMPL(v5, LogSoftmax); -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/ops/space_to_batch.cpp b/src/plugins/intel_gpu/src/plugin/ops/space_to_batch.cpp index fd48ddf7ec8410..e79461ce7939c0 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/space_to_batch.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/space_to_batch.cpp @@ -10,8 +10,7 @@ #include "intel_gpu/primitives/space_to_batch.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { static void CreateSpaceToBatchOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {4}); @@ -70,5 +69,4 @@ static void CreateSpaceToBatchOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {1}); auto inputs = p.GetInputInfo(op); @@ -25,5 +24,4 @@ static void CreateSpaceToDepthOp(ProgramBuilder& p, const std::shared_ptr& op) { if (op->is_dynamic()) { @@ -135,5 +134,4 @@ static void CreateVariadicSplitOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {4}); @@ -21,5 +20,4 @@ static void CreateSTFTOp(ProgramBuilder& p, const std::shared_ptr -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { static void CreateStridedSliceOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {4}); @@ -295,5 +294,4 @@ static void CreateStridedSliceOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {1}); @@ -43,5 +42,4 @@ static void CreateGLUOp(ProgramBuilder& p, const std::shared_ptr& op) { REGISTER_FACTORY_IMPL(internal, GLU); -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/ops/tile.cpp b/src/plugins/intel_gpu/src/plugin/ops/tile.cpp index 4bb04b789d74c5..cd39c359c854e9 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/tile.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/tile.cpp @@ -10,8 +10,7 @@ #include "intel_gpu/primitives/tile.hpp" #include "intel_gpu/primitives/reshape.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { static void CreateTileOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {2}); @@ -57,5 +56,4 @@ static void CreateTileOp(ProgramBuilder& p, const std::shared_ptr& op, @@ -109,5 +108,4 @@ static void CreateTopKOp(ProgramBuilder& p, const std::shared_ptr& op) { validate_inputs_count(op, {1, 2}); @@ -40,5 +39,4 @@ static void CreateTransposeOp(ProgramBuilder& p, const std::shared_ptr& op, cldnn::activation_func func, cldnn::activation_additional_params params) { @@ -335,5 +334,4 @@ REGISTER_FACTORY_IMPL(v5, HSigmoid); REGISTER_FACTORY_IMPL(v5, Round); REGISTER_FACTORY_IMPL(v9, SoftSign); -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/ops/unique.cpp b/src/plugins/intel_gpu/src/plugin/ops/unique.cpp index 28e9c023358162..516604e16c86b5 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/unique.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/unique.cpp @@ -8,8 +8,7 @@ #include "openvino/op/constant.hpp" #include "openvino/op/unique.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { namespace { @@ -48,5 +47,4 @@ void CreateUniqueOp(ProgramBuilder& p, const std::shared_ptr @@ -114,5 +113,4 @@ REGISTER_FACTORY_IMPL(v6, ReadValue); REGISTER_FACTORY_IMPL(internal, ReadValue); REGISTER_FACTORY_IMPL(internal, ReadValues); -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/plugin.cpp b/src/plugins/intel_gpu/src/plugin/plugin.cpp index a02125d3b6cc18..4fdf70fbf18b9e 100644 --- a/src/plugins/intel_gpu/src/plugin/plugin.cpp +++ b/src/plugins/intel_gpu/src/plugin/plugin.cpp @@ -54,8 +54,7 @@ using ms = std::chrono::duration>; using Time = std::chrono::high_resolution_clock; -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { #define FACTORY_DECLARATION(op_version, op_name) \ void __register ## _ ## op_name ## _ ## op_version(); @@ -887,8 +886,7 @@ uint32_t Plugin::get_optimal_batch_size(const ov::AnyMap& options) const { return batch; } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu static const ov::Version version = { CI_BUILD_NUMBER, "Intel GPU plugin" }; OV_DEFINE_PLUGIN_CREATE_FUNCTION(ov::intel_gpu::Plugin, version) diff --git a/src/plugins/intel_gpu/src/plugin/program_builder.cpp b/src/plugins/intel_gpu/src/plugin/program_builder.cpp index b1d43fe20b11ae..2abc8bb65df6ac 100644 --- a/src/plugins/intel_gpu/src/plugin/program_builder.cpp +++ b/src/plugins/intel_gpu/src/plugin/program_builder.cpp @@ -33,8 +33,7 @@ #endif -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { const cldnn::primitive_id ProgramBuilder::m_preProcessTag("_cldnn_input_preprocess"); const cldnn::primitive_id ProgramBuilder::m_preCustomLayerTag("_cldnn_custom_preprocess"); @@ -422,5 +421,4 @@ void validate_inputs_count(const std::shared_ptr& op, std::vectorget_type_info().version_id, ")"); } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/remote_context.cpp b/src/plugins/intel_gpu/src/plugin/remote_context.cpp index e75b428c3a9d55..f2481eebf43184 100644 --- a/src/plugins/intel_gpu/src/plugin/remote_context.cpp +++ b/src/plugins/intel_gpu/src/plugin/remote_context.cpp @@ -11,8 +11,7 @@ #include "intel_gpu/runtime/device_query.hpp" #include -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { namespace { @@ -233,5 +232,4 @@ void RemoteContextImpl::check_if_shared() const { OPENVINO_ASSERT(m_type == ContextType::VA_SHARED, "[GPU] Shared context is required to to share this type of memory"); } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/remote_tensor.cpp b/src/plugins/intel_gpu/src/plugin/remote_tensor.cpp index d02064b5d55145..97ca22abdc210f 100644 --- a/src/plugins/intel_gpu/src/plugin/remote_tensor.cpp +++ b/src/plugins/intel_gpu/src/plugin/remote_tensor.cpp @@ -11,8 +11,7 @@ #include -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { namespace { static ov::Strides calculate_strides(const ov::Shape& shape, const ov::element::Type& element_type) { @@ -494,5 +493,4 @@ void RemoteTensorImpl::update_properties() { } } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/sync_infer_request.cpp b/src/plugins/intel_gpu/src/plugin/sync_infer_request.cpp index 3d1c87ad0c115c..41b358b6d7faad 100644 --- a/src/plugins/intel_gpu/src/plugin/sync_infer_request.cpp +++ b/src/plugins/intel_gpu/src/plugin/sync_infer_request.cpp @@ -103,8 +103,7 @@ cldnn::data_types data_type_for_remote_tensor(ov::element::Type t) { } // namespace -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { // ----------------------------------------------------------------------------------------------- // // ---------------------------- OpenVINO API impl ------------------------------------------------ // @@ -1014,5 +1013,4 @@ bool SyncInferRequest::is_batched_input(const ov::Output& port) return m_batched_tensors.count(port.get_tensor_ptr()) > 0; } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/bcast_and_pad_zp_buffers.cpp b/src/plugins/intel_gpu/src/plugin/transformations/bcast_and_pad_zp_buffers.cpp index bfae380a93e046..e4ecade00180ab 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/bcast_and_pad_zp_buffers.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/bcast_and_pad_zp_buffers.cpp @@ -18,8 +18,7 @@ using namespace ov::pass::pattern; -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { namespace { template @@ -181,5 +180,4 @@ BroadcastAndPadZeroPointBuffers::BroadcastAndPadZeroPointBuffers(size_t pad_size this->register_matcher(m, callback); } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/bcast_and_pad_zp_buffers.hpp b/src/plugins/intel_gpu/src/plugin/transformations/bcast_and_pad_zp_buffers.hpp index 1fab1692d97cbe..fc154073e25fd5 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/bcast_and_pad_zp_buffers.hpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/bcast_and_pad_zp_buffers.hpp @@ -6,8 +6,7 @@ #include "openvino/pass/graph_rewrite.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { // Makes zero-points and compensation parameters of internal::Convolution op broadcasted to corresponding channels size // and adds optional padding to align elements count to `alignment` value @@ -17,5 +16,4 @@ class BroadcastAndPadZeroPointBuffers : public ov::pass::MatcherPass { BroadcastAndPadZeroPointBuffers(size_t alignment = 1, bool supports_immad = false); }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/binary_conv_to_conv.cpp b/src/plugins/intel_gpu/src/plugin/transformations/binary_conv_to_conv.cpp index 77a9444a216a1f..8da997be618602 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/binary_conv_to_conv.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/binary_conv_to_conv.cpp @@ -19,8 +19,7 @@ #include "openvino/pass/pattern/op/or.hpp" #include "transformations/utils/utils.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { namespace { template @@ -116,5 +115,4 @@ ConvertBinaryConvolutionToConvolution::ConvertBinaryConvolutionToConvolution() { this->register_matcher(m, callback); } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/binary_conv_to_conv.hpp b/src/plugins/intel_gpu/src/plugin/transformations/binary_conv_to_conv.hpp index 8d0a146eed99ac..dd6e275b23350e 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/binary_conv_to_conv.hpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/binary_conv_to_conv.hpp @@ -6,8 +6,7 @@ #include "openvino/pass/graph_rewrite.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { class ConvertBinaryConvolutionToConvolution: public ov::pass::MatcherPass { public: @@ -15,5 +14,4 @@ class ConvertBinaryConvolutionToConvolution: public ov::pass::MatcherPass { ConvertBinaryConvolutionToConvolution(); }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/clamp_fp16_output.cpp b/src/plugins/intel_gpu/src/plugin/transformations/clamp_fp16_output.cpp index e5395d923841b5..0ccc40cf2b7620 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/clamp_fp16_output.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/clamp_fp16_output.cpp @@ -21,8 +21,7 @@ #include -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { ClampFP16Output::ClampFP16Output() { using namespace ov::op; @@ -63,5 +62,4 @@ ClampFP16Output::ClampFP16Output() { this->register_matcher(m, callback); } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/clamp_fp16_output.hpp b/src/plugins/intel_gpu/src/plugin/transformations/clamp_fp16_output.hpp index bea51c2e768576..4d8e71b6195589 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/clamp_fp16_output.hpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/clamp_fp16_output.hpp @@ -7,8 +7,7 @@ #include "openvino/pass/graph_rewrite.hpp" #include "openvino/pass/pass.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { /** * @brief This transformation adds Clamp primitive between MatMul and Softmax operation @@ -23,5 +22,4 @@ class ClampFP16Output: public ov::pass::MatcherPass { ClampFP16Output(); }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/convert_convolution.cpp b/src/plugins/intel_gpu/src/plugin/transformations/convert_convolution.cpp index 371c134afa028b..8221633c2439eb 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/convert_convolution.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/convert_convolution.cpp @@ -22,8 +22,7 @@ using namespace ov::pass::pattern; using ov::pass::pattern::op::Or; -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { namespace { template @@ -236,5 +235,4 @@ bool ConvertConvolutionToInternal::run_on_model(const std::shared_ptr return manager.run_passes(m); } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/convert_convolution.hpp b/src/plugins/intel_gpu/src/plugin/transformations/convert_convolution.hpp index 1cc30180db7142..ef489d67e4c438 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/convert_convolution.hpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/convert_convolution.hpp @@ -6,8 +6,7 @@ #include "openvino/pass/pass.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { class ConvertConvolutionToInternal : public ov::pass::ModelPass { public: @@ -15,5 +14,4 @@ class ConvertConvolutionToInternal : public ov::pass::ModelPass { bool run_on_model(const std::shared_ptr& m) override; }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/convert_fc_to_compressed.cpp b/src/plugins/intel_gpu/src/plugin/transformations/convert_fc_to_compressed.cpp index f5062b4c2028cc..982205ad9ca34f 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/convert_fc_to_compressed.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/convert_fc_to_compressed.cpp @@ -21,8 +21,7 @@ #include "openvino/pass/pattern/op/or.hpp" #include "transformations/utils/utils.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { ConvertFullyConnectedToFullyConnectedCompressed::ConvertFullyConnectedToFullyConnectedCompressed() { using namespace ov::pass::pattern; @@ -188,5 +187,4 @@ ConvertFullyConnectedToFullyConnectedCompressed::ConvertFullyConnectedToFullyCon this->register_matcher(m, callback); } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/convert_fc_to_compressed.hpp b/src/plugins/intel_gpu/src/plugin/transformations/convert_fc_to_compressed.hpp index 987a447eb34a54..cbcc9e0dae0061 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/convert_fc_to_compressed.hpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/convert_fc_to_compressed.hpp @@ -6,8 +6,7 @@ #include "openvino/pass/graph_rewrite.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { class ConvertFullyConnectedToFullyConnectedCompressed: public ov::pass::MatcherPass { public: @@ -15,5 +14,4 @@ class ConvertFullyConnectedToFullyConnectedCompressed: public ov::pass::MatcherP ConvertFullyConnectedToFullyConnectedCompressed(); }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/convert_matmul_to_fc.cpp b/src/plugins/intel_gpu/src/plugin/transformations/convert_matmul_to_fc.cpp index 97d3278599409d..26a5ccdcf7190d 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/convert_matmul_to_fc.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/convert_matmul_to_fc.cpp @@ -13,8 +13,7 @@ #include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { ConvertMatMulToFullyConnected::ConvertMatMulToFullyConnected() { auto static_rank_gt_1 = [](const ov::Output& output) { @@ -209,5 +208,4 @@ ConvertMatMulToFullyConnected::ConvertMatMulToFullyConnected() { this->register_matcher(m, callback); } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/convert_matmul_to_fc.hpp b/src/plugins/intel_gpu/src/plugin/transformations/convert_matmul_to_fc.hpp index 096117730c6f15..bf110fe786633c 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/convert_matmul_to_fc.hpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/convert_matmul_to_fc.hpp @@ -6,8 +6,7 @@ #include "openvino/pass/graph_rewrite.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { class ConvertMatMulToFullyConnected: public ov::pass::MatcherPass { public: @@ -15,5 +14,4 @@ class ConvertMatMulToFullyConnected: public ov::pass::MatcherPass { ConvertMatMulToFullyConnected(); }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/convert_pooling_to_reduce.hpp b/src/plugins/intel_gpu/src/plugin/transformations/convert_pooling_to_reduce.hpp index a6cd174244896f..2b5803a996d078 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/convert_pooling_to_reduce.hpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/convert_pooling_to_reduce.hpp @@ -7,8 +7,7 @@ #include "openvino/pass/graph_rewrite.hpp" #include "openvino/core/visibility.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { class ConvertAvgPoolingToReduce : public ov::pass::MatcherPass { public: @@ -16,5 +15,4 @@ class ConvertAvgPoolingToReduce : public ov::pass::MatcherPass { ConvertAvgPoolingToReduce(); }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/convert_shapeof.hpp b/src/plugins/intel_gpu/src/plugin/transformations/convert_shapeof.hpp index e08814489065e5..4d181660d1cc66 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/convert_shapeof.hpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/convert_shapeof.hpp @@ -7,8 +7,7 @@ #include "openvino/pass/graph_rewrite.hpp" #include "openvino/core/visibility.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { class ConvertShapeOf1To3 : public ov::pass::MatcherPass { public: @@ -16,5 +15,4 @@ class ConvertShapeOf1To3 : public ov::pass::MatcherPass { ConvertShapeOf1To3(); }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/convert_stridedslices_to_variadicsplit.cpp b/src/plugins/intel_gpu/src/plugin/transformations/convert_stridedslices_to_variadicsplit.cpp index 07ec61b155ff3f..2219a764e34ffa 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/convert_stridedslices_to_variadicsplit.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/convert_stridedslices_to_variadicsplit.cpp @@ -15,8 +15,7 @@ #include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { ConvertStridedSlicesToVariadicSplit::ConvertStridedSlicesToVariadicSplit() { using namespace ov::pass::pattern; @@ -146,5 +145,4 @@ ConvertStridedSlicesToVariadicSplit::ConvertStridedSlicesToVariadicSplit() { this->register_matcher(m, callback); } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/convert_stridedslices_to_variadicsplit.hpp b/src/plugins/intel_gpu/src/plugin/transformations/convert_stridedslices_to_variadicsplit.hpp index 987d3e8a69b589..a44abb12ab8aa8 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/convert_stridedslices_to_variadicsplit.hpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/convert_stridedslices_to_variadicsplit.hpp @@ -6,8 +6,7 @@ #include "openvino/pass/graph_rewrite.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { class ConvertStridedSlicesToVariadicSplit : public ov::pass::MatcherPass { public: @@ -15,5 +14,4 @@ class ConvertStridedSlicesToVariadicSplit : public ov::pass::MatcherPass { ConvertStridedSlicesToVariadicSplit(); }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/decompose_reduce_for_false_keepdims.cpp b/src/plugins/intel_gpu/src/plugin/transformations/decompose_reduce_for_false_keepdims.cpp index 0f5531f41c0c32..1dfba2f3cca579 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/decompose_reduce_for_false_keepdims.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/decompose_reduce_for_false_keepdims.cpp @@ -20,8 +20,7 @@ #include #include -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { DecomposeReduceForFalseKeepDims::DecomposeReduceForFalseKeepDims() { // Get one MatcherPass for all modes @@ -123,5 +122,4 @@ bool DecomposeReduceForFalseKeepDims::need_transformation_for_reordered_axes(std return feature_axis_is_only_remaining; } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/decompose_reduce_for_false_keepdims.hpp b/src/plugins/intel_gpu/src/plugin/transformations/decompose_reduce_for_false_keepdims.hpp index 55361f881fc958..c8190c2b0fdded 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/decompose_reduce_for_false_keepdims.hpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/decompose_reduce_for_false_keepdims.hpp @@ -7,8 +7,7 @@ #include "openvino/pass/graph_rewrite.hpp" #include "openvino/core/visibility.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { /** * @brief Add Reshape to modify output of Reduce and modify keep_dims to true : reduce-reshape @@ -26,5 +25,4 @@ class DecomposeReduceForFalseKeepDims : public ov::pass::MatcherPass { bool need_transformation_for_reordered_axes(std::vector reduce_axes, size_t num_dim, size_t num_spatial); }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/decompose_reduce_scalar_output.hpp b/src/plugins/intel_gpu/src/plugin/transformations/decompose_reduce_scalar_output.hpp index a9794cf50322b0..367f0ec3aeb62d 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/decompose_reduce_scalar_output.hpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/decompose_reduce_scalar_output.hpp @@ -7,8 +7,7 @@ #include "openvino/core/visibility.hpp" #include "openvino/pass/graph_rewrite.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { // In some case, Reduce OP is used to reduce one 2D/3D/4D/5D tensor to a scalar output, which leads to all computation // are executed in single EU thread due to only one output, then fall in very poor performance. This pattern is used to @@ -19,5 +18,4 @@ class DecomposeReduceForScalarOutput : public ov::pass::MatcherPass { DecomposeReduceForScalarOutput(); }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/dynamic_quantize_fully_connected.cpp b/src/plugins/intel_gpu/src/plugin/transformations/dynamic_quantize_fully_connected.cpp index f5607e98ab0f6f..6c0d50be96e7ae 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/dynamic_quantize_fully_connected.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/dynamic_quantize_fully_connected.cpp @@ -14,8 +14,7 @@ #include "transformations/utils/utils.hpp" #include "intel_gpu/runtime/debug_configuration.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { DynamicQuantizeFullyConnected::DynamicQuantizeFullyConnected(uint64_t group_size) : ov::pass::MatcherPass() { @@ -92,5 +91,4 @@ DynamicQuantizeFullyConnected::DynamicQuantizeFullyConnected(uint64_t group_size this->register_matcher(m, callback); } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/dynamic_quantize_fully_connected.hpp b/src/plugins/intel_gpu/src/plugin/transformations/dynamic_quantize_fully_connected.hpp index 8d340c35941d23..85d32fbfdcea84 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/dynamic_quantize_fully_connected.hpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/dynamic_quantize_fully_connected.hpp @@ -6,8 +6,7 @@ #include "openvino/pass/graph_rewrite.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { class DynamicQuantizeFullyConnected: public ov::pass::MatcherPass { public: @@ -15,5 +14,4 @@ class DynamicQuantizeFullyConnected: public ov::pass::MatcherPass { DynamicQuantizeFullyConnected(uint64_t group_size); }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/einsum_decomposition.cpp b/src/plugins/intel_gpu/src/plugin/transformations/einsum_decomposition.cpp index 8a8a709069ce59..0a5fcf94396597 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/einsum_decomposition.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/einsum_decomposition.cpp @@ -18,8 +18,7 @@ #include -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { namespace { using LabelDimMap = std::unordered_map>; @@ -948,5 +947,4 @@ EinsumDecomposition::EinsumDecomposition() { register_matcher(matcher, callback); } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/einsum_decomposition.hpp b/src/plugins/intel_gpu/src/plugin/transformations/einsum_decomposition.hpp index 785ec469cb16a1..e850c468fc23ba 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/einsum_decomposition.hpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/einsum_decomposition.hpp @@ -7,8 +7,7 @@ #include "openvino/pass/graph_rewrite.hpp" #include "openvino/core/visibility.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { /** * @brief EinsumDecomposition transformation decomposes Einsum-7 operation into a sub-graph with more simple operations: @@ -20,5 +19,4 @@ class EinsumDecomposition : public ov::pass::MatcherPass { EinsumDecomposition(); }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/fc_convert_fusion.cpp b/src/plugins/intel_gpu/src/plugin/transformations/fc_convert_fusion.cpp index 00bfa55d11e9f8..08096907d2ebee 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/fc_convert_fusion.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/fc_convert_fusion.cpp @@ -12,8 +12,7 @@ #include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { FullyConnectedConvertFusion::FullyConnectedConvertFusion() { using namespace ov::pass::pattern; @@ -70,5 +69,4 @@ FullyConnectedConvertFusion::FullyConnectedConvertFusion() { this->register_matcher(m, callback); } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/fc_convert_fusion.hpp b/src/plugins/intel_gpu/src/plugin/transformations/fc_convert_fusion.hpp index 7088fd170b92f6..768603462a32f7 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/fc_convert_fusion.hpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/fc_convert_fusion.hpp @@ -6,8 +6,7 @@ #include "openvino/pass/graph_rewrite.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { class FullyConnectedConvertFusion: public ov::pass::MatcherPass { public: @@ -15,5 +14,4 @@ class FullyConnectedConvertFusion: public ov::pass::MatcherPass { FullyConnectedConvertFusion(); }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/fc_horizontal_fusion.cpp b/src/plugins/intel_gpu/src/plugin/transformations/fc_horizontal_fusion.cpp index 48e4540384de27..e2090a4d2b5eb8 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/fc_horizontal_fusion.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/fc_horizontal_fusion.cpp @@ -15,8 +15,7 @@ #include "intel_gpu/op/placeholder.hpp" #include "intel_gpu/runtime/debug_configuration.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { FullyConnectedHorizontalFusion::FullyConnectedHorizontalFusion(bool fuse_mlp_swiglu) { using namespace ov::pass::pattern; @@ -308,5 +307,4 @@ FullyConnectedHorizontalFusion::FullyConnectedHorizontalFusion(bool fuse_mlp_swi this->register_matcher(m, callback); } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/fc_horizontal_fusion.hpp b/src/plugins/intel_gpu/src/plugin/transformations/fc_horizontal_fusion.hpp index bedd5723d73d3d..dcad833172ea8a 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/fc_horizontal_fusion.hpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/fc_horizontal_fusion.hpp @@ -6,8 +6,7 @@ #include "openvino/pass/graph_rewrite.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { class FullyConnectedHorizontalFusion: public ov::pass::MatcherPass { public: @@ -15,5 +14,4 @@ class FullyConnectedHorizontalFusion: public ov::pass::MatcherPass { FullyConnectedHorizontalFusion(bool fuse_mlp_swiglu = false); }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/fc_per_layer_scaling.cpp b/src/plugins/intel_gpu/src/plugin/transformations/fc_per_layer_scaling.cpp index c5c0e67fd4f751..bae7c467ffcfcd 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/fc_per_layer_scaling.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/fc_per_layer_scaling.cpp @@ -14,8 +14,7 @@ #include "openvino/pass/pattern/op/or.hpp" #include "transformations/utils/utils.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { FullyConnectedPerLayerScaling::FullyConnectedPerLayerScaling(float scale_factor) { using namespace ov::pass::pattern; @@ -77,5 +76,4 @@ FullyConnectedPerLayerScaling::FullyConnectedPerLayerScaling(float scale_factor) this->register_matcher(m, callback); } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/fc_per_layer_scaling.hpp b/src/plugins/intel_gpu/src/plugin/transformations/fc_per_layer_scaling.hpp index 72fa60d818f8d4..a65f28c2e7e471 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/fc_per_layer_scaling.hpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/fc_per_layer_scaling.hpp @@ -6,8 +6,7 @@ #include "openvino/pass/graph_rewrite.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { class FullyConnectedPerLayerScaling: public ov::pass::MatcherPass { public: @@ -15,5 +14,4 @@ class FullyConnectedPerLayerScaling: public ov::pass::MatcherPass { FullyConnectedPerLayerScaling(float scale_factor); }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/group_norm_composition.cpp b/src/plugins/intel_gpu/src/plugin/transformations/group_norm_composition.cpp index ce9041cac4921b..1db88916163dd9 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/group_norm_composition.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/group_norm_composition.cpp @@ -18,8 +18,7 @@ #include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { GroupNormComposition::GroupNormComposition() { using namespace ov::pass::pattern; @@ -108,5 +107,4 @@ GroupNormComposition::GroupNormComposition() { this->register_matcher(m, callback); } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/group_norm_composition.hpp b/src/plugins/intel_gpu/src/plugin/transformations/group_norm_composition.hpp index ccd30b4fe2c66f..6f9fca08696791 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/group_norm_composition.hpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/group_norm_composition.hpp @@ -6,8 +6,7 @@ #include "openvino/pass/graph_rewrite.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { class GroupNormComposition : public ov::pass::MatcherPass { public: @@ -15,5 +14,4 @@ class GroupNormComposition : public ov::pass::MatcherPass { GroupNormComposition(); }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/increase_position_ids_precision.cpp b/src/plugins/intel_gpu/src/plugin/transformations/increase_position_ids_precision.cpp index af7a73df4ba07e..4ebd9c1eee9815 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/increase_position_ids_precision.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/increase_position_ids_precision.cpp @@ -22,8 +22,7 @@ #include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { IncreasePositionIdsPrecision::IncreasePositionIdsPrecision() { using namespace ov::pass::pattern; @@ -126,5 +125,4 @@ IncreasePositionIdsPrecision::IncreasePositionIdsPrecision() { this->register_matcher(m, callback); } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/increase_position_ids_precision.hpp b/src/plugins/intel_gpu/src/plugin/transformations/increase_position_ids_precision.hpp index f8bed4ddeee2a8..7f7896780fd3e0 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/increase_position_ids_precision.hpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/increase_position_ids_precision.hpp @@ -6,8 +6,7 @@ #include "openvino/pass/graph_rewrite.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { /** * @brief This pass adds additional convert nodes on the position_ids input branch (around MatMul operation), @@ -21,5 +20,4 @@ class IncreasePositionIdsPrecision : public ov::pass::MatcherPass { IncreasePositionIdsPrecision(); }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/indirect_kv_cache.cpp b/src/plugins/intel_gpu/src/plugin/transformations/indirect_kv_cache.cpp index edd2c398ab8825..4e406f9328886e 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/indirect_kv_cache.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/indirect_kv_cache.cpp @@ -41,8 +41,7 @@ void replace_node_unsafe(const std::shared_ptr& target, const std::sha } // namespace -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { IndirectGemmOpt::IndirectGemmOpt() { using namespace ov::pass::pattern; @@ -228,5 +227,4 @@ IndirectKVCache::IndirectKVCache() { add_matcher(); add_matcher(); } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/indirect_kv_cache.hpp b/src/plugins/intel_gpu/src/plugin/transformations/indirect_kv_cache.hpp index f76edeeb4f20da..c46fd5dff381b5 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/indirect_kv_cache.hpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/indirect_kv_cache.hpp @@ -6,8 +6,7 @@ #include "openvino/pass/graph_rewrite.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { /// Merges Gather into KVCache op /// ┌─────────────────────┐ ┌─────────────────────┐ @@ -53,5 +52,5 @@ class IndirectSDPAOpt : public ov::pass::MatcherPass { OPENVINO_MATCHER_PASS_RTTI("IndirectSDPAOpt"); IndirectSDPAOpt(); }; -} // namespace intel_gpu -} // namespace ov + +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/kv_cache_compression.cpp b/src/plugins/intel_gpu/src/plugin/transformations/kv_cache_compression.cpp index c63a0b27f38577..8ed571f2ee4f17 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/kv_cache_compression.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/kv_cache_compression.cpp @@ -32,8 +32,7 @@ #include -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { namespace { std::vector get_variable_infos(const ov::op::util::VariableInfo& data_variable_info, @@ -289,5 +288,4 @@ KVCacheCompression::KVCacheCompression(ov::element::Type compression_dt, bool su add_matcher(compression_dt, supports_immad); } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/kv_cache_compression.hpp b/src/plugins/intel_gpu/src/plugin/transformations/kv_cache_compression.hpp index f4a930686520ba..5d924fc8074bee 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/kv_cache_compression.hpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/kv_cache_compression.hpp @@ -6,8 +6,7 @@ #include "openvino/pass/graph_rewrite.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { /// Add dynamic quantization node and fuse it with KV cache operation @@ -40,5 +39,4 @@ class KVCacheCompression : public ov::pass::GraphRewrite { }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/kv_cache_fusion.cpp b/src/plugins/intel_gpu/src/plugin/transformations/kv_cache_fusion.cpp index 64095a744120a3..2f6bd471b6b8e5 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/kv_cache_fusion.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/kv_cache_fusion.cpp @@ -26,8 +26,7 @@ #include "transformations/utils/utils.hpp" #include "openvino/opsets/opset8.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { class KVCacheFusionMatcher : public ov::pass::MatcherPass { public: @@ -132,5 +131,4 @@ KVCacheFusion::KVCacheFusion() { add_matcher(); } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/kv_cache_fusion.hpp b/src/plugins/intel_gpu/src/plugin/transformations/kv_cache_fusion.hpp index 614d3ba5020363..f833b0bc18efbd 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/kv_cache_fusion.hpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/kv_cache_fusion.hpp @@ -6,8 +6,7 @@ #include "openvino/pass/graph_rewrite.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { /// 1. Trivial case (greedy search, no state initializer) /// ┌───────────┐ ┌───────────┐ ┌───────────┐ @@ -83,5 +82,4 @@ class KVCacheFusion : public ov::pass::GraphRewrite { }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/lora_horizontal_fusion.cpp b/src/plugins/intel_gpu/src/plugin/transformations/lora_horizontal_fusion.cpp index e31ada8173f11c..7b9682c3d4cefc 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/lora_horizontal_fusion.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/lora_horizontal_fusion.cpp @@ -11,8 +11,7 @@ #include "intel_gpu/op/fully_connected_compressed.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { LoRAHorizontalFusion::LoRAHorizontalFusion() { using namespace ov::pass::pattern; @@ -161,5 +160,4 @@ LoRAHorizontalFusion::LoRAHorizontalFusion() { this->register_matcher(m, callback); } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/lora_horizontal_fusion.hpp b/src/plugins/intel_gpu/src/plugin/transformations/lora_horizontal_fusion.hpp index 09c8229cee398e..7fe95a62b2e6d9 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/lora_horizontal_fusion.hpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/lora_horizontal_fusion.hpp @@ -6,8 +6,7 @@ #include "openvino/pass/graph_rewrite.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { // Before: // ┌─────────┐ ┌─────────┐ @@ -84,5 +83,4 @@ class LoRAHorizontalFusion: public ov::pass::MatcherPass { LoRAHorizontalFusion(); }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/move_fc_reshape_to_weights.cpp b/src/plugins/intel_gpu/src/plugin/transformations/move_fc_reshape_to_weights.cpp index 8b54d32d1c5559..1eabf1e8f79e0c 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/move_fc_reshape_to_weights.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/move_fc_reshape_to_weights.cpp @@ -16,8 +16,7 @@ #include "openvino/op/transpose.hpp" #include "openvino/op/reshape.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { MoveFCReshapeToWeights::MoveFCReshapeToWeights() { using namespace ov::pass::pattern; @@ -108,5 +107,4 @@ MoveFCReshapeToWeights::MoveFCReshapeToWeights() { this->register_matcher(m, callback); } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/move_fc_reshape_to_weights.hpp b/src/plugins/intel_gpu/src/plugin/transformations/move_fc_reshape_to_weights.hpp index 7237e5c97ace70..4284e526c4afbc 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/move_fc_reshape_to_weights.hpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/move_fc_reshape_to_weights.hpp @@ -6,8 +6,7 @@ #include "openvino/pass/graph_rewrite.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { /** * This transformation is applied to the FC with compressed 3D u8 weights. It moves Reshape at the weights path to the constants @@ -34,5 +33,4 @@ class MoveFCReshapeToWeights: public ov::pass::MatcherPass { MoveFCReshapeToWeights(); }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/op/convolution.cpp b/src/plugins/intel_gpu/src/plugin/transformations/op/convolution.cpp index c822707c09d913..b7e61cd8cb8ad7 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/op/convolution.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/op/convolution.cpp @@ -9,9 +9,7 @@ #include "group_convolution_shape_inference.hpp" #include "openvino/op/group_conv.hpp" -namespace ov { -namespace intel_gpu { -namespace op { +namespace ov::intel_gpu::op { Convolution::Convolution(const ov::Output& data_batch, const ov::Output& filters, @@ -156,6 +154,4 @@ std::vector shape_infer(const Convolution* op, } } -} // namespace op -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu::op diff --git a/src/plugins/intel_gpu/src/plugin/transformations/op/fully_connected.cpp b/src/plugins/intel_gpu/src/plugin/transformations/op/fully_connected.cpp index 7ca02d35f664d0..412f48e56ba533 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/op/fully_connected.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/op/fully_connected.cpp @@ -5,9 +5,7 @@ #include "intel_gpu/op/fully_connected.hpp" #include "matmul_shape_inference.hpp" -namespace ov { -namespace intel_gpu { -namespace op { +namespace ov::intel_gpu::op { FullyConnected::FullyConnected(const ov::Output& A, const ov::Output& B, @@ -46,6 +44,4 @@ bool FullyConnected::visit_attributes(ov::AttributeVisitor &visitor) { return true; } -} // namespace op -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu::op diff --git a/src/plugins/intel_gpu/src/plugin/transformations/op/fully_connected_compressed.cpp b/src/plugins/intel_gpu/src/plugin/transformations/op/fully_connected_compressed.cpp index cd118f41624e62..bf4b53784dfb9a 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/op/fully_connected_compressed.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/op/fully_connected_compressed.cpp @@ -4,9 +4,7 @@ #include "intel_gpu/op/fully_connected_compressed.hpp" -namespace ov { -namespace intel_gpu { -namespace op { +namespace ov::intel_gpu::op { FullyConnectedCompressed::FullyConnectedCompressed(const ov::Output& A, const ov::Output& B, @@ -73,6 +71,4 @@ std::shared_ptr FullyConnectedCompressed::clone_with_new_inputs(const m_output_type); else OPENVINO_THROW("Unexpected inputs count for FullyConnectedCompressed op: ", new_args.size());} -} // namespace op -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu::op diff --git a/src/plugins/intel_gpu/src/plugin/transformations/op/gemm.cpp b/src/plugins/intel_gpu/src/plugin/transformations/op/gemm.cpp index fc6d2623aaf7d4..382e2a0525d2d6 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/op/gemm.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/op/gemm.cpp @@ -12,9 +12,7 @@ #include "openvino/op/broadcast.hpp" #include "openvino/op/reshape.hpp" -namespace ov { -namespace intel_gpu { -namespace op { +namespace ov::intel_gpu::op { Gemm::Gemm(const ov::Output& A, const ov::Output& B, @@ -113,6 +111,4 @@ std::vector shape_infer(const Gemm* op, } } -} // namespace op -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu::op diff --git a/src/plugins/intel_gpu/src/plugin/transformations/op/indirect_gemm.cpp b/src/plugins/intel_gpu/src/plugin/transformations/op/indirect_gemm.cpp index e530859f608fb5..8572c9c2418132 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/op/indirect_gemm.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/op/indirect_gemm.cpp @@ -5,9 +5,7 @@ #include "intel_gpu/op/indirect_gemm.hpp" #include "openvino/core/partial_shape.hpp" -namespace ov { -namespace intel_gpu { -namespace op { +namespace ov::intel_gpu::op { IndirectGemm::IndirectGemm(const ov::Output& A, const ov::Output& B, @@ -69,6 +67,4 @@ bool IndirectGemm::visit_attributes(ov::AttributeVisitor &visitor) { return true; } -} // namespace op -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu::op diff --git a/src/plugins/intel_gpu/src/plugin/transformations/op/indirect_sdpa.cpp b/src/plugins/intel_gpu/src/plugin/transformations/op/indirect_sdpa.cpp index 73e916064a0c1c..8d8180b5c10b1b 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/op/indirect_sdpa.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/op/indirect_sdpa.cpp @@ -5,9 +5,7 @@ #include "intel_gpu/op/indirect_sdpa.hpp" #include "openvino/core/partial_shape.hpp" -namespace ov { -namespace intel_gpu { -namespace op { +namespace ov::intel_gpu::op { IndirectSDPA::IndirectSDPA(const OutputVector& data_inputs, const ov::Output& beam_table, @@ -105,6 +103,4 @@ bool IndirectSDPA::visit_attributes(ov::AttributeVisitor &visitor) { return true; } -} // namespace op -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu::op diff --git a/src/plugins/intel_gpu/src/plugin/transformations/op/kv_cache.cpp b/src/plugins/intel_gpu/src/plugin/transformations/op/kv_cache.cpp index 6721d0f9ebd608..b30afb1dc03356 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/op/kv_cache.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/op/kv_cache.cpp @@ -10,9 +10,7 @@ #include "openvino/core/validation_util.hpp" #include "openvino/op/concat.hpp" -namespace ov { -namespace intel_gpu { -namespace op { +namespace ov::intel_gpu::op { KVCache::KVCache(const OutputVector& inputs, const std::shared_ptr& past_variable, @@ -207,6 +205,4 @@ std::vector shape_infer(const KVCacheCompressed* op, return out_shapes; } -} // namespace op -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu::op diff --git a/src/plugins/intel_gpu/src/plugin/transformations/op/placeholder.cpp b/src/plugins/intel_gpu/src/plugin/transformations/op/placeholder.cpp index fbb17e5ab11e39..b3c8f1707beda0 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/op/placeholder.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/op/placeholder.cpp @@ -6,9 +6,7 @@ #include "openvino/core/type/element_type.hpp" #include "transformations/rt_info/fused_names_attribute.hpp" -namespace ov { -namespace intel_gpu { -namespace op { +namespace ov::intel_gpu::op { Placeholder::Placeholder() : ov::op::Op() { validate_and_infer_types(); @@ -29,6 +27,4 @@ std::shared_ptr Placeholder::clone_with_new_inputs(const ov::OutputVector& return std::make_shared(); } -} // namespace op -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu::op diff --git a/src/plugins/intel_gpu/src/plugin/transformations/op/read_value.cpp b/src/plugins/intel_gpu/src/plugin/transformations/op/read_value.cpp index 6cd7f778c71b3b..9ec5f6d515fd2f 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/op/read_value.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/op/read_value.cpp @@ -6,9 +6,7 @@ #include "intel_gpu/op/read_values.hpp" #include "openvino/core/partial_shape.hpp" -namespace ov { -namespace intel_gpu { -namespace op { +namespace ov::intel_gpu::op { ReadValue::ReadValue(const std::shared_ptr& past_values) : Op() { m_variable = past_values; @@ -150,6 +148,4 @@ std::vector ReadValues::get_all_internal_states_info return m_internal_states_infos; } -} // namespace op -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu::op diff --git a/src/plugins/intel_gpu/src/plugin/transformations/op/sdpa.cpp b/src/plugins/intel_gpu/src/plugin/transformations/op/sdpa.cpp index 169d73fe03c929..487c5146dd3186 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/op/sdpa.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/op/sdpa.cpp @@ -10,9 +10,7 @@ #include "openvino/op/broadcast.hpp" #include "openvino/op/reshape.hpp" -namespace ov { -namespace intel_gpu { -namespace op { +namespace ov::intel_gpu::op { SDPA::SDPA(const OutputVector& inputs, const bool is_causal, @@ -172,6 +170,4 @@ std::vector shape_infer(const SDPA* op, } } -} // namespace op -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu::op diff --git a/src/plugins/intel_gpu/src/plugin/transformations/optimize_subsequent_reshapes.cpp b/src/plugins/intel_gpu/src/plugin/transformations/optimize_subsequent_reshapes.cpp index cac1e53761bc1c..6e162846523aee 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/optimize_subsequent_reshapes.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/optimize_subsequent_reshapes.cpp @@ -12,8 +12,7 @@ #include "openvino/pass/pattern/op/wrap_type.hpp" #include "transformations/utils/utils.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { OptimizeSubsequentReshapes::OptimizeSubsequentReshapes() { using namespace ov::pass::pattern; @@ -95,5 +94,4 @@ OptimizeSubsequentReshapes::OptimizeSubsequentReshapes() { this->register_matcher(m, callback); } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/optimize_subsequent_reshapes.hpp b/src/plugins/intel_gpu/src/plugin/transformations/optimize_subsequent_reshapes.hpp index 702b18e7fc5dc9..05b1a2bd4f3f11 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/optimize_subsequent_reshapes.hpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/optimize_subsequent_reshapes.hpp @@ -6,8 +6,7 @@ #include "openvino/pass/graph_rewrite.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { /** * @brief This pass looks for `Reshape [ dynamic dim, n static dims] -> Reshape [dynamic dim, n static dims]` patterns @@ -19,5 +18,4 @@ class OptimizeSubsequentReshapes : public ov::pass::MatcherPass { OptimizeSubsequentReshapes(); }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/print_model_statistics.cpp b/src/plugins/intel_gpu/src/plugin/transformations/print_model_statistics.cpp index 25d639b0f02530..1df6663ee13dd1 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/print_model_statistics.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/print_model_statistics.cpp @@ -8,8 +8,7 @@ #include "openvino/op/util/multi_subgraph_base.hpp" #include -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { namespace { size_t collect_stats(const std::shared_ptr& m, std::map& ops_stat) { const std::vector> ops = m->get_ops(); @@ -50,5 +49,4 @@ bool PrintModelStatistics::run_on_model(const std::shared_ptr& m) { return false; } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/print_model_statistics.hpp b/src/plugins/intel_gpu/src/plugin/transformations/print_model_statistics.hpp index 77922903c287bd..d670a0fb1b3f71 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/print_model_statistics.hpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/print_model_statistics.hpp @@ -6,8 +6,7 @@ #include "openvino/pass/pass.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { class PrintModelStatistics : public ov::pass::ModelPass { public: @@ -17,5 +16,4 @@ class PrintModelStatistics : public ov::pass::ModelPass { bool run_on_model(const std::shared_ptr& m) override; }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/transpose_fusion.cpp b/src/plugins/intel_gpu/src/plugin/transformations/transpose_fusion.cpp index 50486cbeb29cf3..e68077f3461511 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/transpose_fusion.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/transpose_fusion.cpp @@ -25,8 +25,7 @@ using namespace ov::pass::pattern; using ov::pass::pattern::op::Or; -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { namespace { @@ -348,5 +347,4 @@ TransposeMatMulTransposeMatcher::TransposeMatMulTransposeMatcher(bool supports_i this->register_matcher(m, callback); } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/transpose_fusion.hpp b/src/plugins/intel_gpu/src/plugin/transformations/transpose_fusion.hpp index bb180bc94ff6c1..87896283df56ad 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/transpose_fusion.hpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/transpose_fusion.hpp @@ -6,8 +6,7 @@ #include "openvino/pass/graph_rewrite.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { class TransposeFusion: public ov::pass::GraphRewrite { public: @@ -33,5 +32,4 @@ class TransposeSDPAMatcher : public ov::pass::MatcherPass { TransposeSDPAMatcher(); }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/unsqueeze_broadcast_reshape_matmul_fusion.cpp b/src/plugins/intel_gpu/src/plugin/transformations/unsqueeze_broadcast_reshape_matmul_fusion.cpp index f71ecc23e7fe04..7592b892b468b8 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/unsqueeze_broadcast_reshape_matmul_fusion.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/unsqueeze_broadcast_reshape_matmul_fusion.cpp @@ -16,8 +16,7 @@ #include "openvino/pass/pattern/op/or.hpp" #include "transformations/utils/utils.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { UnsqueezeBroadcastReshapeMatmulFusion::UnsqueezeBroadcastReshapeMatmulFusion() { using namespace ov::pass::pattern; @@ -86,5 +85,4 @@ UnsqueezeBroadcastReshapeMatmulFusion::UnsqueezeBroadcastReshapeMatmulFusion() { this->register_matcher(m, callback); } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/unsqueeze_broadcast_reshape_matmul_fusion.hpp b/src/plugins/intel_gpu/src/plugin/transformations/unsqueeze_broadcast_reshape_matmul_fusion.hpp index 3e5926561820b8..7b00621225ed6b 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/unsqueeze_broadcast_reshape_matmul_fusion.hpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/unsqueeze_broadcast_reshape_matmul_fusion.hpp @@ -6,8 +6,7 @@ #include "openvino/pass/graph_rewrite.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { class UnsqueezeBroadcastReshapeMatmulFusion : public ov::pass::MatcherPass { public: @@ -15,5 +14,4 @@ class UnsqueezeBroadcastReshapeMatmulFusion : public ov::pass::MatcherPass { UnsqueezeBroadcastReshapeMatmulFusion(); }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/unsqueeze_broadcast_reshape_sdpa_fusion.cpp b/src/plugins/intel_gpu/src/plugin/transformations/unsqueeze_broadcast_reshape_sdpa_fusion.cpp index b99a8e02fef85d..df7143ebbb2dbc 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/unsqueeze_broadcast_reshape_sdpa_fusion.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/unsqueeze_broadcast_reshape_sdpa_fusion.cpp @@ -16,8 +16,7 @@ #include "openvino/pass/pattern/op/or.hpp" #include "transformations/utils/utils.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { using ov::pass::pattern::op::Or; UnsqueezeBroadcastReshapeSDPAFusion::UnsqueezeBroadcastReshapeSDPAFusion() { @@ -125,5 +124,4 @@ UnsqueezeBroadcastReshapeSDPAFusion::UnsqueezeBroadcastReshapeSDPAFusion() { this->register_matcher(m, callback); } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/unsqueeze_broadcast_reshape_sdpa_fusion.hpp b/src/plugins/intel_gpu/src/plugin/transformations/unsqueeze_broadcast_reshape_sdpa_fusion.hpp index e740e846409ea9..4200c90dee0d7d 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/unsqueeze_broadcast_reshape_sdpa_fusion.hpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/unsqueeze_broadcast_reshape_sdpa_fusion.hpp @@ -6,8 +6,7 @@ #include "openvino/pass/graph_rewrite.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { class UnsqueezeBroadcastReshapeSDPAFusion : public ov::pass::MatcherPass { public: @@ -15,5 +14,4 @@ class UnsqueezeBroadcastReshapeSDPAFusion : public ov::pass::MatcherPass { UnsqueezeBroadcastReshapeSDPAFusion(); }; -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations/utils.hpp b/src/plugins/intel_gpu/src/plugin/transformations/utils.hpp index a3ff39fda3fe46..678a4c890f06a3 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/utils.hpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/utils.hpp @@ -6,8 +6,7 @@ #include "ov_ops/type_relaxed.hpp" -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { template std::shared_ptr make_type_relaxed(const element::TypeVector& input_data_types, @@ -16,5 +15,4 @@ std::shared_ptr make_type_relaxed(const element::TypeVector& input_data_types return std::make_shared>(std::forward(args)...); } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/transformations_pipeline.cpp b/src/plugins/intel_gpu/src/plugin/transformations_pipeline.cpp index a2bdac78fcb805..f036afc0cd59ad 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations_pipeline.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations_pipeline.cpp @@ -279,8 +279,7 @@ namespace cldnn { extern bool query_microkernels_supported(cldnn::engine& e, const cldnn::ExecutionConfig& config); } // namespace cldnn -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { void TransformationsPipeline::apply(std::shared_ptr func) { OV_ITT_SCOPED_TASK(itt::domains::intel_gpu_plugin, "TransformationsPipeline::apply"); @@ -1110,5 +1109,4 @@ void TransformationsPipeline::apply(std::shared_ptr func) { manager.run_passes(func); } } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/usm_host_tensor.cpp b/src/plugins/intel_gpu/src/plugin/usm_host_tensor.cpp index 865558579459da..50580537a8d2b4 100644 --- a/src/plugins/intel_gpu/src/plugin/usm_host_tensor.cpp +++ b/src/plugins/intel_gpu/src/plugin/usm_host_tensor.cpp @@ -7,8 +7,7 @@ #include "intel_gpu/plugin/remote_context.hpp" #include -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { USMHostTensor::USMHostTensor(std::shared_ptr context, const element::Type element_type, const Shape& shape) : m_impl(std::make_shared(context, shape, element_type, TensorType::BT_USM_HOST_INTERNAL)) {} @@ -45,5 +44,4 @@ std::shared_ptr USMHostTensor::get_impl() const { return m_impl; } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/plugin/variable_state.cpp b/src/plugins/intel_gpu/src/plugin/variable_state.cpp index 8f9c9ac59cf97d..d6558ab1cadf08 100644 --- a/src/plugins/intel_gpu/src/plugin/variable_state.cpp +++ b/src/plugins/intel_gpu/src/plugin/variable_state.cpp @@ -13,8 +13,7 @@ #include "intel_gpu/runtime/debug_configuration.hpp" #include -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { VariableState::VariableState(const VariableStateInfo& info, RemoteContextImpl::Ptr context, std::shared_ptr shape_predictor) : VariableStateBase{info.m_id, context} @@ -136,5 +135,4 @@ ov::SoPtr VariableState::get_state() const { return tensor; } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/runtime/execution_config.cpp b/src/plugins/intel_gpu/src/runtime/execution_config.cpp index 51fadb49c286e7..7d2a9d5f90fc8b 100644 --- a/src/plugins/intel_gpu/src/runtime/execution_config.cpp +++ b/src/plugins/intel_gpu/src/runtime/execution_config.cpp @@ -9,8 +9,7 @@ #include -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { ExecutionConfig::ExecutionConfig() { set_default(); @@ -306,5 +305,4 @@ std::string ExecutionConfig::to_string() const { return s.str(); } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/runtime/file_util.cpp b/src/plugins/intel_gpu/src/runtime/file_util.cpp index 37f9fb1d6d2ae7..e73397f1e51844 100644 --- a/src/plugins/intel_gpu/src/runtime/file_util.cpp +++ b/src/plugins/intel_gpu/src/runtime/file_util.cpp @@ -5,8 +5,7 @@ #include "intel_gpu/runtime/file_util.hpp" #include -namespace ov { -namespace intel_gpu { +namespace ov::intel_gpu { void save_binary(const std::string &path, std::vector binary) { try { @@ -14,5 +13,4 @@ void save_binary(const std::string &path, std::vector binary) { } catch (std::runtime_error&) {} } -} // namespace intel_gpu -} // namespace ov +} // namespace ov::intel_gpu diff --git a/src/plugins/intel_gpu/src/runtime/ocl/ocl_command_queues_builder.hpp b/src/plugins/intel_gpu/src/runtime/ocl/ocl_command_queues_builder.hpp index 1082056e7a374d..f231a49bf61b54 100644 --- a/src/plugins/intel_gpu/src/runtime/ocl/ocl_command_queues_builder.hpp +++ b/src/plugins/intel_gpu/src/runtime/ocl/ocl_command_queues_builder.hpp @@ -7,7 +7,6 @@ #include "ocl_common.hpp" #include "intel_gpu/runtime/engine.hpp" - namespace cldnn { namespace ocl { diff --git a/src/plugins/intel_gpu/src/runtime/ocl/ocl_event.hpp b/src/plugins/intel_gpu/src/runtime/ocl/ocl_event.hpp index dd487fceacb98b..d0172a4271d35c 100644 --- a/src/plugins/intel_gpu/src/runtime/ocl/ocl_event.hpp +++ b/src/plugins/intel_gpu/src/runtime/ocl/ocl_event.hpp @@ -7,7 +7,6 @@ #include "ocl_common.hpp" #include "ocl_base_event.hpp" - #include #include #include From 1086e2d5f8148e867e88014c5f3e90b58bdd7526 Mon Sep 17 00:00:00 2001 From: Vladimir Paramuzov Date: Thu, 23 Jan 2025 16:40:18 +0400 Subject: [PATCH 3/4] remove unit test for optional Signed-off-by: Vladimir Paramuzov --- .../unit/module_tests/optionals_test.cpp | 40 ------------------- 1 file changed, 40 deletions(-) delete mode 100644 src/plugins/intel_gpu/tests/unit/module_tests/optionals_test.cpp diff --git a/src/plugins/intel_gpu/tests/unit/module_tests/optionals_test.cpp b/src/plugins/intel_gpu/tests/unit/module_tests/optionals_test.cpp deleted file mode 100644 index fea85618b8a1bb..00000000000000 --- a/src/plugins/intel_gpu/tests/unit/module_tests/optionals_test.cpp +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (C) 2022 Intel Corporation -// SPDX-License-Identifier: Apache-2.0 -// - -#include "test_utils.h" -#include "intel_gpu/runtime/optionals.hpp" -#include - -using namespace cldnn; -using namespace ::tests; - -TEST(optional_data_types, empty) { - cldnn::optional_data_type o; - ASSERT_FALSE(o.has_value()); - ASSERT_ANY_THROW(o.value()); - ASSERT_EQ(o.value_or(data_types::u8), data_types::u8); -} - -TEST(optional_data_types, basic) { - cldnn::data_types dt = cldnn::data_types::f32; - cldnn::optional_data_type o = dt; - ASSERT_EQ(o.value(), cldnn::data_types::f32); - - cldnn::optional_data_type o1 = o; - ASSERT_EQ(o1.value(), cldnn::data_types::f32); - - cldnn::optional_data_type o2 = cldnn::data_types::f32; - ASSERT_EQ(o2.value(), cldnn::data_types::f32); - - { - cldnn::optional_data_type o2 = { cldnn::data_types::f32 }; - ASSERT_EQ(o2.value(), cldnn::data_types::f32); - } - - optional_data_type o3(cldnn::data_types::f16); - ASSERT_EQ(o3.value(), cldnn::data_types::f16); - - optional_data_type o4(cldnn::data_types::f32); - ASSERT_EQ(o4.value(), cldnn::data_types::f32); -} From 0ddf21cbe7ea98e05d3d1b94abe55e0b1a2d3a12 Mon Sep 17 00:00:00 2001 From: Vladimir Paramuzov Date: Fri, 24 Jan 2025 11:36:39 +0400 Subject: [PATCH 4/4] 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)