From 1ba0f52432dba149cfb7bbbc70efa093913bec59 Mon Sep 17 00:00:00 2001 From: Slava Shklyaev Date: Wed, 19 Sep 2018 16:55:31 +0100 Subject: Add new ops ARGMAX and ARGMIN Bug: 113558658 Test: NeuralNetworksTest_static Change-Id: I8862d4062181689ce69ab65aa07c1b6af07ba567 Merged-In: I8862d4062181689ce69ab65aa07c1b6af07ba567 (cherry picked from commit cc31bd6622f5e01ab640916fbb26433dd4ff9db2) --- neuralnetworks/1.2/types.hal | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/neuralnetworks/1.2/types.hal b/neuralnetworks/1.2/types.hal index 61970f00fd..fc2b540297 100644 --- a/neuralnetworks/1.2/types.hal +++ b/neuralnetworks/1.2/types.hal @@ -26,7 +26,9 @@ import @1.1::OperationType; * The type of an operation in a model. */ enum OperationType : @1.1::OperationType { - + // TODO: Sync docs. + ARGMAX = 38, + ARGMIN = 39, }; /** -- cgit v1.2.3 From 48ac2fbc8ad8073517c8b571b5b2784508de8422 Mon Sep 17 00:00:00 2001 From: Slava Shklyaev Date: Thu, 20 Sep 2018 13:43:37 +0100 Subject: Add new op PAD_V2 Bug: 113561890 Test: NeuralNetworksTest_static Change-Id: I34351d6ff5fae0a13e3e883ca42210c534418ff3 Merged-In: I34351d6ff5fae0a13e3e883ca42210c534418ff3 (cherry picked from commit ffe467e6d863b2b555171df7b2f46676ad46200e) --- neuralnetworks/1.2/types.hal | 1 + 1 file changed, 1 insertion(+) diff --git a/neuralnetworks/1.2/types.hal b/neuralnetworks/1.2/types.hal index fc2b540297..ecd99cc8e2 100644 --- a/neuralnetworks/1.2/types.hal +++ b/neuralnetworks/1.2/types.hal @@ -29,6 +29,7 @@ enum OperationType : @1.1::OperationType { // TODO: Sync docs. ARGMAX = 38, ARGMIN = 39, + PAD_V2 = 40, }; /** -- cgit v1.2.3 From e9814a9890ba9e41b066123aaa1d369c17739f6f Mon Sep 17 00:00:00 2001 From: Przemyslaw Szczepaniak Date: Mon, 24 Sep 2018 14:12:28 +0100 Subject: Reserve enums for new NNAPI ops. Test: NeuralNetworksTest_static Bug: 114365802 Change-Id: I3b379fe3f0336b92ef602bbb12a4bd4a150c573c Merged-In: I3b379fe3f0336b92ef602bbb12a4bd4a150c573c (cherry picked from commit 5a9362eb2d1378636fd8bf604f6536eb2a268d2c) --- neuralnetworks/1.2/types.hal | 46 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/neuralnetworks/1.2/types.hal b/neuralnetworks/1.2/types.hal index ecd99cc8e2..129172d25c 100644 --- a/neuralnetworks/1.2/types.hal +++ b/neuralnetworks/1.2/types.hal @@ -30,6 +30,52 @@ enum OperationType : @1.1::OperationType { ARGMAX = 38, ARGMIN = 39, PAD_V2 = 40, + BBOX_TRANSFORM = 41, + BIDIRECTIONAL_SEQUENCE_LSTM = 42, + BIDIRECTIONAL_SEQUENCE_RNN = 43, + BOX_WITH_NMS_LIMIT = 44, + CAST = 45, + CHANNEL_SHUFFLE = 46, + DETECTION_OUTPUT = 47, + EMBEDDING_LOOKUP_SPARSE = 48, + EXP = 49, + EXPAND_DIMS = 50, + GATHER = 51, + GENERATE_PROPOSALS = 52, + GREATER = 53, + GREATER_EQUAL = 54, + GROUPED_CONV_2D = 55, + HEATMAP_MAX_KEYPOINT = 56, + LESS = 57, + LESS_EQUAL = 58, + LOG = 59, + LOGICAL_AND = 60, + LOGICAL_NOT = 61, + LOGICAL_OR = 62, + LOG_SOFTMAX = 63, + MAXIMUM = 64, + MINIMUM = 65, + NEG = 66, + POW = 67, + PRELU = 68, + PRIOR_BOX = 69, + QUANTIZE = 70, + QUANTIZED_16BIT_LSTM = 71, + RANDOM_MULTINOMIAL = 72, + REDUCE = 73, + ROI_ALIGN = 74, + RSQRT = 75, + SELECT = 76, + SIN = 77, + SLICE = 78, + SPARSE_TO_DENSE = 78, + SPLIT = 79, + SQRT = 80, + TILE = 81, + TOPK_V2 = 82, + TRANSPOSE_CONV_2D = 83, + UNIDIRECTIONAL_SEQUENCE_LSTM = 84, + UNIDIRECTIONAL_SEQUENCE_RNN = 85, }; /** -- cgit v1.2.3 From 26204621d9c0997790aa40ba48a519e992a9c0d1 Mon Sep 17 00:00:00 2001 From: Slava Shklyaev Date: Tue, 25 Sep 2018 16:10:38 +0100 Subject: Attach a bug to syncing docs Bug: 116445845 Test: none Change-Id: I841b1dc503d70efddb8175b75d9d3efe8078eeb1 Merged-In: I841b1dc503d70efddb8175b75d9d3efe8078eeb1 (cherry picked from commit 7f9f46159183b02d53ca8d6bbe728e5610c2ea5a) --- neuralnetworks/1.2/types.hal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neuralnetworks/1.2/types.hal b/neuralnetworks/1.2/types.hal index 129172d25c..0e076f5c5b 100644 --- a/neuralnetworks/1.2/types.hal +++ b/neuralnetworks/1.2/types.hal @@ -26,7 +26,7 @@ import @1.1::OperationType; * The type of an operation in a model. */ enum OperationType : @1.1::OperationType { - // TODO: Sync docs. + // TODO(b/116445845): Sync docs when all ops are implemented. ARGMAX = 38, ARGMIN = 39, PAD_V2 = 40, -- cgit v1.2.3 From 10798158720090f1afe39e3651ba3b573fd6f548 Mon Sep 17 00:00:00 2001 From: Slava Shklyaev Date: Thu, 27 Sep 2018 16:18:54 +0100 Subject: Fix indexing bug in NNAPI Bug: 114365802 Test: n/a Change-Id: I87173528b58f66175c99e7c7e2e66daa307b04da Merged-In: I87173528b58f66175c99e7c7e2e66daa307b04da (cherry picked from commit 4a211d836457e22788010ddd58c8c2f6dd3cfbe7) --- neuralnetworks/1.2/types.hal | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/neuralnetworks/1.2/types.hal b/neuralnetworks/1.2/types.hal index 0e076f5c5b..43771316d8 100644 --- a/neuralnetworks/1.2/types.hal +++ b/neuralnetworks/1.2/types.hal @@ -68,14 +68,14 @@ enum OperationType : @1.1::OperationType { SELECT = 76, SIN = 77, SLICE = 78, - SPARSE_TO_DENSE = 78, - SPLIT = 79, - SQRT = 80, - TILE = 81, - TOPK_V2 = 82, - TRANSPOSE_CONV_2D = 83, - UNIDIRECTIONAL_SEQUENCE_LSTM = 84, - UNIDIRECTIONAL_SEQUENCE_RNN = 85, + SPARSE_TO_DENSE = 79, + SPLIT = 80, + SQRT = 81, + TILE = 82, + TOPK_V2 = 83, + TRANSPOSE_CONV_2D = 84, + UNIDIRECTIONAL_SEQUENCE_LSTM = 85, + UNIDIRECTIONAL_SEQUENCE_RNN = 86, }; /** -- cgit v1.2.3 From a57eb5bcd8c4bc9c99c4de2380d16fb25e4ae0dd Mon Sep 17 00:00:00 2001 From: Miao Wang Date: Thu, 4 Oct 2018 17:16:43 -0700 Subject: Update OWNERS Test: none Change-Id: I96db4de3f34837c9f3174fd01e7d06d3355617f3 Merged-In: I96db4de3f34837c9f3174fd01e7d06d3355617f3 (cherry picked from commit 6653e69dc6385805909df504a93776aae6a6f639) --- neuralnetworks/1.0/vts/OWNERS | 5 +++++ neuralnetworks/1.1/vts/OWNERS | 5 +++++ neuralnetworks/1.2/vts/OWNERS | 2 ++ 3 files changed, 12 insertions(+) diff --git a/neuralnetworks/1.0/vts/OWNERS b/neuralnetworks/1.0/vts/OWNERS index 87e322b51e..b5a8e1f473 100644 --- a/neuralnetworks/1.0/vts/OWNERS +++ b/neuralnetworks/1.0/vts/OWNERS @@ -2,9 +2,14 @@ butlermichael@google.com dgross@google.com jeanluc@google.com +levp@google.com miaowang@google.com mikie@google.com +mks@google.com pszczepaniak@google.com +slavash@google.com +vddang@google.com +xusongw@google.com # VTS team yim@google.com diff --git a/neuralnetworks/1.1/vts/OWNERS b/neuralnetworks/1.1/vts/OWNERS index 87e322b51e..b5a8e1f473 100644 --- a/neuralnetworks/1.1/vts/OWNERS +++ b/neuralnetworks/1.1/vts/OWNERS @@ -2,9 +2,14 @@ butlermichael@google.com dgross@google.com jeanluc@google.com +levp@google.com miaowang@google.com mikie@google.com +mks@google.com pszczepaniak@google.com +slavash@google.com +vddang@google.com +xusongw@google.com # VTS team yim@google.com diff --git a/neuralnetworks/1.2/vts/OWNERS b/neuralnetworks/1.2/vts/OWNERS index 8f254365f6..b5a8e1f473 100644 --- a/neuralnetworks/1.2/vts/OWNERS +++ b/neuralnetworks/1.2/vts/OWNERS @@ -8,6 +8,8 @@ mikie@google.com mks@google.com pszczepaniak@google.com slavash@google.com +vddang@google.com +xusongw@google.com # VTS team yim@google.com -- cgit v1.2.3