Extend CPU Plugin with `SegmentMax-16` reference implementation #28979

p-wysocki · 2025-02-13T15:34:07Z

Details:

Requires Add SegmentMax-16 reference implementation #28788, it's currently merged into this PR
Add reference implementation to CPU Plugin
Add tests

Related PRs:

Tickets:

CVS-158918

Signed-off-by: p-wysocki <[email protected]>

…into segmentmax_core Signed-off-by: p-wysocki <[email protected]>

Signed-off-by: p-wysocki <[email protected]>

…into segmentmax_core Signed-off-by: p-wysocki <[email protected]>

Signed-off-by: p-wysocki <[email protected]>

Co-authored-by: Pawel Raasz <[email protected]>

…max_shape_inference_test.cpp Co-authored-by: Pawel Raasz <[email protected]>

Co-authored-by: Pawel Raasz <[email protected]>

t-jankowski

Ok for src/core/reference part.

t-jankowski · 2025-02-17T11:09:10Z

src/core/reference/include/openvino/reference/segment_max.hpp

+
+template <typename T,
+          typename T_idx,
+          typename std::enable_if<std::is_same<typename std::decay<T_idx>::type, int64_t>::value>::type* = nullptr>


Suggested change

typename std::enable_if<std::is_same<typename std::decay<T_idx>::type, int64_t>::value>::type* = nullptr>

typename std::enable_if_t<std::is_same_v<typename std::decay_t<T_idx>, int64_t>>* = nullptr>

t-jankowski · 2025-02-17T11:10:05Z

src/core/reference/include/openvino/reference/segment_max.hpp

+
+template <typename T,
+          typename T_idx,
+          typename std::enable_if<!std::is_same<typename std::decay<T_idx>::type, int64_t>::value>::type* = nullptr>


Suggested change

typename std::enable_if<!std::is_same<typename std::decay<T_idx>::type, int64_t>::value>::type* = nullptr>

typename std::enable_if_t<!std::is_same_v<typename std::decay_t<T_idx>, int64_t>>* = nullptr>

### Details: - Add reference implementation - Add tests ### Related PRs: - #28103 - #28698 - #28979 - #28999 ### Tickets: - CVS-158917 --------- Signed-off-by: p-wysocki <[email protected]> Co-authored-by: Roman Kazantsev <[email protected]> Co-authored-by: Pawel Raasz <[email protected]> Co-authored-by: Katarzyna Mitrus <[email protected]>

### Details: - The original PR (#28788) has been mistakenly force-merged due to a mistake in merge queue settings. It was later reverted, so this is the "new" Ref PR. - Add reference implementation - Add tests ### Related PRs: - #28103 - #28698 - #28979 - #28999 ### Tickets: - CVS-158917 --------- Signed-off-by: p-wysocki <[email protected]> Co-authored-by: Roman Kazantsev <[email protected]> Co-authored-by: Pawel Raasz <[email protected]> Co-authored-by: Katarzyna Mitrus <[email protected]>

mitruska · 2025-02-19T11:55:38Z

src/plugins/intel_cpu/tests/functional/custom/single_layer_tests/classes/segment_max.cpp

