Skip to content

Commit 59cc460

Browse files
author
Vladimir Paramuzov
authored
[GPU] Use optional and nested namespaces features from cpp17 (#28628)
Signed-off-by: Vladimir Paramuzov <[email protected]>
1 parent 0fdc1bc commit 59cc460

File tree

304 files changed

+608
-1256
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

304 files changed

+608
-1256
lines changed

src/plugins/intel_gpu/include/intel_gpu/op/convolution.hpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66

77
#include "openvino/op/util/convolution_base.hpp"
88

9-
namespace ov {
10-
namespace intel_gpu {
11-
namespace op {
9+
namespace ov::intel_gpu::op {
1210

1311
// Common node for v1::Convolution and v1::GroupConvolution with few extensions
1412
// - Relaxed type requirements
@@ -76,6 +74,4 @@ std::vector<ov::PartialShape> shape_infer(const Convolution* op,
7674
CoordinateDiff& pads_begin,
7775
CoordinateDiff& pads_end);
7876

79-
} // namespace op
80-
} // namespace intel_gpu
81-
} // namespace ov
77+
} // namespace ov::intel_gpu::op

src/plugins/intel_gpu/include/intel_gpu/op/fully_connected.hpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
#include "openvino/core/node.hpp"
88
#include "openvino/op/op.hpp"
99

10-
namespace ov {
11-
namespace intel_gpu {
12-
namespace op {
10+
namespace ov::intel_gpu::op {
1311

1412
class FullyConnected : public ov::op::Op {
1513
public:
@@ -34,6 +32,4 @@ class FullyConnected : public ov::op::Op {
3432
ov::element::Type m_output_type;
3533
};
3634

37-
} // namespace op
38-
} // namespace intel_gpu
39-
} // namespace ov
35+
} // namespace ov::intel_gpu::op

src/plugins/intel_gpu/include/intel_gpu/op/fully_connected_compressed.hpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66

77
#include "fully_connected.hpp"
88

9-
namespace ov {
10-
namespace intel_gpu {
11-
namespace op {
9+
namespace ov::intel_gpu::op {
1210

1311
class FullyConnectedCompressed : public FullyConnected {
1412
public:
@@ -42,6 +40,4 @@ class FullyConnectedCompressed : public FullyConnected {
4240
std::shared_ptr<Node> clone_with_new_inputs(const ov::OutputVector& new_args) const override;
4341
};
4442

45-
} // namespace op
46-
} // namespace intel_gpu
47-
} // namespace ov
43+
} // namespace ov::intel_gpu::op

src/plugins/intel_gpu/include/intel_gpu/op/gemm.hpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
#include "openvino/op/matmul.hpp"
1010
#include "openvino/op/op.hpp"
1111

12-
namespace ov {
13-
namespace intel_gpu {
14-
namespace op {
12+
namespace ov::intel_gpu::op {
1513

1614
class Gemm : public ov::op::v0::MatMul {
1715
public:
@@ -56,6 +54,4 @@ std::vector<ov::PartialShape> shape_infer(const Gemm* op,
5654
const std::vector<int64_t>& order_b,
5755
const std::vector<int64_t>& order_c);
5856

59-
} // namespace op
60-
} // namespace intel_gpu
61-
} // namespace ov
57+
} // namespace ov::intel_gpu::op

src/plugins/intel_gpu/include/intel_gpu/op/indirect_gemm.hpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
#include "openvino/core/partial_shape.hpp"
1010
#include "openvino/op/op.hpp"
1111

12-
namespace ov {
13-
namespace intel_gpu {
14-
namespace op {
12+
namespace ov::intel_gpu::op {
1513

1614
class IndirectGemm : public ov::intel_gpu::op::Gemm {
1715
public:
@@ -49,6 +47,4 @@ class IndirectGemm : public ov::intel_gpu::op::Gemm {
4947
int64_t m_indirect_axis = 0;
5048
};
5149

52-
} // namespace op
53-
} // namespace intel_gpu
54-
} // namespace ov
50+
} // namespace ov::intel_gpu::op

src/plugins/intel_gpu/include/intel_gpu/op/indirect_sdpa.hpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
#include "openvino/core/partial_shape.hpp"
1010
#include "openvino/op/op.hpp"
1111

12-
namespace ov {
13-
namespace intel_gpu {
14-
namespace op {
12+
namespace ov::intel_gpu::op {
1513

1614
class IndirectSDPA : public ov::intel_gpu::op::SDPA {
1715
public:
@@ -55,6 +53,4 @@ class IndirectSDPA : public ov::intel_gpu::op::SDPA {
5553
int64_t m_indirect_axis = -1;
5654
};
5755

58-
} // namespace op
59-
} // namespace intel_gpu
60-
} // namespace ov
56+
} // namespace ov::intel_gpu::op

src/plugins/intel_gpu/include/intel_gpu/op/kv_cache.hpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
#include "openvino/op/util/variable_extension.hpp"
1010
#include "ov_ops/dynamic_quantize.hpp"
1111

12-
namespace ov {
13-
namespace intel_gpu {
14-
namespace op {
12+
namespace ov::intel_gpu::op {
1513

1614
/// \brief Operator that implements Key-Values cache subgraph for large language models.
1715
/// This operation updates data of the corresponding Variable
@@ -71,6 +69,4 @@ class KVCache : public ov::op::Op, public ov::op::util::VariableExtension {
7169

7270
std::vector<ov::PartialShape> shape_infer(const KVCache* op, const std::vector<ov::PartialShape>& input_shapes);
7371

74-
} // namespace op
75-
} // namespace intel_gpu
76-
} // namespace ov
72+
} // namespace ov::intel_gpu::op

src/plugins/intel_gpu/include/intel_gpu/op/kv_cache_compressed.hpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
#include "intel_gpu/op/kv_cache.hpp"
88
#include "ov_ops/dynamic_quantize.hpp"
99

10-
namespace ov {
11-
namespace intel_gpu {
12-
namespace op {
10+
namespace ov::intel_gpu::op {
1311

1412
/// \brief Operator that implements Key-Values cache subgraph for large language models.
1513
/// This operation updates data of the corresponding Variable
@@ -51,6 +49,4 @@ class KVCacheCompressed : public ov::intel_gpu::op::KVCache {
5149
std::vector<ov::PartialShape> shape_infer(const KVCacheCompressed* op,
5250
const std::vector<ov::PartialShape>& input_shapes);
5351

54-
} // namespace op
55-
} // namespace intel_gpu
56-
} // namespace ov
52+
} // namespace ov::intel_gpu::op

src/plugins/intel_gpu/include/intel_gpu/op/placeholder.hpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66

77
#include "openvino/op/op.hpp"
88

9-
namespace ov {
10-
namespace intel_gpu {
11-
namespace op {
9+
namespace ov::intel_gpu::op {
1210

1311
class Placeholder : public ov::op::Op {
1412
public:
@@ -21,6 +19,4 @@ class Placeholder : public ov::op::Op {
2119
std::shared_ptr<Node> clone_with_new_inputs(const ov::OutputVector& new_args) const override;
2220
};
2321

24-
} // namespace op
25-
} // namespace intel_gpu
26-
} // namespace ov
22+
} // namespace ov::intel_gpu::op

src/plugins/intel_gpu/include/intel_gpu/op/read_value.hpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
#include "openvino/op/util/variable.hpp"
99
#include "openvino/op/util/variable_extension.hpp"
1010

11-
namespace ov {
12-
namespace intel_gpu {
13-
namespace op {
11+
namespace ov::intel_gpu::op {
1412

1513
/// \brief Similar to common v6::ReadValue, but it's not derived from ReadValueBase class to avoid ReadValue-Assign pairing check
1614
/// 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 {
4240
}
4341
};
4442

45-
} // namespace op
46-
} // namespace intel_gpu
47-
} // namespace ov
43+
} // namespace ov::intel_gpu::op

0 commit comments

Comments
 (0)