diff options
| author | Przemyslaw Szczepaniak <pszczepaniak@google.com> | 2018-10-10 13:27:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-10 13:27:42 +0000 |
| commit | f59720c6b85f93d2ddc94244eb66e805ea820636 (patch) | |
| tree | f3874714c1f242fe995bc73dd32a21ba48612e6f | |
| parent | 3a5649ddd5aa3b17e762a6fdde1794f1d7f25859 (diff) | |
| parent | a57eb5bcd8c4bc9c99c4de2380d16fb25e4ae0dd (diff) | |
| download | platform_hardware_interfaces-f59720c6b85f93d2ddc94244eb66e805ea820636.tar.gz platform_hardware_interfaces-f59720c6b85f93d2ddc94244eb66e805ea820636.tar.bz2 platform_hardware_interfaces-f59720c6b85f93d2ddc94244eb66e805ea820636.zip | |
Merge changes from topic "nnapi-cherrypick-from-master-and-pi-dev-to-aosp"
* changes:
Update OWNERS
Fix indexing bug in NNAPI
Attach a bug to syncing docs
Reserve enums for new NNAPI ops.
Add new op PAD_V2
Add new ops ARGMAX and ARGMIN
| -rw-r--r-- | neuralnetworks/1.0/vts/OWNERS | 5 | ||||
| -rw-r--r-- | neuralnetworks/1.1/vts/OWNERS | 5 | ||||
| -rw-r--r-- | neuralnetworks/1.2/types.hal | 51 | ||||
| -rw-r--r-- | neuralnetworks/1.2/vts/OWNERS | 2 |
4 files changed, 62 insertions, 1 deletions
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/types.hal b/neuralnetworks/1.2/types.hal index 61970f00fd..43771316d8 100644 --- a/neuralnetworks/1.2/types.hal +++ b/neuralnetworks/1.2/types.hal @@ -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, }; /** 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 |