From a185299ba468454f7b121f214aaa6b0c203d12d0 Mon Sep 17 00:00:00 2001 From: Vladimir Paramuzov Date: Wed, 13 Jul 2022 15:47:40 +0400 Subject: [PATCH] [GPU] Simplify namespaces in the plugin part (#12121) --- .../include/intel_gpu/plugin/async_infer_request.hpp | 2 -- .../intel_gpu/include/intel_gpu/plugin/common_utils.hpp | 2 -- .../intel_gpu/include/intel_gpu/plugin/compiled_model.hpp | 2 -- .../intel_gpu/include/intel_gpu/plugin/custom_layer.hpp | 2 -- .../intel_gpu/include/intel_gpu/plugin/device_config.hpp | 2 -- src/plugins/intel_gpu/include/intel_gpu/plugin/graph.hpp | 2 -- .../intel_gpu/include/intel_gpu/plugin/infer_request.hpp | 2 -- src/plugins/intel_gpu/include/intel_gpu/plugin/itt.hpp | 2 -- src/plugins/intel_gpu/include/intel_gpu/plugin/plugin.hpp | 2 -- src/plugins/intel_gpu/include/intel_gpu/plugin/program.hpp | 2 -- .../intel_gpu/include/intel_gpu/plugin/remote_context.hpp | 2 -- .../include/intel_gpu/plugin/transformations_pipeline.hpp | 2 -- .../intel_gpu/include/intel_gpu/plugin/variable_state.hpp | 6 ++---- src/plugins/intel_gpu/src/graph/convolution.cpp | 2 +- src/plugins/intel_gpu/src/graph/deconvolution.cpp | 2 +- .../src/graph/graph_optimizer/prepare_padding.cpp | 2 +- .../intel_gpu/src/graph/include/sliding_window_utils.hpp | 2 -- src/plugins/intel_gpu/src/graph/pooling.cpp | 2 +- src/plugins/intel_gpu/src/graph/program.cpp | 2 +- src/plugins/intel_gpu/src/plugin/async_infer_request.cpp | 2 -- src/plugins/intel_gpu/src/plugin/compiled_model.cpp | 2 -- src/plugins/intel_gpu/src/plugin/custom_layer.cpp | 2 -- src/plugins/intel_gpu/src/plugin/device_config.cpp | 2 -- src/plugins/intel_gpu/src/plugin/graph.cpp | 2 -- src/plugins/intel_gpu/src/plugin/infer_request.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/adaptive_pooling.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/batch_to_space.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/broadcast.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/bucketize.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/concat.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/constant.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/convert.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/convert_color.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/convolution.cpp | 2 -- .../intel_gpu/src/plugin/ops/ctc_greedy_decoder.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/cum_sum.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/custom.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/depth_to_space.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/detection_output.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/dft.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/eltwise.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/embedding_bag.cpp | 2 -- .../plugin/ops/experimental_detectron_detection_output.cpp | 2 -- ...erimental_detectron_generate_proposals_single_image.cpp | 2 -- .../ops/experimental_detectron_prior_grid_generator.cpp | 2 -- .../ops/experimental_detectron_roi_feature_extractor.cpp | 2 -- .../src/plugin/ops/experimental_detectron_topk_rois.cpp | 6 ++---- .../intel_gpu/src/plugin/ops/extract_image_patches.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/fake_quantize.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/gather tree.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/gather.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/gather_elements.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/gather_nd.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/grn.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/interpolate.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/loop.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/lrn.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/matmul.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/mvn.cpp | 2 -- .../intel_gpu/src/plugin/ops/non_max_suppression.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/normalize_l2.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/one_hot.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/pad.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/parameter.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/pooling.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/prior_box.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/proposal.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/random_uniform.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/ops/range.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/reduce.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/region_yolo.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/reorg_yolo.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/reshape.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/result.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/reverse.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/reverse_sequence.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/rnn.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/roi_align.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/roi_pooling.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/roll.cpp | 2 -- .../intel_gpu/src/plugin/ops/scatter_elements_update.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/scatter_nd_update.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/scatter_update.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/select.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/shape_of.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/shuffle_channels.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/slice.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/softmax.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/space_to_batch.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/space_to_depth.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/split.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/strided_slice.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/tensor_iterator.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/tile.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/topk.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/transpose.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/unary.cpp | 2 -- src/plugins/intel_gpu/src/plugin/ops/variable.cpp | 6 ++---- src/plugins/intel_gpu/src/plugin/plugin.cpp | 4 +--- src/plugins/intel_gpu/src/plugin/program.cpp | 2 -- src/plugins/intel_gpu/src/plugin/remote_context.cpp | 2 -- .../src/plugin/transformations/einsum_decomposition.cpp | 2 -- .../src/plugin/transformations/einsum_decomposition.hpp | 2 -- .../intel_gpu/src/plugin/transformations_pipeline.cpp | 2 -- src/plugins/intel_gpu/src/plugin/variable_state.cpp | 7 ++----- 105 files changed, 18 insertions(+), 219 deletions(-) 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 399e20cc42d..12eed2b00c6 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 @@ -10,7 +10,6 @@ #include "intel_gpu/plugin/infer_request.hpp" namespace ov { -namespace runtime { namespace intel_gpu { class AsyncInferRequest : public InferenceEngine::AsyncInferRequestThreadSafeDefault { @@ -32,5 +31,4 @@ private: }; } // namespace intel_gpu -} // namespace runtime } // namespace ov 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 f700a63e2d8..ccb2cb84f98 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 @@ -11,7 +11,6 @@ #include "ngraph/type/element_type.hpp" namespace ov { -namespace runtime { namespace intel_gpu { #define TensorValue(val) static_cast(val) @@ -206,5 +205,4 @@ inline InferenceEngine::Layout InferenceEngineLayoutFromOVLayout(ov::Layout l) { } } // namespace intel_gpu -} // namespace runtime } // namespace ov 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 c4eae9ed09a..bd3e0c8b403 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 @@ -18,7 +18,6 @@ #include "intel_gpu/plugin/remote_context.hpp" namespace ov { -namespace runtime { namespace intel_gpu { class CompiledModel : public InferenceEngine::ExecutableNetworkThreadSafeDefault { @@ -46,5 +45,4 @@ public: }; } // namespace intel_gpu -} // namespace runtime } // namespace ov 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 537373c74d8..fde28a7e737 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 @@ -13,7 +13,6 @@ #include "intel_gpu/runtime/tensor.hpp" namespace ov { -namespace runtime { namespace intel_gpu { using CustomLayerPtr = std::shared_ptr; @@ -85,5 +84,4 @@ protected: }; } // namespace intel_gpu -} // namespace runtime } // namespace ov diff --git a/src/plugins/intel_gpu/include/intel_gpu/plugin/device_config.hpp b/src/plugins/intel_gpu/include/intel_gpu/plugin/device_config.hpp index 973dc04597c..a4975dd9312 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/plugin/device_config.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/plugin/device_config.hpp @@ -15,7 +15,6 @@ #include namespace ov { -namespace runtime { namespace intel_gpu { @@ -109,5 +108,4 @@ private: }; } // namespace intel_gpu -} // namespace runtime } // namespace ov 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 0e7fc62789b..7cffefba8eb 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/plugin/graph.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/plugin/graph.hpp @@ -28,7 +28,6 @@ #include "intel_gpu/plugin/program.hpp" namespace ov { -namespace runtime { namespace intel_gpu { class Graph { @@ -112,5 +111,4 @@ protected: }; } // namespace intel_gpu -} // namespace runtime } // namespace ov diff --git a/src/plugins/intel_gpu/include/intel_gpu/plugin/infer_request.hpp b/src/plugins/intel_gpu/include/intel_gpu/plugin/infer_request.hpp index d21679cdb52..bf8af0e212f 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/plugin/infer_request.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/plugin/infer_request.hpp @@ -13,7 +13,6 @@ #include namespace ov { -namespace runtime { namespace intel_gpu { struct buf_info { @@ -111,5 +110,4 @@ private: }; } // namespace intel_gpu -} // namespace runtime } // namespace ov diff --git a/src/plugins/intel_gpu/include/intel_gpu/plugin/itt.hpp b/src/plugins/intel_gpu/include/intel_gpu/plugin/itt.hpp index fbd65739003..524e689dd25 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/plugin/itt.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/plugin/itt.hpp @@ -12,7 +12,6 @@ #include namespace ov { -namespace runtime { namespace intel_gpu { namespace itt { namespace domains { @@ -20,5 +19,4 @@ namespace domains { } // namespace domains } // namespace itt } // namespace intel_gpu -} // namespace runtime } // namespace ov 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 93f68e74e86..89bb2a599c8 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/plugin/plugin.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/plugin/plugin.hpp @@ -13,7 +13,6 @@ #include "intel_gpu/plugin/remote_context.hpp" namespace ov { -namespace runtime { namespace intel_gpu { using CustomLayerPtr = std::shared_ptr; @@ -90,5 +89,4 @@ public: }; } // namespace intel_gpu -} // namespace runtime } // namespace ov diff --git a/src/plugins/intel_gpu/include/intel_gpu/plugin/program.hpp b/src/plugins/intel_gpu/include/intel_gpu/plugin/program.hpp index 42f2c14c57d..28f3ae141f5 100644 --- a/src/plugins/intel_gpu/include/intel_gpu/plugin/program.hpp +++ b/src/plugins/intel_gpu/include/intel_gpu/plugin/program.hpp @@ -42,7 +42,6 @@ void __register ## _ ## op_name ## _ ## op_version() { } namespace ov { -namespace runtime { namespace intel_gpu { std::string layer_type_lower(const ngraph::Node* op); @@ -194,5 +193,4 @@ void CreateElementwiseOp(Program& p, const std::shared_ptr& node, bool IsNodeOnConstPath(const std::shared_ptr& node); } // namespace intel_gpu -} // namespace runtime } // namespace ov 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 23c182eed1d..c99275cf9de 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 @@ -30,7 +30,6 @@ #include namespace ov { -namespace runtime { namespace intel_gpu { class RemoteAllocator; @@ -583,5 +582,4 @@ inline ExecutionContextImpl* getContextImpl(InferenceEngine::gpu::ClContext::Ptr } } // namespace intel_gpu -} // namespace runtime } // namespace ov 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 8eddeb6f895..7c10b444419 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 @@ -11,7 +11,6 @@ #include "intel_gpu/plugin/device_config.hpp" namespace ov { -namespace runtime { namespace intel_gpu { class TransformationsPipeline { @@ -26,5 +25,4 @@ private: }; } // namespace intel_gpu -} // namespace runtime } // namespace ov 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 05c4b9e6215..e259aed2cca 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 @@ -8,7 +8,6 @@ #include namespace ov { -namespace runtime { namespace intel_gpu { class VariableState : public InferenceEngine::IVariableStateInternal { @@ -45,6 +44,5 @@ private: std::shared_ptr engine_; }; -} // namespace intel_gpu -} // namespace runtime -} // namespace ov +} // namespace intel_gpu +} // namespace ov diff --git a/src/plugins/intel_gpu/src/graph/convolution.cpp b/src/plugins/intel_gpu/src/graph/convolution.cpp index 8684bb9287e..9ecc0002fe8 100644 --- a/src/plugins/intel_gpu/src/graph/convolution.cpp +++ b/src/plugins/intel_gpu/src/graph/convolution.cpp @@ -11,7 +11,7 @@ #include "json_object.h" #include -using namespace ov::runtime::intel_gpu; +using namespace ov::intel_gpu; namespace cldnn { primitive_type_id convolution::type_id() { diff --git a/src/plugins/intel_gpu/src/graph/deconvolution.cpp b/src/plugins/intel_gpu/src/graph/deconvolution.cpp index 1fd271e64a6..3b15850190a 100644 --- a/src/plugins/intel_gpu/src/graph/deconvolution.cpp +++ b/src/plugins/intel_gpu/src/graph/deconvolution.cpp @@ -10,7 +10,7 @@ #include "json_object.h" #include -using namespace ov::runtime::intel_gpu; +using namespace ov::intel_gpu; namespace cldnn { primitive_type_id deconvolution::type_id() { diff --git a/src/plugins/intel_gpu/src/graph/graph_optimizer/prepare_padding.cpp b/src/plugins/intel_gpu/src/graph/graph_optimizer/prepare_padding.cpp index ace966ed976..ea078e9f56c 100644 --- a/src/plugins/intel_gpu/src/graph/graph_optimizer/prepare_padding.cpp +++ b/src/plugins/intel_gpu/src/graph/graph_optimizer/prepare_padding.cpp @@ -12,7 +12,7 @@ #include using namespace cldnn; -using namespace ov::runtime::intel_gpu; +using namespace ov::intel_gpu; void prepare_padding::run(program& p) { if (output_size_handling_enabled) { 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 b4fd03e4192..0ac52d35fdf 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 @@ -17,7 +17,6 @@ #include namespace ov { -namespace runtime { namespace intel_gpu { using cldnn::tensor; @@ -443,5 +442,4 @@ inline padding calc_sliding_window_needed_input_padding(const layout& actual_inp } } // namespace intel_gpu -} // namespace runtime } // namespace ov diff --git a/src/plugins/intel_gpu/src/graph/pooling.cpp b/src/plugins/intel_gpu/src/graph/pooling.cpp index fff0c7421ce..1773a28fc8c 100644 --- a/src/plugins/intel_gpu/src/graph/pooling.cpp +++ b/src/plugins/intel_gpu/src/graph/pooling.cpp @@ -9,7 +9,7 @@ #include "json_object.h" #include -using namespace ov::runtime::intel_gpu; +using namespace ov::intel_gpu; namespace cldnn { primitive_type_id pooling::type_id() { diff --git a/src/plugins/intel_gpu/src/graph/program.cpp b/src/plugins/intel_gpu/src/graph/program.cpp index 0de57f012ea..0b046dbaab9 100644 --- a/src/plugins/intel_gpu/src/graph/program.cpp +++ b/src/plugins/intel_gpu/src/graph/program.cpp @@ -90,7 +90,7 @@ #include #endif -using namespace ov::runtime::intel_gpu; +using namespace ov::intel_gpu; program::program(engine& engine_ref, topology const& topology, 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 e275355ea5c..a5e73a5dabf 100644 --- a/src/plugins/intel_gpu/src/plugin/async_infer_request.cpp +++ b/src/plugins/intel_gpu/src/plugin/async_infer_request.cpp @@ -7,7 +7,6 @@ #include namespace ov { -namespace runtime { namespace intel_gpu { AsyncInferRequest::AsyncInferRequest(const InferRequest::Ptr &inferRequest, @@ -58,5 +57,4 @@ AsyncInferRequest::~AsyncInferRequest() { } } // namespace intel_gpu -} // namespace runtime } // namespace ov diff --git a/src/plugins/intel_gpu/src/plugin/compiled_model.cpp b/src/plugins/intel_gpu/src/plugin/compiled_model.cpp index 552f54d5104..b488abdb562 100644 --- a/src/plugins/intel_gpu/src/plugin/compiled_model.cpp +++ b/src/plugins/intel_gpu/src/plugin/compiled_model.cpp @@ -30,7 +30,6 @@ using namespace InferenceEngine; using namespace InferenceEngine::details; namespace ov { -namespace runtime { namespace intel_gpu { CompiledModel::CompiledModel(InferenceEngine::CNNNetwork &network, std::shared_ptr context, Config config) : @@ -237,5 +236,4 @@ std::shared_ptr CompiledModel::GetContext() cons } } // namespace intel_gpu -} // namespace runtime } // namespace ov diff --git a/src/plugins/intel_gpu/src/plugin/custom_layer.cpp b/src/plugins/intel_gpu/src/plugin/custom_layer.cpp index f139fa79d9e..6db3b41a0ba 100644 --- a/src/plugins/intel_gpu/src/plugin/custom_layer.cpp +++ b/src/plugins/intel_gpu/src/plugin/custom_layer.cpp @@ -30,7 +30,6 @@ using namespace XMLParseUtils; CheckAndReturnError(GetIntAttr(node, attr, -1) != (value), "Wrong attribute value! expected: " << value << " found: " << GetIntAttr(node, attr, -1)) namespace ov { -namespace runtime { namespace intel_gpu { void CustomLayer::LoadSingleLayer(const pugi::xml_node & node) { @@ -281,5 +280,4 @@ void CustomLayer::LoadFromFile(const std::string configFile, CustomLayerMap& cus } } // namespace intel_gpu -} // namespace runtime } // namespace ov diff --git a/src/plugins/intel_gpu/src/plugin/device_config.cpp b/src/plugins/intel_gpu/src/plugin/device_config.cpp index e8160011d12..ea058999131 100644 --- a/src/plugins/intel_gpu/src/plugin/device_config.cpp +++ b/src/plugins/intel_gpu/src/plugin/device_config.cpp @@ -30,7 +30,6 @@ using namespace InferenceEngine; namespace ov { -namespace runtime { namespace intel_gpu { static void createDirectory(std::string _path) { @@ -570,5 +569,4 @@ Config& Configs::GetDefaultDeviceConfig() { IE_SUPPRESS_DEPRECATED_END } // namespace intel_gpu -} // namespace runtime } // namespace ov diff --git a/src/plugins/intel_gpu/src/plugin/graph.cpp b/src/plugins/intel_gpu/src/plugin/graph.cpp index 8d563206a01..2ca173d9d58 100644 --- a/src/plugins/intel_gpu/src/plugin/graph.cpp +++ b/src/plugins/intel_gpu/src/plugin/graph.cpp @@ -39,7 +39,6 @@ using namespace InferenceEngine; using namespace InferenceEngine::details; namespace ov { -namespace runtime { namespace intel_gpu { Graph::Graph(InferenceEngine::CNNNetwork& network, gpu::ClContext::Ptr context, Config config, uint16_t stream_id) @@ -783,5 +782,4 @@ InferenceEngine::SizeVector Graph::GetOutputSize(std::string outName) const { } } // namespace intel_gpu -} // namespace runtime } // namespace ov diff --git a/src/plugins/intel_gpu/src/plugin/infer_request.cpp b/src/plugins/intel_gpu/src/plugin/infer_request.cpp index 9c6e3d687cc..e42cce7b53a 100644 --- a/src/plugins/intel_gpu/src/plugin/infer_request.cpp +++ b/src/plugins/intel_gpu/src/plugin/infer_request.cpp @@ -49,7 +49,7 @@ void convertAndCopy(const InferenceEngine::Blob* src, dst_t* dst) { } template -void copyResultToOutputBlob(cldnn::memory::ptr src, Blob::Ptr dst, ov::runtime::intel_gpu::buf_info* bi, cldnn::stream& stream) { +void copyResultToOutputBlob(cldnn::memory::ptr src, Blob::Ptr dst, ov::intel_gpu::buf_info* bi, cldnn::stream& stream) { size_t n = (bi == nullptr) ? dst->size() : bi->buf_size; size_t offset = (bi == nullptr) ? 0 : bi->buf_offset; @@ -91,7 +91,7 @@ inline void checkAlloc(const Blob::Ptr& blob, const std::string& err_str) { if (!blob->is()) { not_allocated = (blob->buffer() == nullptr); } else { - not_allocated = !ov::runtime::intel_gpu::getBlobImpl(blob->as())->is_allocated(); + not_allocated = !ov::intel_gpu::getBlobImpl(blob->as())->is_allocated(); } if (not_allocated) { IE_THROW(NotAllocated) << err_str; @@ -175,7 +175,6 @@ bool same_host_mem(cldnn::memory::ptr memPtr, uint8_t* hostPtr) { } // namespace namespace ov { -namespace runtime { namespace intel_gpu { // ----------------------------------------------------------------------------------------- // @@ -1277,5 +1276,4 @@ std::vector> InferReque } } // namespace intel_gpu -} // namespace runtime } // namespace ov 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 f47553d722a..1741b52971e 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/adaptive_pooling.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/adaptive_pooling.cpp @@ -11,7 +11,6 @@ #include "intel_gpu/primitives/adaptive_pooling.hpp" namespace ov { -namespace runtime { namespace intel_gpu { static void CreateAdaptiveAvgPoolOp(Program& p, const std::shared_ptr& op) { @@ -74,5 +73,4 @@ REGISTER_FACTORY_IMPL(v8, AdaptiveAvgPool); REGISTER_FACTORY_IMPL(v8, AdaptiveMaxPool); } // namespace intel_gpu -} // namespace runtime } // namespace ov diff --git a/src/plugins/intel_gpu/src/plugin/ops/batch_to_space.cpp b/src/plugins/intel_gpu/src/plugin/ops/batch_to_space.cpp index 37776c156a9..6cd678e7e78 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/batch_to_space.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/batch_to_space.cpp @@ -11,7 +11,6 @@ #include "intel_gpu/primitives/batch_to_space.hpp" namespace ov { -namespace runtime { namespace intel_gpu { static void CreateBatchToSpaceOp(Program& p, const std::shared_ptr& op) { @@ -54,5 +53,4 @@ static void CreateBatchToSpaceOp(Program& p, const std::shared_ptr& op, const ngraph::AxisSet axis_mapping) { @@ -122,5 +121,4 @@ REGISTER_FACTORY_IMPL(v1, Broadcast); REGISTER_FACTORY_IMPL(v3, Broadcast); } // namespace intel_gpu -} // namespace runtime } // namespace ov diff --git a/src/plugins/intel_gpu/src/plugin/ops/bucketize.cpp b/src/plugins/intel_gpu/src/plugin/ops/bucketize.cpp index 38af94f8a69..a6e3180561d 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/bucketize.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/bucketize.cpp @@ -10,7 +10,6 @@ #include "intel_gpu/plugin/program.hpp" namespace ov { -namespace runtime { namespace intel_gpu { namespace { @@ -32,5 +31,4 @@ void CreateBucketizeOp(Program& p, const std::shared_ptr& op) { @@ -34,5 +33,4 @@ static void CreateConcatOp(Program& p, const std::shared_ptr& op) { @@ -55,5 +54,4 @@ REGISTER_FACTORY_IMPL(v0, Convert); REGISTER_FACTORY_IMPL(v1, ConvertLike); } // namespace intel_gpu -} // namespace runtime } // namespace ov diff --git a/src/plugins/intel_gpu/src/plugin/ops/convert_color.cpp b/src/plugins/intel_gpu/src/plugin/ops/convert_color.cpp index 30fd9678097..922a8bbaec3 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/convert_color.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/convert_color.cpp @@ -10,7 +10,6 @@ #include "openvino/core/preprocess/input_tensor_info.hpp" namespace ov { -namespace runtime { namespace intel_gpu { static void CreateCommonConvertColorOp(Program& p, const std::shared_ptr& op, @@ -90,5 +89,4 @@ REGISTER_FACTORY_IMPL(v8, I420toRGB); REGISTER_FACTORY_IMPL(v8, I420toBGR); } // namespace intel_gpu -} // namespace runtime } // namespace ov diff --git a/src/plugins/intel_gpu/src/plugin/ops/convolution.cpp b/src/plugins/intel_gpu/src/plugin/ops/convolution.cpp index 0a0ce79ce86..591825ecb4e 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/convolution.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/convolution.cpp @@ -20,7 +20,6 @@ #include "intel_gpu/primitives/reorder.hpp" namespace ov { -namespace runtime { namespace intel_gpu { static void CreateGroupConvolutionOp(Program& p, const std::shared_ptr& op) { @@ -380,5 +379,4 @@ REGISTER_FACTORY_IMPL(v8, DeformableConvolution); REGISTER_FACTORY_IMPL(v1, BinaryConvolution); } // namespace intel_gpu -} // namespace runtime } // namespace ov 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 787fb7504ea..98dc05eea8e 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 @@ -16,7 +16,6 @@ #include "transformations/utils/utils.hpp" namespace ov { -namespace runtime { namespace intel_gpu { static void CreateCommonCTCGreedyDecoderOp(Program& p, const std::shared_ptr& op, bool ctc_merge_repeated) { @@ -134,5 +133,4 @@ REGISTER_FACTORY_IMPL(v0, CTCGreedyDecoder); REGISTER_FACTORY_IMPL(v6, CTCGreedyDecoderSeqLen); } // namespace intel_gpu -} // namespace runtime } // namespace ov diff --git a/src/plugins/intel_gpu/src/plugin/ops/cum_sum.cpp b/src/plugins/intel_gpu/src/plugin/ops/cum_sum.cpp index 78f1bcc64f5..b847914cf1c 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/cum_sum.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/cum_sum.cpp @@ -11,7 +11,6 @@ #include "intel_gpu/primitives/cum_sum.hpp" namespace ov { -namespace runtime { namespace intel_gpu { static inline cldnn::cum_sum::cum_sum_axis GetCumSumAxis(int32_t axis, uint32_t rank) { @@ -75,5 +74,4 @@ static void CreateCumSumOp(Program& p, const std::shared_ptr @@ -258,5 +257,4 @@ void CreateCustomOp(Program& p, const std::shared_ptr& op, CustomL } } // namespace intel_gpu -} // namespace runtime } // namespace ov 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 ccb90b05ef2..ba329ce4bfa 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 @@ -10,7 +10,6 @@ #include "intel_gpu/primitives/depth_to_space.hpp" namespace ov { -namespace runtime { namespace intel_gpu { static cldnn::depth_to_space_mode GetDepthMode(ngraph::op::v0::DepthToSpace::DepthToSpaceMode mode) { @@ -45,5 +44,4 @@ static void CreateDepthToSpaceOp(Program& p, const std::shared_ptr namespace ov { -namespace runtime { namespace intel_gpu { namespace { @@ -50,5 +49,4 @@ REGISTER_FACTORY_IMPL(v7, DFT); REGISTER_FACTORY_IMPL(v7, IDFT); } // namespace intel_gpu -} // namespace runtime } // namespace ov diff --git a/src/plugins/intel_gpu/src/plugin/ops/eltwise.cpp b/src/plugins/intel_gpu/src/plugin/ops/eltwise.cpp index ddebd8e4038..49124738513 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/eltwise.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/eltwise.cpp @@ -31,7 +31,6 @@ #include "intel_gpu/primitives/reshape.hpp" namespace ov { -namespace runtime { namespace intel_gpu { void CreateElementwiseOp(Program& p, const std::shared_ptr& op, cldnn::eltwise_mode mode) { @@ -197,5 +196,4 @@ REGISTER_FACTORY_IMPL(v1, FloorMod); REGISTER_FACTORY_IMPL(v1, Mod); } // namespace intel_gpu -} // namespace runtime } // namespace ov 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 4706da8a808..87b6faa2498 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/embedding_bag.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/embedding_bag.cpp @@ -15,7 +15,6 @@ #include "transformations/utils/utils.hpp" namespace ov { -namespace runtime { namespace intel_gpu { static void CreateEmbeddingBagOffsetsSumOp(Program& p, const std::shared_ptr& op) { @@ -179,5 +178,4 @@ REGISTER_FACTORY_IMPL(v3, EmbeddingBagPackedSum); REGISTER_FACTORY_IMPL(v3, EmbeddingSegmentsSum); } // namespace intel_gpu -} // namespace runtime } // namespace ov 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 c3636564580..0735169ae14 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 @@ -10,7 +10,6 @@ #include "intel_gpu/primitives/mutable_data.hpp" namespace ov { -namespace runtime { namespace intel_gpu { static void CreateExperimentalDetectronDetectionOutputOp( @@ -97,5 +96,4 @@ static void CreateExperimentalDetectronDetectionOutputOp( REGISTER_FACTORY_IMPL(v6, ExperimentalDetectronDetectionOutput); } // namespace intel_gpu -} // namespace runtime } // namespace ov 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 ef081fb3806..b1e7a9e369f 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 @@ -11,7 +11,6 @@ #include "intel_gpu/primitives/experimental_detectron_generate_proposals_single_image.hpp" namespace ov { -namespace runtime { namespace intel_gpu { static void CreateExperimentalDetectronGenerateProposalsSingleImageOp( @@ -62,5 +61,4 @@ static void CreateExperimentalDetectronGenerateProposalsSingleImageOp( REGISTER_FACTORY_IMPL(v6, ExperimentalDetectronGenerateProposalsSingleImage); } // namespace intel_gpu -} // namespace runtime } // namespace ov 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 d82d22829a5..c2fb6b1193b 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 @@ -8,7 +8,6 @@ #include namespace ov { -namespace runtime { namespace intel_gpu { namespace { cldnn::tensor mkTensor(const ov::Shape& shape) { @@ -50,5 +49,4 @@ static void CreateExperimentalDetectronPriorGridGeneratorOp( REGISTER_FACTORY_IMPL(v6, ExperimentalDetectronPriorGridGenerator); } // namespace intel_gpu -} // namespace runtime } // namespace ov 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 8ed016e6811..cdd3c69a468 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 @@ -11,7 +11,6 @@ #include "intel_gpu/primitives/experimental_detectron_roi_feature_extractor.hpp" namespace ov { -namespace runtime { namespace intel_gpu { static void CreateExperimentalDetectronROIFeatureExtractorOp(Program& p, const std::shared_ptr& op) { @@ -57,5 +56,4 @@ static void CreateExperimentalDetectronROIFeatureExtractorOp(Program& p, const s REGISTER_FACTORY_IMPL(v6, ExperimentalDetectronROIFeatureExtractor); } // namespace intel_gpu -} // namespace runtime } // namespace ov 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 8631d911430..d20b868aa8b 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 @@ -11,7 +11,6 @@ #include "intel_gpu/primitives/arg_max_min.hpp" namespace ov { -namespace runtime { namespace intel_gpu { namespace { @@ -45,6 +44,5 @@ void CreateExperimentalDetectronTopKROIsOp(Program &p, REGISTER_FACTORY_IMPL(v6, ExperimentalDetectronTopKROIs); -} // namespace intel_gpu -} // namespace runtime -} // namespace ov +} // namespace intel_gpu +} // namespace ov 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 c0a2029bfec..35cc7e2f002 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 @@ -10,7 +10,6 @@ #include "intel_gpu/primitives/extract_image_patches.hpp" namespace ov { -namespace runtime { namespace intel_gpu { static inline std::string PadToString(ngraph::op::PadType pad) { @@ -50,5 +49,4 @@ static void CreateExtractImagePatchesOp(Program& p, const std::shared_ptr& op) { @@ -43,5 +42,4 @@ static void CreateFakeQuantizeOp(Program& p, const std::shared_ptr& op) { @@ -58,5 +57,4 @@ static void CreateGatherTreeOp(Program& p, const std::shared_ptr @@ -81,5 +80,4 @@ static void CreateGatherOp(Program& p, const std::shared_ptr& op) { @@ -65,5 +64,4 @@ static void CreateGatherNDOp(Program& p, const std::shared_ptr& op) { @@ -31,5 +30,4 @@ static void CreateGRNOp(Program& p, const std::shared_ptr& REGISTER_FACTORY_IMPL(v0, GRN); } // namespace intel_gpu -} // namespace runtime } // namespace ov diff --git a/src/plugins/intel_gpu/src/plugin/ops/interpolate.cpp b/src/plugins/intel_gpu/src/plugin/ops/interpolate.cpp index f80497c2809..d818960a744 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/interpolate.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/interpolate.cpp @@ -12,7 +12,6 @@ #include "intel_gpu/primitives/resample.hpp" namespace ov { -namespace runtime { namespace intel_gpu { static cldnn::coordinate_transformation_mode GetCoordinateTransformationMode(ngraph::op::v4::Interpolate::CoordinateTransformMode mode) { @@ -205,5 +204,4 @@ static void CreateInterpolateOp(Program& p, const std::shared_ptr @@ -227,5 +226,4 @@ static void CreateLoopOp(Program& p, const std::shared_ptr& op) { REGISTER_FACTORY_IMPL(v5, Loop); } // namespace intel_gpu -} // namespace runtime } // namespace ov diff --git a/src/plugins/intel_gpu/src/plugin/ops/lrn.cpp b/src/plugins/intel_gpu/src/plugin/ops/lrn.cpp index a90a901d175..7697b3a5666 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/lrn.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/lrn.cpp @@ -11,7 +11,6 @@ #include "intel_gpu/primitives/lrn.hpp" namespace ov { -namespace runtime { namespace intel_gpu { static cldnn::lrn_norm_region GetNormRegion(std::vector axis_value) { @@ -50,5 +49,4 @@ static void CreateLRNOp(Program& p, const std::shared_ptr& REGISTER_FACTORY_IMPL(v0, LRN); } // namespace intel_gpu -} // namespace runtime } // namespace ov diff --git a/src/plugins/intel_gpu/src/plugin/ops/matmul.cpp b/src/plugins/intel_gpu/src/plugin/ops/matmul.cpp index e41cb55b2a9..b4478a6363a 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/matmul.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/matmul.cpp @@ -16,7 +16,6 @@ #include "intel_gpu/primitives/permute.hpp" namespace ov { -namespace runtime { namespace intel_gpu { /* @@ -312,5 +311,4 @@ static void CreateMatMulOp(Program& p, const std::shared_ptr namespace ov { -namespace runtime { namespace intel_gpu { static void CreateCommonMVNOp(Program& p, const std::shared_ptr& op, @@ -68,5 +67,4 @@ REGISTER_FACTORY_IMPL(v0, MVN); REGISTER_FACTORY_IMPL(v6, MVN); } // namespace intel_gpu -} // namespace runtime } // namespace ov diff --git a/src/plugins/intel_gpu/src/plugin/ops/non_max_suppression.cpp b/src/plugins/intel_gpu/src/plugin/ops/non_max_suppression.cpp index f7ed6334d01..73b8a39aa16 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/non_max_suppression.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/non_max_suppression.cpp @@ -15,7 +15,6 @@ #include "intel_gpu/runtime/debug_configuration.hpp" namespace ov { -namespace runtime { namespace intel_gpu { static bool GetCenterPointBox(ngraph::op::v5::NonMaxSuppression::BoxEncodingType encoding) { @@ -178,5 +177,4 @@ static void CreateNonMaxSuppressionIEInternalOp(Program& p, const std::shared_pt REGISTER_FACTORY_IMPL(internal, NonMaxSuppressionIEInternal); } // namespace intel_gpu -} // namespace runtime } // namespace ov 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 f1df88545b2..06793884e66 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/normalize_l2.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/normalize_l2.cpp @@ -12,7 +12,6 @@ #include "intel_gpu/primitives/data.hpp" namespace ov { -namespace runtime { namespace intel_gpu { static void CreateNormalizeL2Op(Program& p, const std::shared_ptr& op) { @@ -64,5 +63,4 @@ static void CreateNormalizeL2Op(Program& p, const std::shared_ptr& op) { @@ -75,5 +74,4 @@ static void CreateOneHotOp(Program& p, const std::shared_ptr& REGISTER_FACTORY_IMPL(v1, Pad); } // namespace intel_gpu -} // namespace runtime } // namespace ov diff --git a/src/plugins/intel_gpu/src/plugin/ops/parameter.cpp b/src/plugins/intel_gpu/src/plugin/ops/parameter.cpp index d5820fea9c0..47bf4390086 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/parameter.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/parameter.cpp @@ -17,7 +17,6 @@ using namespace InferenceEngine; namespace ov { -namespace runtime { namespace intel_gpu { static void CreateParameterOp(Program& p, const std::shared_ptr& op) { @@ -338,5 +337,4 @@ static void CreateParameterOp(Program& p, const std::shared_ptr& op) { @@ -144,5 +143,4 @@ REGISTER_FACTORY_IMPL(v8, MaxPool); REGISTER_FACTORY_IMPL(v1, AvgPool); } // namespace intel_gpu -} // namespace runtime } // namespace ov 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 a0da0b748b1..16e857952fb 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/prior_box.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/prior_box.cpp @@ -11,7 +11,6 @@ #include "intel_gpu/primitives/prior_box.hpp" namespace ov { -namespace runtime { namespace intel_gpu { static void CreatePriorBoxClusteredOp(Program& p, const std::shared_ptr& op) { @@ -117,5 +116,4 @@ REGISTER_FACTORY_IMPL(v0, PriorBoxClustered); REGISTER_FACTORY_IMPL(v0, PriorBox); } // namespace intel_gpu -} // namespace runtime } // namespace ov diff --git a/src/plugins/intel_gpu/src/plugin/ops/proposal.cpp b/src/plugins/intel_gpu/src/plugin/ops/proposal.cpp index 99ee9242b42..328dd64a334 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/proposal.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/proposal.cpp @@ -12,7 +12,6 @@ #include "intel_gpu/runtime/debug_configuration.hpp" namespace ov { -namespace runtime { namespace intel_gpu { static void CreateProposalOp(Program& p, const std::shared_ptr& op) { @@ -156,5 +155,4 @@ REGISTER_FACTORY_IMPL(v0, Proposal); REGISTER_FACTORY_IMPL(v4, Proposal); } // namespace intel_gpu -} // namespace runtime } // namespace ov diff --git a/src/plugins/intel_gpu/src/plugin/ops/random_uniform.cpp b/src/plugins/intel_gpu/src/plugin/ops/random_uniform.cpp index ec37f4a42da..51e1cfb228d 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/random_uniform.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/random_uniform.cpp @@ -9,7 +9,6 @@ namespace ov { -namespace runtime { namespace intel_gpu { namespace { @@ -34,6 +33,5 @@ void CreateRandomUniformOp(Program &p, const std::shared_ptr namespace ov { -namespace runtime { namespace intel_gpu { static void CreateRangeOp(Program &p, const std::shared_ptr &op) { @@ -31,5 +30,4 @@ static void CreateRangeOp(Program &p, const std::shared_ptr& op, cldnn::reduce_mode mode, bool keep_dims) { @@ -176,5 +175,4 @@ REGISTER_FACTORY_IMPL(v4, ReduceL1); REGISTER_FACTORY_IMPL(v4, ReduceL2); } // namespace intel_gpu -} // namespace runtime } // namespace ov 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 bbfc44d00f1..02aebc88872 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/region_yolo.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/region_yolo.cpp @@ -10,7 +10,6 @@ #include "intel_gpu/primitives/region_yolo.hpp" namespace ov { -namespace runtime { namespace intel_gpu { static void CreateRegionYoloOp(Program& p, const std::shared_ptr& op) { @@ -40,5 +39,4 @@ static void CreateRegionYoloOp(Program& p, const std::shared_ptr& op) { @@ -32,5 +31,4 @@ static void CreateReorgYoloOp(Program& p, const std::shared_ptr& op) { @@ -77,5 +76,4 @@ REGISTER_FACTORY_IMPL(v0, Squeeze); REGISTER_FACTORY_IMPL(v0, Unsqueeze); } // namespace intel_gpu -} // namespace runtime } // namespace ov diff --git a/src/plugins/intel_gpu/src/plugin/ops/result.cpp b/src/plugins/intel_gpu/src/plugin/ops/result.cpp index 6c8992b0536..fcb857d6e91 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/result.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/result.cpp @@ -12,7 +12,6 @@ using namespace InferenceEngine; namespace ov { -namespace runtime { namespace intel_gpu { static void CreateResultOp(Program& p, const std::shared_ptr& op) { @@ -83,5 +82,4 @@ static void CreateResultOp(Program& p, const std::shared_ptr& op) { @@ -28,5 +27,4 @@ static void CreateReverseOp(Program& p, const std::shared_ptr& op) { @@ -34,5 +33,4 @@ static void CreateReverseSequenceOp(Program& p, const std::shared_ptr name_mapping = { @@ -356,5 +355,4 @@ REGISTER_FACTORY_IMPL(v4, LSTMCell); REGISTER_FACTORY_IMPL(v5, LSTMSequence); } // namespace intel_gpu -} // namespace runtime } // namespace ov diff --git a/src/plugins/intel_gpu/src/plugin/ops/roi_align.cpp b/src/plugins/intel_gpu/src/plugin/ops/roi_align.cpp index 5e1ad699ae7..416249fc949 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/roi_align.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/roi_align.cpp @@ -8,7 +8,6 @@ #include namespace ov { -namespace runtime { namespace intel_gpu { namespace { @@ -42,5 +41,4 @@ void CreateROIAlignOp(Program& p, const std::shared_ptr& op) { REGISTER_FACTORY_IMPL(v7, Roll); } // namespace intel_gpu -} // namespace runtime } // namespace ov 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 26bfbc3f673..095dfa586b9 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 @@ -11,7 +11,6 @@ #include "intel_gpu/primitives/scatter_elements_update.hpp" namespace ov { -namespace runtime { namespace intel_gpu { static inline cldnn::scatter_elements_update::scatter_elements_update_axis GetScatterElementsUpdateAxis(int axis, unsigned rank) { @@ -69,5 +68,4 @@ static void CreateScatterElementsUpdateOp(Program& p, const std::shared_ptr& op) { @@ -49,5 +48,4 @@ static void CreateScatterNDUpdateOp(Program& p, const std::shared_ptr& op) { @@ -92,5 +91,4 @@ static void CreateSelectOp(Program& p, const std::shared_ptr& op) { @@ -40,5 +39,4 @@ REGISTER_FACTORY_IMPL(v0, ShapeOf); REGISTER_FACTORY_IMPL(v3, ShapeOf); } // namespace intel_gpu -} // namespace runtime } // namespace ov diff --git a/src/plugins/intel_gpu/src/plugin/ops/shuffle_channels.cpp b/src/plugins/intel_gpu/src/plugin/ops/shuffle_channels.cpp index 6fec3f72e8f..cb391c73d12 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/shuffle_channels.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/shuffle_channels.cpp @@ -10,7 +10,6 @@ #include "intel_gpu/primitives/shuffle_channels.hpp" namespace ov { -namespace runtime { namespace intel_gpu { static void CreateShuffleChannelsOp(Program& p, const std::shared_ptr& op) { @@ -48,5 +47,4 @@ static void CreateShuffleChannelsOp(Program& p, const std::shared_ptr namespace ov { -namespace runtime { namespace intel_gpu { namespace { @@ -33,5 +32,4 @@ static void CreateSliceOp(Program& p, const std::shared_ptr& op) { @@ -54,5 +53,4 @@ static void CreateSpaceToBatchOp(Program& p, const std::shared_ptr& op) { @@ -74,5 +73,4 @@ REGISTER_FACTORY_IMPL(v1, Split); REGISTER_FACTORY_IMPL(v1, VariadicSplit); } // namespace intel_gpu -} // namespace runtime } // namespace ov diff --git a/src/plugins/intel_gpu/src/plugin/ops/strided_slice.cpp b/src/plugins/intel_gpu/src/plugin/ops/strided_slice.cpp index 595d84c97f6..4da1ae7b2a1 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/strided_slice.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/strided_slice.cpp @@ -13,7 +13,6 @@ #include "intel_gpu/primitives/crop.hpp" namespace ov { -namespace runtime { namespace intel_gpu { static void CreateStridedSliceOp(Program& p, const std::shared_ptr& op) { @@ -253,5 +252,4 @@ static void CreateStridedSliceOp(Program& p, const std::shared_ptr @@ -201,5 +200,4 @@ static void CreateTensorIteratorOp(Program &p, const std::shared_ptr& op) { @@ -30,5 +29,4 @@ static void CreateTileOp(Program& p, const std::shared_ptr REGISTER_FACTORY_IMPL(v0, Tile); } // namespace intel_gpu -} // namespace runtime } // namespace ov diff --git a/src/plugins/intel_gpu/src/plugin/ops/topk.cpp b/src/plugins/intel_gpu/src/plugin/ops/topk.cpp index 3a404577cfc..4be07c20450 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/topk.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/topk.cpp @@ -12,7 +12,6 @@ #include "intel_gpu/runtime/debug_configuration.hpp" namespace ov { -namespace runtime { namespace intel_gpu { static cldnn::arg_max_min::axis_name GetAxis(int32_t axis, size_t in_rank) { @@ -133,5 +132,4 @@ static void CreateTopKOp(Program& p, const std::shared_ptr REGISTER_FACTORY_IMPL(v1, TopK); } // namespace intel_gpu -} // namespace runtime } // namespace ov diff --git a/src/plugins/intel_gpu/src/plugin/ops/transpose.cpp b/src/plugins/intel_gpu/src/plugin/ops/transpose.cpp index 04226c4dbfd..f250b942438 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/transpose.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/transpose.cpp @@ -12,7 +12,6 @@ #include "intel_gpu/primitives/reorder.hpp" namespace ov { -namespace runtime { namespace intel_gpu { static void CreateTransposeOp(Program& p, const std::shared_ptr& op) { @@ -79,5 +78,4 @@ static void CreateTransposeOp(Program& p, const std::shared_ptr& op, @@ -329,5 +328,4 @@ REGISTER_FACTORY_IMPL(v5, Round); REGISTER_FACTORY_IMPL(v9, SoftSign); } // namespace intel_gpu -} // namespace runtime } // namespace ov diff --git a/src/plugins/intel_gpu/src/plugin/ops/variable.cpp b/src/plugins/intel_gpu/src/plugin/ops/variable.cpp index 722d5613e94..b0670003483 100644 --- a/src/plugins/intel_gpu/src/plugin/ops/variable.cpp +++ b/src/plugins/intel_gpu/src/plugin/ops/variable.cpp @@ -11,7 +11,6 @@ namespace ov { -namespace runtime { namespace intel_gpu { namespace { @@ -53,6 +52,5 @@ void CreateAssignOp(Program& p, const std::shared_ptr& o REGISTER_FACTORY_IMPL(v6, Assign); REGISTER_FACTORY_IMPL(v6, ReadValue); -} // namespace intel_gpu -} // namespace runtime -} // namespace ov +} // namespace intel_gpu +} // namespace ov diff --git a/src/plugins/intel_gpu/src/plugin/plugin.cpp b/src/plugins/intel_gpu/src/plugin/plugin.cpp index 28de1ee9a66..89ac8fbd0a6 100644 --- a/src/plugins/intel_gpu/src/plugin/plugin.cpp +++ b/src/plugins/intel_gpu/src/plugin/plugin.cpp @@ -54,7 +54,6 @@ using namespace InferenceEngine::gpu; using namespace InferenceEngine::details; namespace ov { -namespace runtime { namespace intel_gpu { #define FACTORY_DECLARATION(op_version, op_name) \ @@ -1091,8 +1090,7 @@ Parameter Plugin::GetMetric(const std::string& name, const std::map& node) { } } // namespace intel_gpu -} // namespace runtime } // namespace ov diff --git a/src/plugins/intel_gpu/src/plugin/remote_context.cpp b/src/plugins/intel_gpu/src/plugin/remote_context.cpp index 1eaf01aea0b..dac62bae75b 100644 --- a/src/plugins/intel_gpu/src/plugin/remote_context.cpp +++ b/src/plugins/intel_gpu/src/plugin/remote_context.cpp @@ -13,7 +13,6 @@ using namespace InferenceEngine::gpu; using namespace InferenceEngine::details; namespace ov { -namespace runtime { namespace intel_gpu { RemoteAllocator RemoteBlobImpl::m_allocator; @@ -380,5 +379,4 @@ std::string ExecutionContextImpl::getDeviceName() const noexcept { } } // namespace intel_gpu -} // namespace runtime } // namespace ov 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 f237e43f0cd..6b04b45f50d 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/einsum_decomposition.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/einsum_decomposition.cpp @@ -11,7 +11,6 @@ #include namespace ov { -namespace runtime { namespace intel_gpu { namespace { @@ -938,5 +937,4 @@ EinsumDecomposition::EinsumDecomposition() { } } // namespace intel_gpu -} // namespace runtime } // namespace ov 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 d56fea2e55e..66a775054bc 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations/einsum_decomposition.hpp +++ b/src/plugins/intel_gpu/src/plugin/transformations/einsum_decomposition.hpp @@ -8,7 +8,6 @@ #include namespace ov { -namespace runtime { namespace intel_gpu { /** @@ -21,5 +20,4 @@ public: }; } // namespace intel_gpu -} // namespace runtime } // namespace ov diff --git a/src/plugins/intel_gpu/src/plugin/transformations_pipeline.cpp b/src/plugins/intel_gpu/src/plugin/transformations_pipeline.cpp index ac7a2ef247a..a8996d52fec 100644 --- a/src/plugins/intel_gpu/src/plugin/transformations_pipeline.cpp +++ b/src/plugins/intel_gpu/src/plugin/transformations_pipeline.cpp @@ -106,7 +106,6 @@ static bool disableReduceDecomposition(const std::shared_ptr } // namespace namespace ov { -namespace runtime { namespace intel_gpu { void TransformationsPipeline::apply(std::shared_ptr func) { @@ -482,5 +481,4 @@ void TransformationsPipeline::apply(std::shared_ptr func) { } } } // namespace intel_gpu -} // namespace runtime } // namespace ov diff --git a/src/plugins/intel_gpu/src/plugin/variable_state.cpp b/src/plugins/intel_gpu/src/plugin/variable_state.cpp index e0da57bc16c..971c7e516a4 100644 --- a/src/plugins/intel_gpu/src/plugin/variable_state.cpp +++ b/src/plugins/intel_gpu/src/plugin/variable_state.cpp @@ -5,7 +5,6 @@ #include namespace ov { -namespace runtime { namespace intel_gpu { VariableState::VariableState(const std::string &name, @@ -68,7 +67,5 @@ void VariableState::IterateOverStates(std::function