Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Ref][Core][Opset13] NMSRotated-13 core shell and reference implementation #19907

Merged
merged 72 commits into from
Sep 29, 2023
Merged
Show file tree
Hide file tree
Changes from 66 commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
1613b2b
nms_r_init
mitruska Sep 14, 2023
2e7aafc
Add tests
mitruska Sep 15, 2023
f7e5d30
Update nms refs
mitruska Sep 15, 2023
f2403d9
Update onnx import
mitruska Sep 15, 2023
72a18fb
Add nms rotated utils
mitruska Sep 18, 2023
14f199f
Remove soft sigma and align constructors
mitruska Sep 18, 2023
44d7c9b
Fix typo
mitruska Sep 18, 2023
3541e77
Style apply
mitruska Sep 18, 2023
1348cc2
Merge remote-tracking branch 'upstream/master' into mitruska/nms_r_impl
mitruska Sep 18, 2023
0a5cfa1
Add namespace for iou
mitruska Sep 18, 2023
2e2923f
Update opset comment
mitruska Sep 18, 2023
7cf4b80
Revert cpu changes
mitruska Sep 18, 2023
53d3e0f
onnx test cleanup
mitruska Sep 18, 2023
1d873ad
Update input types validation
mitruska Sep 18, 2023
79f3f79
Align shape_infer boxes
mitruska Sep 18, 2023
d1c95b7
Test update
mitruska Sep 18, 2023
9426fd4
Fix warning
mitruska Sep 18, 2023
9d63706
Temporary evaluate support for tests
mitruska Sep 18, 2023
091a051
Add counterclockwise support
mitruska Sep 19, 2023
23fe3c9
Remove box_encoding attr
mitruska Sep 20, 2023
16a52d8
Fix clockwise box idx
mitruska Sep 20, 2023
a9c9eeb
More tests
mitruska Sep 20, 2023
ccb264e
Update opset test
mitruska Sep 20, 2023
6c427bc
Update boxes shape validation
mitruska Sep 20, 2023
5fc5d77
Type prop tests
mitruska Sep 21, 2023
dff84eb
Merge remote-tracking branch 'upstream/master' into mitruska/nms_r_impl
mitruska Sep 21, 2023
a3ab950
HostTensor to ov Tensor migration
mitruska Sep 21, 2023
555cc03
Update output_type set get output_type_attr
mitruska Sep 21, 2023
9b4aace
Move setters and getters to cpp
mitruska Sep 21, 2023
743bfda
Add visitor test
mitruska Sep 21, 2023
1348376
Cleanup
mitruska Sep 21, 2023
1f7ecb1
Remove temp eval
mitruska Sep 21, 2023
bba2338
Headers adjustment
mitruska Sep 21, 2023
ee44266
use float for division
mitruska Sep 21, 2023
78c5525
Fix ref tests run
mitruska Sep 21, 2023
7d96326
Merge remote-tracking branch 'upstream/master' into mitruska/nms_r_impl
mitruska Sep 22, 2023
b895249
Tests and style code refactor
mitruska Sep 22, 2023
3ca580a
Move type check into box_last_dim
mitruska Sep 22, 2023
0bbdb2f
Update visitor test namespace
mitruska Sep 22, 2023
a5a5c4a
Check input type loop
mitruska Sep 22, 2023
a15b0bb
Remove nms_rotated namespace and rename ref function
mitruska Sep 22, 2023
a2259fd
avoid copies in filling output tensor
mitruska Sep 22, 2023
9cddc62
Update shape var name
mitruska Sep 22, 2023
3452e29
remove static from riou func
mitruska Sep 22, 2023
56f84b6
Update nms_rot utils
mitruska Sep 22, 2023
c888bbc
Move nms rot util to ov reference namespace
mitruska Sep 22, 2023
4f97c20
use std::cos and std:::sin
mitruska Sep 22, 2023
98f2e02
Update struct name
mitruska Sep 22, 2023
c7cef4f
Explain usage of postprocessing
mitruska Sep 22, 2023
6986ad2
Update element type desc in error message
mitruska Sep 22, 2023
522530c
Add more comments
mitruska Sep 22, 2023
d941634
Adjust rotated util float types
mitruska Sep 22, 2023
8eebace
Fix name conflicts and warnings
mitruska Sep 22, 2023
ef01754
Merge remote-tracking branch 'upstream/master' into mitruska/nms_r_impl
mitruska Sep 25, 2023
9b22d63
Update opset test ops number
mitruska Sep 25, 2023
5b7a74e
Move int input check to the loop
mitruska Sep 25, 2023
593852e
Short box_def_size init
mitruska Sep 25, 2023
3ee0f58
Move remove static_output from shape_infer params
mitruska Sep 25, 2023
8a990c4
Align float zero
mitruska Sep 25, 2023
8472ac4
Update third-party-programs
mitruska Sep 25, 2023
f745d55
Merge remote-tracking branch 'upstream/master' into mitruska/nms_r_impl
mitruska Sep 25, 2023
e49ef2d
Fix TensorIt for CI
mitruska Sep 25, 2023
a040410
Add op check test
mitruska Sep 26, 2023
865764e
Merge remote-tracking branch 'upstream/master' into mitruska/nms_r_impl
mitruska Sep 26, 2023
e8d88a9
Merge remote-tracking branch 'upstream/master' into mitruska/nms_r_impl
mitruska Sep 27, 2023
b4c3a7d
Update opset test
mitruska Sep 27, 2023
dee456e
Merge branch 'master' into mitruska/nms_r_impl
mlukasze Sep 28, 2023
2349ad9
Merge remote-tracking branch 'upstream/master' into mitruska/nms_r_impl
mitruska Sep 29, 2023
3cdd59d
Headers cleanup
mitruska Sep 29, 2023
5090c83
Merge branch 'mitruska/nms_r_impl' of github.com:mitruska/openvino in…
mitruska Sep 29, 2023
0051950
Merge branch 'master' into mitruska/nms_r_impl
mitruska Sep 29, 2023
6751d75
CI tanh fix
mitruska Sep 29, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
207 changes: 207 additions & 0 deletions licensing/third-party-programs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1640,3 +1640,210 @@ INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.

