IntenseWebs/openvino
3
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ONNX] Enable ONNX ROIAlign-16 (by ov::v9::ROIAlign) (#11633)

Browse Source
This commit is contained in:
Katarzyna Mitrus authored and GitHub committed 2022-05-11 11:43:15 +02:00
1 parent 5456631517
commit 7851020cd3
14 files changed
+378 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

docs/template_plugin/tests/functional/op_reference/roi_align.cpp
+1 -1
View File
@@ -358,4 +358,4 @@ INSTANTIATE_TEST_SUITE_P(smoke_ROIAlign_With_Hardcoded_Refs, ReferenceROIAlignTe
INSTANTIATE_TEST_SUITE_P(smoke_ROIAlignV9_With_Hardcoded_Refs, ReferenceROIAlignV9Test,
testing::ValuesIn(generateCombinedParamsV9()), ReferenceROIAlignV9Test::getTestCaseName);
} // namespace
} // namespace
src/bindings/python/tests/__init__.py
-1
View File
@@ -135,4 +135,3 @@ xfail_issue_81976 = xfail_test(reason="RuntimeError: z node not found in graph c
xfail_issue_82038 = xfail_test(reason="ScatterElements, ScatterND, AssertionError: Result mismatch")
xfail_issue_82039 = xfail_test(reason="Unsupported data type Optional, RuntimeError: [ NOT_IMPLEMENTED ] "
"CPU plugin: Input image format UNSPECIFIED is not supported yet...")
xfail_issue_82040 = xfail_test(reason="RoiAlign, AssertionError: result mismatch")
src/bindings/python/tests/test_onnx/test_backend.py
-5
View File
@@ -49,7 +49,6 @@ from tests import (
skip_segfault,
xfail_issue_82038,
xfail_issue_82039,
xfail_issue_82040,
)
from tests.test_onnx.utils.onnx_backend import OpenVinoTestBackend
@@ -409,10 +408,6 @@ tests_expected_to_fail = [
xfail_issue_82039,
"OnnxBackendNodeModelTest.test_identity_opt_cpu",
),
(
xfail_issue_82040,
"OnnxBackendNodeModelTest.test_roialign_aligned_true_cpu",
),
]
for test_group in tests_expected_to_fail:
src/bindings/python/tests_compatibility/__init__.py
-1
View File
@@ -145,4 +145,3 @@ xfail_issue_81976 = xfail_test(reason="RuntimeError: z node not found in graph c
xfail_issue_82038 = xfail_test(reason="ScatterElements, ScatterND, AssertionError: Result mismatch")
xfail_issue_82039 = xfail_test(reason="Unsupported data type Optional, RuntimeError: [ NOT_IMPLEMENTED ] "
"CPU plugin: Input image format UNSPECIFIED is not supported yet...")
xfail_issue_82040 = xfail_test(reason="RoiAlign, AssertionError: result mismatch")
src/bindings/python/tests_compatibility/test_onnx/test_backend.py
-5
View File
@@ -50,7 +50,6 @@ from tests_compatibility import (
skip_segfault,
xfail_issue_82038,
xfail_issue_82039,
xfail_issue_82040,
)
from tests_compatibility.test_onnx.utils.onnx_backend import OpenVinoTestBackend
@@ -493,10 +492,6 @@ tests_expected_to_fail = [
xfail_issue_82039,
"OnnxBackendNodeModelTest.test_identity_opt_cpu",
),
(
xfail_issue_82040,
"OnnxBackendNodeModelTest.test_roialign_aligned_true_cpu",
),
]
for test_group in tests_expected_to_fail:
src/core/tests/models/onnx/roi_align_f32.prototxt
+4 -1
View File
@@ -107,4 +107,7 @@ graph {
}
}
}
}
}
opset_import {
version: 10
}
src/core/tests/models/onnx/roialign16_avg_half_pixel.prototxt
+120
View File
@@ -0,0 +1,120 @@
ir_version: 8
producer_name: "onnx-frontend-test"
graph {
node {
input: "X"
input: "rois"
input: "batch_indices"
output: "Y"
op_type: "RoiAlign"
attribute {
name: "coordinate_transformation_mode"
s: "half_pixel"
type: STRING
}
attribute {
name: "mode"
s: "avg"
type: STRING
}
attribute {
name: "output_height"
i: 4
type: INT
}
attribute {
name: "output_width"
i: 4
type: INT
}
attribute {
name: "sampling_ratio"
i: 3
type: INT
}
attribute {
name: "spatial_scale"
f: 0.5
type: FLOAT
}
}
name: "test-model-roialign"
input {
name: "X"
type {
tensor_type {
elem_type: 1
shape {
dim {
dim_value: 3
}
dim {
dim_value: 2
}
dim {
dim_value: 6
}
dim {
dim_value: 6
}
}
}
}
}
input {
name: "rois"
type {
tensor_type {
elem_type: 1
shape {
dim {
dim_value: 3
}
dim {
dim_value: 4
}
}
}
}
}
input {
name: "batch_indices"
type {
tensor_type {
elem_type: 7
shape {
dim {
dim_value: 3
}
}
}
}
}
output {
name: "Y"
type {
tensor_type {
elem_type: 1
shape {
dim {
dim_value: 3
}
dim {
dim_value: 2
}
dim {
dim_value: 4
}
dim {
dim_value: 4
}
}
}
}
}
}
opset_import {
domain: ""
version: 16
}
src/core/tests/models/onnx/roialign16_avg_out_half_pixel.prototxt
+120
View File
@@ -0,0 +1,120 @@
ir_version: 8
producer_name: "onnx-frontend-test"
graph {
node {
input: "X"
input: "rois"
input: "batch_indices"
output: "Y"
op_type: "RoiAlign"
attribute {
name: "coordinate_transformation_mode"
s: "output_half_pixel"
type: STRING
}
attribute {
name: "mode"
s: "avg"
type: STRING
}
attribute {
name: "output_height"
i: 4
type: INT
}
attribute {
name: "output_width"
i: 4
type: INT
}
attribute {
name: "sampling_ratio"
i: 3
type: INT
}
attribute {
name: "spatial_scale"
f: 0.5
type: FLOAT
}
}
name: "test-model-roialign"
input {
name: "X"
type {
tensor_type {
elem_type: 1
shape {
dim {
dim_value: 3
}
dim {
dim_value: 2
}
dim {
dim_value: 6
}
dim {
dim_value: 6
}
}
}
}
}
input {
name: "rois"
type {
tensor_type {
elem_type: 1
shape {
dim {
dim_value: 3
}
dim {
dim_value: 4
}
}
}
}
}
input {
name: "batch_indices"
type {
tensor_type {
elem_type: 7
shape {
dim {
dim_value: 3
}
}
}
}
}
output {
name: "Y"
type {
tensor_type {
elem_type: 1
shape {
dim {
dim_value: 3
}
dim {
dim_value: 2
}
dim {
dim_value: 4
}
dim {
dim_value: 4
}
}
}
}
}
}
opset_import {
domain: ""
version: 16
}
src/core/tests/runtime/ie/unit_test.manifest
-2
View File
@@ -430,8 +430,6 @@ onnx_model_max_pool_4d_ceil_strides
# Unsupported primitive of type: SigmoidBackprop
sigmoid_bprop_n1c1h4
# Unsupported primitive of type: ROIAlign
IE_CPU.onnx_roi_align_f32
# [NOT_IMPLEMENTED] Input image format BOOL is not supported yet...
not
src/frontends/onnx/frontend/src/op/roi_align.cpp
+48 -3
View File
@@ -6,7 +6,7 @@
#include <memory>
#include "ngraph/opsets/opset3.hpp"
#include "ngraph/opsets/opset9.hpp"
namespace ngraph {
namespace onnx_import {
@@ -26,11 +26,56 @@ OutputVector roi_align(const Node& node) {
const auto sampling_ratio = node.get_attribute_value<int64_t>("sampling_ratio", 1);
const auto spatial_scale = node.get_attribute_value<float>("spatial_scale", 1.0f);
const auto mode = node.get_attribute_value<std::string>("mode", "avg");
const auto pooling_mode = EnumNames<opset9::ROIAlign::PoolingMode>::as_enum(mode);
const auto aligned_mode = opset9::ROIAlign::AlignedMode::ASYMMETRIC; // Compatible up to ONNX-opset16
return {std::make_shared<
ngraph::opset3::ROIAlign>(data, rois, num_rois, pooled_h, pooled_w, sampling_ratio, spatial_scale, mode)};
return {std::make_shared<opset9::ROIAlign>(data,
rois,
num_rois,
pooled_h,
pooled_w,
sampling_ratio,
spatial_scale,
pooling_mode,
aligned_mode)};
}
} // namespace set_1
namespace set_16 {
OutputVector roi_align(const Node& node) {
const auto inputs = node.get_ng_inputs();
NGRAPH_CHECK(inputs.size() == 3, "The RoiAlign operator expects 3 inputs. Got: ", inputs.size());
const auto& data = inputs[0];
const auto& rois = inputs[1];
const auto& num_rois = inputs[2];
const auto pooled_h = node.get_attribute_value<int64_t>("output_height", 1);
const auto pooled_w = node.get_attribute_value<int64_t>("output_width", 1);
const auto sampling_ratio = node.get_attribute_value<int64_t>("sampling_ratio", 1);
const auto spatial_scale = node.get_attribute_value<float>("spatial_scale", 1.0f);
const auto mode = node.get_attribute_value<std::string>("mode", "avg");
const auto pooling_mode = EnumNames<opset9::ROIAlign::PoolingMode>::as_enum(mode);
const auto coordinate_transformation_mode =
node.get_attribute_value<std::string>("coordinate_transformation_mode", "");
auto aligned_mode = opset9::ROIAlign::AlignedMode::HALF_PIXEL_FOR_NN; // Match ONNX ROIAlign-16 default
if (coordinate_transformation_mode == "output_half_pixel") {
aligned_mode = opset9::ROIAlign::AlignedMode::ASYMMETRIC;
}
return {std::make_shared<opset9::ROIAlign>(data,
rois,
num_rois,
pooled_h,
pooled_w,
sampling_ratio,
spatial_scale,
pooling_mode,
aligned_mode)};
}
} // namespace set_16
} // namespace op
src/frontends/onnx/frontend/src/op/roi_align.hpp
+5
View File
@@ -15,6 +15,11 @@ OutputVector roi_align(const Node& node);
} // namespace set_1
namespace set_16 {
OutputVector roi_align(const Node& node);
} // namespace set_16
} // namespace op
} // namespace onnx_import
src/frontends/onnx/frontend/src/ops_bridge.cpp
+1
View File
@@ -414,6 +414,7 @@ OperatorsBridge::OperatorsBridge() {
REGISTER_OPERATOR("ReverseSequence", 1, reverse_sequence);
REGISTER_OPERATOR("RNN", 1, rnn);
REGISTER_OPERATOR("RoiAlign", 1, roi_align);
REGISTER_OPERATOR("RoiAlign", 16, roi_align);
REGISTER_OPERATOR("Round", 1, round);
REGISTER_OPERATOR("Scan", 1, scan);
REGISTER_OPERATOR("Scan", 9, scan);
src/frontends/tests/onnx/onnx_import.in.cpp
+78
View File
@@ -3429,6 +3429,84 @@ NGRAPH_TEST(${BACKEND_NAME}, onnx_roi_align_f32) {
test_case.run_with_tolerance_as_fp(1.0e-4f);
}
NGRAPH_TEST(${BACKEND_NAME}, onnx_roialign16_avg_out_half_pixel) {
const auto function =
onnx_import::import_onnx_model(file_util::path_join(SERIALIZED_ZOO, "onnx/roialign16_avg_out_half_pixel.onnx"));
auto test_case = test::TestCase(function, s_device);
test_case.add_input<float>(
{1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8, 9.9, 11., 12.1, 13.2, 14.3, 15.4, 16.5, 17.6,
18.7, 19.8, 20.9, 22., 23.1, 24.2, 25.3, 26.4, 27.5, 28.6, 29.7, 30.8, 31.9, 33., 34.1, 35.2,
36.3, 37.4, 38.5, 39.6, 40.7, 41.8, 42.9, 44., 45.1, 46.2, 47.3, 48.4, 49.5, 50.6, 51.7, 52.8,
53.9, 55., 56.1, 57.2, 58.3, 59.4, 60.5, 61.6, 62.7, 63.8, 64.9, 66., 67.1, 68.2, 69.3, 70.4,
71.5, 72.6, 73.7, 74.8, 75.9, 77., 78.1, 79.2, 80.3, 81.4, 82.5, 83.6, 84.7, 85.8, 86.9, 88.,
89.1, 90.2, 91.3, 92.4, 93.5, 94.6, 95.7, 96.8, 97.9, 99., 100.1, 101.2, 102.3, 103.4, 104.5, 105.6,
106.7, 107.8, 108.9, 110., 111.1, 112.2, 113.3, 114.4, 115.5, 116.6, 117.7, 118.8, 119.9, 121., 122.1, 123.2,
124.3, 125.4, 126.5, 127.6, 128.7, 129.8, 130.9, 132., 133.1, 134.2, 135.3, 136.4, 137.5, 138.6, 139.7, 140.8,
141.9, 143., 144.1, 145.2, 146.3, 147.4, 148.5, 149.6, 150.7, 151.8, 152.9, 154., 155.1, 156.2, 157.3, 158.4,
159.5, 160.6, 161.7, 162.8, 163.9, 165., 166.1, 167.2, 168.3, 169.4, 170.5, 171.6, 172.7, 173.8, 174.9, 176.,
177.1, 178.2, 179.3, 180.4, 181.5, 182.6, 183.7, 184.8, 185.9, 187., 188.1, 189.2, 190.3, 191.4, 192.5, 193.6,
194.7, 195.8, 196.9, 198., 199.1, 200.2, 201.3, 202.4, 203.5, 204.6, 205.7, 206.8, 207.9, 209., 210.1, 211.2,
212.3, 213.4, 214.5, 215.6, 216.7, 217.8, 218.9, 220., 221.1, 222.2, 223.3, 224.4, 225.5, 226.6, 227.7, 228.8,
229.9, 231., 232.1, 233.2, 234.3, 235.4, 236.5, 237.6});
test_case.add_input<float>({0, 0, 0.75, 2.2, 1.2, 0.5, 2.8, 1.9, 0, 3, 0, 3});
test_case.add_input<int64_t>({0, 2, 1});
test_case.add_expected_output<float>(
Shape{3, 2, 4, 4},
{2.145, 2.42, 2.6950002, 2.9700003, 3.96, 4.235, 4.51, 4.7850003, 5.775, 6.05,
6.325, 6.6000004, 7.59, 7.8650007, 8.14, 8.415001, 41.745003, 42.019997, 42.295, 42.57,
43.56, 43.835, 44.11, 44.385002, 45.375, 45.65, 45.925003, 46.200005, 47.190002, 47.465004,
47.74, 48.015, 162.77249, 163.0475, 163.32251, 163.5975, 164.42252, 164.69751, 164.9725, 165.2475,
166.07251, 166.3475, 166.6225, 166.8975, 167.72249, 167.9975, 168.27249, 168.5475, 202.3725, 202.6475,
202.9225, 203.19751, 204.02252, 204.2975, 204.57251, 204.8475, 205.6725, 205.94751, 206.2225, 206.4975,
207.32251, 207.5975, 207.8725, 208.1475, 91.162506, 91.4375, 91.7125, 91.9875, 92.8125, 93.0875,
93.3625, 93.6375, 94.4625, 94.7375, 95.0125, 95.28749, 96.1125, 96.3875, 96.6625, 96.9375,
130.76251, 131.0375, 131.3125, 131.5875, 132.4125, 132.6875, 132.9625, 133.2375, 134.0625, 134.33751,
134.6125, 134.88751, 135.7125, 135.9875, 136.26251, 136.53749});
test_case.run();
}
NGRAPH_TEST(${BACKEND_NAME}, onnx_roialign16_avg_half_pixel) {
const auto function =
onnx_import::import_onnx_model(file_util::path_join(SERIALIZED_ZOO, "onnx/roialign16_avg_half_pixel.onnx"));
auto test_case = test::TestCase(function, s_device);
test_case.add_input<float>(
{1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8, 9.9, 11., 12.1, 13.2, 14.3, 15.4, 16.5, 17.6,
18.7, 19.8, 20.9, 22., 23.1, 24.2, 25.3, 26.4, 27.5, 28.6, 29.7, 30.8, 31.9, 33., 34.1, 35.2,
36.3, 37.4, 38.5, 39.6, 40.7, 41.8, 42.9, 44., 45.1, 46.2, 47.3, 48.4, 49.5, 50.6, 51.7, 52.8,
53.9, 55., 56.1, 57.2, 58.3, 59.4, 60.5, 61.6, 62.7, 63.8, 64.9, 66., 67.1, 68.2, 69.3, 70.4,
71.5, 72.6, 73.7, 74.8, 75.9, 77., 78.1, 79.2, 80.3, 81.4, 82.5, 83.6, 84.7, 85.8, 86.9, 88.,
89.1, 90.2, 91.3, 92.4, 93.5, 94.6, 95.7, 96.8, 97.9, 99., 100.1, 101.2, 102.3, 103.4, 104.5, 105.6,
106.7, 107.8, 108.9, 110., 111.1, 112.2, 113.3, 114.4, 115.5, 116.6, 117.7, 118.8, 119.9, 121., 122.1, 123.2,
124.3, 125.4, 126.5, 127.6, 128.7, 129.8, 130.9, 132., 133.1, 134.2, 135.3, 136.4, 137.5, 138.6, 139.7, 140.8,
141.9, 143., 144.1, 145.2, 146.3, 147.4, 148.5, 149.6, 150.7, 151.8, 152.9, 154., 155.1, 156.2, 157.3, 158.4,
159.5, 160.6, 161.7, 162.8, 163.9, 165., 166.1, 167.2, 168.3, 169.4, 170.5, 171.6, 172.7, 173.8, 174.9, 176.,
177.1, 178.2, 179.3, 180.4, 181.5, 182.6, 183.7, 184.8, 185.9, 187., 188.1, 189.2, 190.3, 191.4, 192.5, 193.6,
194.7, 195.8, 196.9, 198., 199.1, 200.2, 201.3, 202.4, 203.5, 204.6, 205.7, 206.8, 207.9, 209., 210.1, 211.2,
212.3, 213.4, 214.5, 215.6, 216.7, 217.8, 218.9, 220., 221.1, 222.2, 223.3, 224.4, 225.5, 226.6, 227.7, 228.8,
229.9, 231., 232.1, 233.2, 234.3, 235.4, 236.5, 237.6});
test_case.add_input<float>({0, 0, 0.75, 2.2, 1.2, 0.5, 2.8, 1.9, 0, 3, 0, 3});
test_case.add_input<int64_t>({0, 2, 1});
test_case.add_expected_output<float>(
Shape{3, 2, 4, 4},
{1.1, 1.1, 1.1, 1.1, 1.1, 1.1, 1.1, 1.1, 2.3375, 2.3375,
2.3375, 2.3375, 4.1525, 4.1525, 4.1525, 4.1525, 40.7, 40.7, 40.7, 40.7,
40.7, 40.7, 40.7, 40.7, 41.9375, 41.9375, 41.9375, 41.9375, 43.7525, 43.7525,
43.7525, 43.7525, 159.72, 159.94, 160.16, 160.38, 159.90562, 160.12563, 160.34563, 160.56563,
160.9575, 161.1775, 161.3975, 161.61751, 162.1125, 162.3325, 162.55249, 162.77249, 199.32, 199.54001,
199.76001, 199.97998, 199.50562, 199.72563, 199.94562, 200.16562, 200.5575, 200.7775, 200.9975, 201.2175,
201.7125, 201.93251, 202.1525, 202.37251, 86.9, 86.9, 86.9, 86.9, 86.9, 86.9,
86.9, 86.9, 86.9, 86.9, 86.9, 86.9, 86.9, 86.9, 86.9, 86.9,
126.5, 126.5, 126.5, 126.5, 126.5, 126.5, 126.5, 126.5, 126.5, 126.5,
126.5, 126.5, 126.5, 126.5, 126.5, 126.5});
test_case.run_with_tolerance_as_fp(0.01f);
}
NGRAPH_TEST(${BACKEND_NAME}, quant_dequant_pattern) {
const auto function =
onnx_import::import_onnx_model(file_util::path_join(SERIALIZED_ZOO, "onnx/quant_dequant_pattern.onnx"));
src/tests/functional/inference_engine/transformations/op_conversions/convert_roi_align_v9_to_v3_test.cpp
+1 -1
View File
@@ -107,4 +107,4 @@ TEST_F(TransformationTestsF, ConvertROIAlign9To3_aligned_mode) {
function = std::make_shared<Function>(NodeVector{roi_align}, ParameterVector{data, rois, batch_indices});
manager.register_pass<pass::ConvertROIAlign9To3>();
}
}
}