+        if (useNumSegments) {
+            auto numSegments = std::make_shared<ov::op::v0::Constant>(segmentIdsPrecision, ov::Shape{}, numSegmentsValue);
+            segmentMax = std::make_shared<ov::op::v16::SegmentMax>(dataParameter, segmentIdsConst, numSegments, fillMode);


Can a scenario with numSegments as Parameter be tested as well?

mitruska · 2025-02-19T21:46:27Z

src/plugins/intel_cpu/src/nodes/segment_max.cpp

+              OV_CASE2(ov::element::f32, ov::element::i64, float, int64_t),
+              OV_CASE2(ov::element::f16, ov::element::i32, ov::float16, int32_t),
+              OV_CASE2(ov::element::f16, ov::element::i64, ov::float16, int64_t),
+              OV_CASE2(ov::element::bf16, ov::element::i32, ov::bfloat16, int32_t),
+              OV_CASE2(ov::element::bf16, ov::element::i64, ov::bfloat16, int64_t),


AFAIK i64 is converted by CPU plugin to i32, could you please verify that cases for i64 are correctly executed here?

mitruska · 2025-02-19T21:55:05Z

src/plugins/intel_cpu/src/nodes/segment_max.cpp

+template <class T, class T_idx>
+void SegmentMax::executeImpl() {
+    const auto& data_shape = getSrcMemoryAtPort(0)->getStaticDims();
+    const auto& output_shape = getDstMemoryAtPort(0)->getShape().getStaticDims();


As output shape can be related to the num_segments input (if provided). Consider implementation of some additional logic and override the "needShapeInfer()" from CPU Node class.

p-wysocki and others added 30 commits January 27, 2025 15:08

WIP

d338b7e

Signed-off-by: p-wysocki <[email protected]>

WIP

462c43f

Signed-off-by: p-wysocki <[email protected]>

Cleanup

e3e44e2

Signed-off-by: p-wysocki <[email protected]>

Merge branch 'master' of https://github.com/openvinotoolkit/openvino …

adcce7d

…into segmentmax_core Signed-off-by: p-wysocki <[email protected]>

Fix two tests

1affe5d

Signed-off-by: p-wysocki <[email protected]>

Merge Core PR

1246f0a

Signed-off-by: p-wysocki <[email protected]>

WIP

b3a13d3

Signed-off-by: p-wysocki <[email protected]>

CR WIP

094131d

Signed-off-by: p-wysocki <[email protected]>

WIP CR

f8c9919

Signed-off-by: p-wysocki <[email protected]>

WIP CR

f841c4c

Signed-off-by: p-wysocki <[email protected]>

WIP

3e882ed

Signed-off-by: p-wysocki <[email protected]>

Clenaup

7cef3b5

Signed-off-by: p-wysocki <[email protected]>

Merge Core PR

36e4bf6

Signed-off-by: p-wysocki <[email protected]>

WIP

85bb1e6

Signed-off-by: p-wysocki <[email protected]>

WIP

53c02aa

Signed-off-by: p-wysocki <[email protected]>

Add an edge case to tests

5ff3e4f

Signed-off-by: p-wysocki <[email protected]>

Cleanup

3415e83

Signed-off-by: p-wysocki <[email protected]>

Merge branch 'master' of https://github.com/openvinotoolkit/openvino …

fb76824

…into segmentmax_core Signed-off-by: p-wysocki <[email protected]>

Apply CR

b8645d3

Signed-off-by: p-wysocki <[email protected]>

Merge upstream

da74ce4

Signed-off-by: p-wysocki <[email protected]>

Merge branch 'segmentmax_core' into segmentmax_ref

4aed4e9

Signed-off-by: p-wysocki <[email protected]>

Cleanup

2374c1b

Signed-off-by: p-wysocki <[email protected]>

Fix git

8c86ddf

Signed-off-by: p-wysocki <[email protected]>

Merge branch 'master' into segmentmax_ref

b1c4ca4

Merge branch 'master' into segmentmax_core

ca0e6f0

Update src/core/shape_inference/include/segment_max_shape_inference.hpp

18396a6

Co-authored-by: Pawel Raasz <[email protected]>

Update src/core/include/openvino/op/segment_max.hpp

fea6b91

Co-authored-by: Pawel Raasz <[email protected]>

Update src/core/tests/visitors/op/segment_max.cpp

4fcf899

Co-authored-by: Pawel Raasz <[email protected]>

Update src/plugins/intel_cpu/tests/unit/shape_inference_test/segment_…

303ad69

…max_shape_inference_test.cpp Co-authored-by: Pawel Raasz <[email protected]>

Update src/core/tests/type_prop/segment_max.cpp

e33ca27

Co-authored-by: Pawel Raasz <[email protected]>

p-wysocki requested review from mmikolajcz and praasz February 13, 2025 15:34

p-wysocki requested review from a team as code owners February 13, 2025 15:34

github-actions bot added category: Core OpenVINO Core (aka ngraph) category: IE Tests OpenVINO Test: plugins and common category: CPU OpenVINO CPU plugin category: TEMPLATE OpenVINO Template plugin category: CPP API OpenVINO CPP API bindings labels Feb 13, 2025

This was referenced Feb 14, 2025

Add specification for SegmentMax-16 #28103

Merged

Add SegmentMax-16 to Core #28698

Merged

Add SegmentMax-16 reference implementation #28788

Merged

[PyOV] Extend Python API with SegmentMax-16 #28999

Open

t-jankowski approved these changes Feb 17, 2025

View reviewed changes

t-jankowski reviewed Feb 17, 2025

View reviewed changes

p-wysocki mentioned this pull request Feb 18, 2025

Add SegmentMax-16 reference implementation #29047

Merged

Merge branch 'master' into segmentmax_cpu

44caf9e

github-actions bot removed category: Core OpenVINO Core (aka ngraph) category: IE Tests OpenVINO Test: plugins and common category: TEMPLATE OpenVINO Template plugin category: CPP API OpenVINO CPP API bindings labels Feb 19, 2025

praasz approved these changes Feb 19, 2025

View reviewed changes

Merge branch 'master' into segmentmax_cpu

be4f188

mitruska reviewed Feb 19, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Extend CPU Plugin with `SegmentMax-16` reference implementation #28979

Extend CPU Plugin with `SegmentMax-16` reference implementation #28979

p-wysocki commented Feb 13, 2025 •

edited

Loading

t-jankowski left a comment

t-jankowski Feb 17, 2025

t-jankowski Feb 17, 2025

mitruska Feb 19, 2025

mitruska Feb 19, 2025

mitruska Feb 19, 2025

	typename std::enable_if<std::is_same<typename std::decay<T_idx>::type, int64_t>::value>::type* = nullptr>
	typename std::enable_if_t<std::is_same_v<typename std::decay_t<T_idx>, int64_t>>* = nullptr>

	typename std::enable_if<!std::is_same<typename std::decay<T_idx>::type, int64_t>::value>::type* = nullptr>
	typename std::enable_if_t<!std::is_same_v<typename std::decay_t<T_idx>, int64_t>>* = nullptr>

Extend CPU Plugin with SegmentMax-16 reference implementation #28979

Are you sure you want to change the base?

Extend CPU Plugin with SegmentMax-16 reference implementation #28979

Conversation

p-wysocki commented Feb 13, 2025 • edited Loading

Details:

Related PRs:

Tickets:

t-jankowski left a comment

Choose a reason for hiding this comment

t-jankowski Feb 17, 2025

Choose a reason for hiding this comment

t-jankowski Feb 17, 2025

Choose a reason for hiding this comment

mitruska Feb 19, 2025

Choose a reason for hiding this comment

mitruska Feb 19, 2025

Choose a reason for hiding this comment

mitruska Feb 19, 2025

Choose a reason for hiding this comment

Extend CPU Plugin with `SegmentMax-16` reference implementation #28979

Extend CPU Plugin with `SegmentMax-16` reference implementation #28979

p-wysocki commented Feb 13, 2025 •

edited

Loading