Skip to content

Commit 22ae563

Browse files
[GPU] Add NMS_Gather ops
1 parent 4cf2ae0 commit 22ae563

File tree

10 files changed

+248
-2
lines changed

10 files changed

+248
-2
lines changed

src/plugins/intel_gpu/include/intel_gpu/primitives/non_max_suppression.hpp

+24
Original file line numberDiff line numberDiff line change
@@ -156,4 +156,28 @@ struct non_max_suppression : public primitive_base<non_max_suppression> {
156156
ib >> make_data(&rotation, sizeof(rotation));
157157
}
158158
};
159+
160+
struct non_max_suppression_gather : primitive_base<non_max_suppression_gather> {
161+
CLDNN_DECLARE_PRIMITIVE(non_max_suppression_gather)
162+
163+
/// @brief Constructs non_max_suppression_gather primitive.
164+
/// @param id This primitive id.
165+
/// @param inputs Input primitives ids.
166+
non_max_suppression_gather(const primitive_id& id,
167+
const std::vector<input_info>& inputs)
168+
: primitive_base(id, inputs, {padding()}, {optional_data_type()}) {}
169+
170+
size_t hash() const override {
171+
size_t seed = primitive::hash();
172+
return seed;
173+
}
174+
175+
bool operator==(const primitive& rhs) const override {
176+
if (!compare_common_params(rhs)) {
177+
return false;
178+
}
179+
180+
return true;
181+
}
182+
};
159183
} // namespace cldnn

src/plugins/intel_gpu/src/graph/impls/cpu/non_max_suppression.cpp

+106
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,112 @@ attach_non_max_suppression_impl::attach_non_max_suppression_impl() {
440440
}
441441

442442
} // namespace detail
443+
444+
namespace {
445+
446+
std::vector<int32_t> get_nms_gather_input(stream& stream, memory::ptr mem) {
447+
auto dep_mem_layout = mem->get_layout();
448+
auto dep_mem_batch = static_cast<size_t>(dep_mem_layout.batch());
449+
450+
mem_lock<int32_t, mem_lock_type::read> dep_mem_lock(mem, stream);
451+
auto dep_mem_ptr = dep_mem_lock.data();
452+
453+
size_t actual_valid_num = dep_mem_batch;
454+
size_t idx = 0;
455+
for (size_t i = 0; i < dep_mem_batch; i++) {
456+
idx = i * 3;
457+
if (dep_mem_ptr[idx] == -1) {
458+
actual_valid_num = i;
459+
break;
460+
}
461+
}
462+
463+
std::vector<int32_t> result;
464+
for (size_t i = 0; i < actual_valid_num; i++) {
465+
idx = i * 3;
466+
result.push_back(dep_mem_ptr[idx + 0]);
467+
result.push_back(dep_mem_ptr[idx + 1]);
468+
result.push_back(dep_mem_ptr[idx + 2]);
469+
}
470+
471+
return result;
472+
}
473+
474+
void store_nms_gather_output(stream& stream, memory::ptr mem, std::vector<int32_t> valid_input) {
475+
auto valid_input_size = valid_input.size() / 3;
476+
477+
mem_lock<int32_t, mem_lock_type::write> lock(mem, stream);
478+
auto ptr = lock.data();
479+
480+
auto output_batch = static_cast<size_t>(mem->get_layout().batch());
481+
for (size_t si = 0; si < std::min(valid_input_size, output_batch); ++si) {
482+
auto offset = si * 3;
483+
ptr[offset + 0] = static_cast<int32_t>(valid_input[offset + 0]);
484+
ptr[offset + 1] = static_cast<int32_t>(valid_input[offset + 1]);
485+
ptr[offset + 2] = static_cast<int32_t>(valid_input[offset + 2]);
486+
}
487+
}
488+
489+
void run_nms_gather(non_max_suppression_gather_inst& instance) {
490+
auto& stream = instance.get_network().get_stream();
491+
492+
auto valid_input = get_nms_gather_input(stream, instance.dep_memory_ptr(0));
493+
store_nms_gather_output(stream, instance.output_memory_ptr(), valid_input);
494+
}
495+
}
496+
struct non_max_suppression_gather_impl : typed_primitive_impl<non_max_suppression_gather> {
497+
using parent = typed_primitive_impl<non_max_suppression_gather>;
498+
499+
DECLARE_OBJECT_TYPE_SERIALIZATION(cldnn::cpu::non_max_suppression_gather_impl)
500+
501+
std::unique_ptr<primitive_impl> clone() const override {
502+
return make_unique<non_max_suppression_gather_impl>(*this);
503+
}
504+
505+
non_max_suppression_gather_impl() : parent("non_max_suppression_gather_impl") {}
506+
507+
event::ptr execute_impl(const std::vector<event::ptr>& events, typed_primitive_inst<non_max_suppression_gather>& instance) override {
508+
auto& stream = instance.get_network().get_stream();
509+
510+
const bool pass_through_events = (stream.get_queue_type() == QueueTypes::out_of_order) && instance.get_node().is_in_shape_of_subgraph();
511+
512+
if (!pass_through_events) {
513+
for (auto e : events) {
514+
e->wait();
515+
}
516+
}
517+
518+
run_nms_gather(instance);
519+
520+
if (pass_through_events) {
521+
if (events.size() > 1) {
522+
return stream.group_events(events);
523+
} else if (events.size() == 1) {
524+
return events[0];
525+
}
526+
}
527+
528+
return stream.create_user_event(true);
529+
}
530+
531+
static std::unique_ptr<primitive_impl> create(const non_max_suppression_gather_node&, const kernel_impl_params&) {
532+
return make_unique<non_max_suppression_gather_impl>();
533+
}
534+
void init_kernels(const kernels_cache&, const kernel_impl_params&) override {}
535+
};
536+
537+
namespace detail {
538+
539+
attach_non_max_suppression_gather_impl::attach_non_max_suppression_gather_impl() {
540+
implementation_map<non_max_suppression_gather>::add(impl_types::cpu, non_max_suppression_gather_impl::create, {
541+
std::make_tuple(data_types::i32, format::bfyx),
542+
std::make_tuple(data_types::f16, format::bfyx),
543+
std::make_tuple(data_types::f32, format::bfyx),
544+
});
545+
}
546+
547+
} // namespace detail
548+
443549
} // namespace cpu
444550
} // namespace cldnn
445551