-------------------------------------------------------------

30. Detectron2 (https://github.com/facebookresearch/detectron2)

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]


Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
64 changes: 64 additions & 0 deletions src/core/include/openvino/op/nms_rotated.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
// Copyright (C) 2018-2023 Intel Corporation
// SPDX-License-Identifier: Apache-2.0
//

#pragma once

#include "openvino/op/op.hpp"

namespace ov {
namespace op {

namespace v13 {
/// \brief NMSRotated operation
///
class OPENVINO_API NMSRotated : public Op {
public:
OPENVINO_OP("NMSRotated", "opset13", op::Op);

NMSRotated() = default;

/// \brief Constructs a NMSRotated operation.
///
/// \param boxes Node containing the coordinates of the bounding boxes
/// \param scores Node containing the scores of the bounding boxes
/// \param max_output_boxes_per_class Node containing maximum number of boxes to be
/// selected per class
/// \param iou_threshold Node containing intersection over union threshold
/// \param score_threshold Node containing minimum score threshold
/// \param sort_result_descending Specifies whether it is necessary to sort selected
/// boxes across batches
/// \param output_type Specifies the output type of the first and third output
/// \param clockwise Specifies the direction of the rotation
NMSRotated(const Output<Node>& boxes,
const Output<Node>& scores,
const Output<Node>& max_output_boxes_per_class,
const Output<Node>& iou_threshold,
const Output<Node>& score_threshold,
const bool sort_result_descending = true,
const ov::element::Type& output_type = ov::element::i64,
const bool clockwise = true);

bool visit_attributes(AttributeVisitor& visitor) override;
void validate_and_infer_types() override;

std::shared_ptr<Node> clone_with_new_inputs(const OutputVector& new_args) const override;

bool get_sort_result_descending() const;
void set_sort_result_descending(const bool sort_result_descending);

element::Type get_output_type_attr() const;
void set_output_type_attr(const element::Type& output_type);

bool get_clockwise() const;
void set_clockwise(const bool clockwise);

protected:
bool m_sort_result_descending = true;
ov::element::Type m_output_type = ov::element::i64;
bool m_clockwise = true;
};
} // namespace v13
} // namespace op

} // namespace ov
1 change: 1 addition & 0 deletions src/core/include/openvino/op/ops.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@
#include "openvino/op/multiply.hpp"
#include "openvino/op/mvn.hpp"
#include "openvino/op/negative.hpp"
#include "openvino/op/nms_rotated.hpp"
#include "openvino/op/non_max_suppression.hpp"
#include "openvino/op/non_zero.hpp"
#include "openvino/op/normalize_l2.hpp"
Expand Down
1 change: 1 addition & 0 deletions src/core/include/openvino/opsets/opset13_tbl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -210,3 +210,4 @@ _OPENVINO_OP_REG(ScatterElementsUpdate, ov::op::v12)

// New operations added in opset13
_OPENVINO_OP_REG(BitwiseNot, ov::op::v13)
_OPENVINO_OP_REG(NMSRotated, ov::op::v13)
32 changes: 32 additions & 0 deletions src/core/reference/include/openvino/reference/nms_rotated.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
// Copyright (C) 2018-2023 Intel Corporation
// SPDX-License-Identifier: Apache-2.0
//

#pragma once

#include "openvino/core/shape.hpp"
#include "openvino/reference/non_max_suppression.hpp"

namespace ov {
namespace reference {

void nms_rotated(const float* boxes_data,
const Shape& boxes_data_shape,
const float* scores_data,
const Shape& scores_data_shape,
int64_t max_output_boxes_per_class,
float iou_threshold,
float score_threshold,
float soft_nms_sigma,
int64_t* selected_indices,
const Shape& selected_indices_shape,
float* selected_scores,
const Shape& selected_scores_shape,
int64_t* valid_outputs,
bool sort_result_descending,
bool clockwise = true);

constexpr auto nms_rotated_postprocessing = ov::reference::nms_postprocessing;

} // namespace reference
} // namespace ov
Loading