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.

Sign up for GitHub

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

[ONNX] Gather 8 #7185

Merged
merged 12 commits into from
Aug 26, 2021
Merged

[ONNX] Gather 8 #7185

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2f2735c
Use nGraph Gather8 for onnx
t-jankowski Aug 19, 2021
8e54218
Add Gather8 simple unit test
t-jankowski Aug 19, 2021
db765e3
Add Gather8 3D unit test
t-jankowski Aug 19, 2021
51fbf61
Add Gather8 negative axis unit test
t-jankowski Aug 20, 2021
bd0eb5e
Add Gather8 negative indices unit test
t-jankowski Aug 20, 2021
91fdf17
Skip negative indices UT on CPU plugin
t-jankowski Aug 20, 2021
24785c2
Correct style (clang format)
t-jankowski Aug 23, 2021
5f82c8d
Merge remote-tracking branch 'upstream/master' into tj/onnx/gather8
t-jankowski Aug 23, 2021
3b64bb5
Remove obsolete empty lines
t-jankowski Aug 24, 2021
5cc490d
Merge remote-tracking branch 'upstream/master' into tj/onnx/gather8
t-jankowski Aug 24, 2021
0438082
Merge remote-tracking branch 'upstream/master' into tj/onnx/gather8
t-jankowski Aug 25, 2021
4a36337
Merge remote-tracking branch 'upstream/master' into tj/onnx/gather8
t-jankowski Aug 25, 2021
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
11 changes: 4 additions & 7 deletions ngraph/frontend/onnx/frontend/src/op/gather.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

#include <memory>

#include "default_opset.hpp"
#include "ngraph/node.hpp"
#include "ngraph/opsets/opset8.hpp"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why no more default?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Current default points to opset7. I'll file a ticket to upgrade default opset to 8.

#include "ngraph/validation_util.hpp"
#include "onnx_import/core/node.hpp"

Expand All @@ -21,15 +21,12 @@ inline OutputVector gather(const Node& node) {
auto indices = ng_inputs.at(1);
auto axis = node.get_attribute_value<int64_t>("axis", 0);

return {std::make_shared<default_opset::Gather>(data,
indices,
default_opset::Constant::create(element::i64, Shape{}, {axis}))};
return {std::make_shared<ngraph::opset8::Gather>(data,
indices,
default_opset::Constant::create(element::i64, Shape{}, {axis}))};
}

} // namespace set_1

} // namespace op

} // namespace onnx_import

} // namespace ngraph
65 changes: 65 additions & 0 deletions ngraph/test/models/onnx/gather_float_1D.prototxt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
ir_version: 7
graph {
node {
input: "data"
input: "indices"
output: "output"
name: "gather"
op_type: "Gather"
attribute {
name: "axis"
i: 0
type: INT
}
}
name: "test-gather8"
input {
name: "data"
type {
tensor_type {
elem_type: 1
shape {
dim {
dim_value: 3
}
}
}
}
}
input {
name: "indices"
type {
tensor_type {
elem_type: 7
shape {
dim {
dim_value: 2
}
dim {
dim_value: 2
}
}
}
}
}
output {
name: "output"
type {
tensor_type {
elem_type: 1
shape {
dim {
dim_value: 2
}
dim {
dim_value: 2
}
}
}
}
}
}
opset_import {
domain: ""
version: 13
}
71 changes: 71 additions & 0 deletions ngraph/test/models/onnx/gather_float_2D_axis_1.prototxt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
ir_version: 7
graph {
node {
input: "data"
input: "indices"
output: "output"
name: "gather"
op_type: "Gather"
attribute {
name: "axis"
i: 1
type: INT
}
}
name: "test-gather8"
input {
name: "data"
type {
tensor_type {
elem_type: 1
shape {
dim {
dim_value: 3
}
dim {
dim_value: 3
}
}
}
}
}
input {
name: "indices"
type {
tensor_type {
elem_type: 7
shape {
dim {
dim_value: 2
}
dim {
dim_value: 2
}
}
}
}
}
output {
name: "output"
type {
tensor_type {
elem_type: 1
shape {
dim {
dim_value: 3
}
dim {
dim_value: 2
}
dim {
dim_value: 2
}
}
}
}
}
}
opset_import {
domain: ""
version: 13
}
77 changes: 77 additions & 0 deletions ngraph/test/models/onnx/gather_int32_3D_axis_1.prototxt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
ir_version: 7
graph {
node {
input: "data"
input: "indices"
output: "output"
name: "gather"
op_type: "Gather"
attribute {
name: "axis"
i: 1
type: INT
}
}
name: "test-gather8"
input {
name: "data"
type {
tensor_type {
elem_type: 6
shape {
dim {
dim_value: 2
}
dim {
dim_value: 2
}
dim {
dim_value: 2
}
}
}
}
}
input {
name: "indices"
type {
tensor_type {
elem_type: 6
shape {
dim {
dim_value: 4
}
dim {
dim_value: 1
}
}
}
}
}
output {
name: "output"
type {
tensor_type {
elem_type: 6
shape {
dim {
dim_value: 2
}
dim {
dim_value: 4
}
dim {
dim_value: 1
}
dim {
dim_value: 2
}
}
}
}
}
}
opset_import {
domain: ""
version: 13
}
77 changes: 77 additions & 0 deletions ngraph/test/models/onnx/gather_int8_3D_axis_neg_1.prototxt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
ir_version: 7
graph {
node {
input: "data"
input: "indices"
output: "output"
name: "gather"
op_type: "Gather"
attribute {
name: "axis"
i: -1
type: INT
}
}
name: "test-gather8"
input {
name: "data"
type {
tensor_type {
elem_type: 3
shape {
dim {
dim_value: 2
}
dim {
dim_value: 2
}
dim {
dim_value: 2
}
}
}
}
}
input {
name: "indices"
type {
tensor_type {
elem_type: 6
shape {
dim {
dim_value: 4
}
dim {
dim_value: 1
}
}
}
}
}
output {
name: "output"
type {
tensor_type {
elem_type: 3
shape {
dim {
dim_value: 2
}
dim {
dim_value: 2
}
dim {
dim_value: 4
}
dim {
dim_value: 1
}
}
}
}
}
}
opset_import {
domain: ""
version: 13
}
Loading