src/plugins/intel_gpu/src/graph/impls/cpu/register.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ void register_implementations() {
1616
REGISTER_CPU(proposal);
1717
REGISTER_CPU(read_value);
1818
REGISTER_CPU(non_max_suppression);
19+
REGISTER_CPU(non_max_suppression_gather);
1920
REGISTER_CPU(shape_of);
2021
REGISTER_CPU(concatenation);
2122
REGISTER_CPU(gather);

src/plugins/intel_gpu/src/graph/impls/cpu/register.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ REGISTER_CPU(assign);
3939
REGISTER_CPU(proposal);
4040
REGISTER_CPU(read_value);
4141
REGISTER_CPU(non_max_suppression);
42+
REGISTER_CPU(non_max_suppression_gather);
4243
REGISTER_CPU(detection_output);
4344
REGISTER_CPU(shape_of);
4445
REGISTER_CPU(concatenation);

src/plugins/intel_gpu/src/graph/include/non_max_suppression_inst.h

+30
Original file line numberDiff line numberDiff line change
@@ -186,4 +186,34 @@ class typed_primitive_inst<non_max_suppression> : public typed_primitive_inst_ba
186186

187187
using non_max_suppression_inst = typed_primitive_inst<non_max_suppression>;
188188

189+
template <>
190+
struct typed_program_node<non_max_suppression_gather> : typed_program_node_base<non_max_suppression_gather> {
191+
using parent = typed_program_node_base<non_max_suppression_gather>;
192+
using parent::parent;
193+
194+
bool generates_dynamic_output() const override {
195+
return true;
196+
}
197+
198+
std::vector<size_t> get_shape_infer_dependencies() const override {
199+
return {0};
200+
}
201+
};
202+
203+
using non_max_suppression_gather_node = typed_program_node<non_max_suppression_gather>;
204+
205+
template <>
206+
class typed_primitive_inst<non_max_suppression_gather> : public typed_primitive_inst_base<non_max_suppression_gather> {
207+
public:
208+
using parent = typed_primitive_inst_base<non_max_suppression_gather>;
209+
using parent::parent;
210+
211+
static layout calc_output_layout(const non_max_suppression_gather_node& node, const kernel_impl_params& impl_param);
212+
template <typename ShapeType>
213+
static std::vector<layout> calc_output_layouts(const non_max_suppression_gather_node& node, const kernel_impl_params& impl_param);
214+
static std::string to_string(const non_max_suppression_gather_node& node);
215+
};
216+
217+
using non_max_suppression_gather_inst = typed_primitive_inst<non_max_suppression_gather>;
218+
189219
} // namespace cldnn

