Merge changes from topic "nnapi-cherrypick-from-master-and-pi-dev-to-aosp" am: f59720c6b8

am: 944d14c473

Change-Id: I6ab20b77cc91a39e406b68fa45977b5c60b35ee7
This commit is contained in:
Przemyslaw Szczepaniak
2018-10-10 07:16:57 -07:00
committed by android-build-merger
4 changed files with 62 additions and 1 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -26,7 +26,56 @@ import @1.1::OperationType;
* The type of an operation in a model.
*/
enum OperationType : @1.1::OperationType {
// TODO(b/116445845): Sync docs when all ops are implemented.
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 = 79,
SPLIT = 80,
SQRT = 81,
TILE = 82,
TOPK_V2 = 83,
TRANSPOSE_CONV_2D = 84,
UNIDIRECTIONAL_SEQUENCE_LSTM = 85,
UNIDIRECTIONAL_SEQUENCE_RNN = 86,
};
/**

View File

@@ -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