src/plugins/intel_gpu/src/graph/layout_optimizer.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -1583,6 +1583,8 @@ impl_types layout_optimizer::get_preferred_impl_type(program_node& node, format
15831583
}
15841584
}
15851585
}
1586+
} else if (node.is_type<non_max_suppression_gather>()) {
1587+
return impl_types::cpu;
15861588
} else if (node.is_type<reorder>()) {
15871589
if (!_optimization_attributes.use_onednn_impls)
15881590
return impl_types::ocl;

src/plugins/intel_gpu/src/graph/non_max_suppression.cpp

+72
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
#include "nms_shape_inference.hpp"
1212

1313
namespace cldnn {
14+
15+
// -----------------------------------------------
16+
// non_max_suppression
17+
// -----------------------------------------------
1418
GPU_DEFINE_PRIMITIVE_TYPE_ID(non_max_suppression)
1519

1620
layout non_max_suppression_inst::calc_output_layout(non_max_suppression_node const& node, kernel_impl_params const& impl_param) {
@@ -81,4 +85,72 @@ std::string non_max_suppression_inst::to_string(non_max_suppression_node const&
8185
return description.str();
8286
}
8387

88+
// -----------------------------------------------
89+
// non_max_suppression_gather
90+
// -----------------------------------------------
91+
GPU_DEFINE_PRIMITIVE_TYPE_ID(non_max_suppression_gather)
92+
93+
layout non_max_suppression_gather_inst::calc_output_layout(non_max_suppression_gather_node const& node, kernel_impl_params const& impl_param) {
94+
OPENVINO_THROW("Only calc_output_layouts should be used!");
95+
}
96+
97+
template<typename ShapeType>
98+
std::vector<layout> non_max_suppression_gather_inst::calc_output_layouts(non_max_suppression_gather_node const& node, const kernel_impl_params& impl_param) {
99+
std::vector<layout> layouts;
100+
101+
auto desc = impl_param.typed_desc<non_max_suppression_gather>();
102+
const auto input0_layout = node.get_dependency(0).get_output_layout(0); // impl_param.get_input_layout(0);
103+
const auto input1_layout = node.get_dependency(0).get_output_layout(1); // impl_param.get_input_layout(1);
104+
105+
std::vector<ShapeType> output_shapes = { ShapeType{}, ShapeType{}, ShapeType{} };
106+
107+
auto& memory_deps = impl_param.memory_deps;
108+
if (memory_deps.count(0)) {
109+
auto actual_output = memory_deps.at(0);
110+
cldnn::mem_lock<int32_t, mem_lock_type::read> actual_output_lock(actual_output, impl_param.get_stream());
111+
112+
auto output_ps = actual_output->get_layout().get_partial_shape();
113+
auto b = output_ps[0].get_length();
114+
auto f = output_ps[1].get_length(); // should be 3
115+
116+
// find valid data size
117+
auto output_data = actual_output_lock.data();
118+
int64_t actual_valid_num = b;
119+
for (int64_t i = 0; i < b ; i += 1) {
120+
if (output_data[i * f] == -1) {
121+
actual_valid_num = i;
122+
break;
123+
}
124+
}
125+
126+
output_shapes[0] = output_shapes[1] = ShapeType{actual_valid_num, f};
127+
output_shapes[2] = ShapeType{1};
128+
} else {
129+
output_shapes[0] = output_shapes[1] = ShapeType{ov::Dimension::dynamic(), 3};
130+
output_shapes[2] = ShapeType{1};
131+
}
132+
133+
for (size_t i = 0; i < desc->num_outputs; ++i) {
134+
auto dt = desc->output_data_types[i].value_or(data_types::i32);
135+
layouts.push_back({output_shapes[i], dt, format::get_default_format(output_shapes[i].size())});
136+
}
137+
return layouts;
138+
}
139+
140+
template std::vector<layout> non_max_suppression_gather_inst::calc_output_layouts<ov::PartialShape>(non_max_suppression_gather_node const& node,
141+
const kernel_impl_params& impl_param);
142+
143+
std::string non_max_suppression_gather_inst::to_string(non_max_suppression_gather_node const& node) {
144+
auto desc = node.get_primitive();
145+
auto node_info = node.desc_to_json();
146+
147+
json_composite info;
148+
149+
node_info->add("non max suppression gather info", info);
150+
151+
std::stringstream description;
152+
node_info->dump(description);
153+
return description.str();
154+
}
155+
84156
} // namespace cldnn

src/plugins/intel_gpu/src/graph/program.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -1494,6 +1494,7 @@ void program::set_layout_optimizer_attributes(layout_optimizer& lo) {
14941494
prim.type() != cldnn::broadcast::type_id() &&
14951495
prim.type() != cldnn::ctc_loss::type_id() &&
14961496
prim.type() != cldnn::non_max_suppression::type_id() &&
1497+
prim.type() != cldnn::non_max_suppression_gather::type_id() &&
14971498
prim.type() != cldnn::roi_align::type_id() &&
14981499
prim.type() != cldnn::matrix_nms::type_id() &&
14991500
prim.type() != cldnn::adaptive_pooling::type_id() &&
@@ -1546,6 +1547,7 @@ void program::set_layout_optimizer_attributes(layout_optimizer& lo) {
15461547
prim.type() != cldnn::quantize::type_id() &&
15471548
prim.type() != cldnn::ctc_loss::type_id() &&
15481549
prim.type() != cldnn::non_max_suppression::type_id() &&
1550+
prim.type() != cldnn::non_max_suppression_gather::type_id() &&
15491551
prim.type() != cldnn::roi_align::type_id() &&
15501552
prim.type() != cldnn::matrix_nms::type_id() &&
15511553
prim.type() != cldnn::adaptive_pooling::type_id() &&

src/plugins/intel_gpu/src/kernel_selector/common_types.h

+1
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ enum class KernelType {
7777
EXTRACT_IMAGE_PATCHES,
7878
LOOP,
7979
NON_MAX_SUPPRESSION,
80+
NON_MAX_SUPPRESSION_GATHER,
8081
DETECTION_OUTPUT,
8182
EXPERIMENTAL_DETECTRON_DETECTION_OUTPUT,
8283
EXPERIMENTAL_DETECTRON_GENERATE_PROPOSALS_SINGLE_IMAGE,

src/plugins/intel_gpu/src/plugin/ops/non_max_suppression.cpp

+9-2
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ static void CreateNonMaxSuppressionIEInternalOp(ProgramBuilder& p, const std::sh
5454
auto boxesShape = op->get_input_partial_shape(0);
5555
size_t num_outputs = op->get_output_size();
5656
if (p.use_new_shape_infer()) {
57-
auto nonMaxSuppressionLayerName = layer_type_name_ID(op);
57+
auto NMSLayerName = layer_type_name_ID(op);
5858
auto prim = cldnn::non_max_suppression(
59-
nonMaxSuppressionLayerName,
59+
NMSLayerName,
6060
reordered_inputs[0],
6161
reordered_inputs[1],
6262
0,
@@ -78,6 +78,13 @@ static void CreateNonMaxSuppressionIEInternalOp(ProgramBuilder& p, const std::sh
7878
}
7979

8080
p.add_primitive(*op, prim);
81+
82+
auto NMSGatherLayerName = layer_type_name_ID(op) + "_NMSGather";
83+
auto nms_gather_prim = cldnn::non_max_suppression_gather(
84+
NMSGatherLayerName,
85+
{NMSLayerName});
86+
87+
p.add_primitive(*op, nms_gather_prim);
8188
} else {
8289
auto outputIndices = op->get_output_partial_shape(0)[0].get_length();
8390

0 commit comments

Comments
 (0)