Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28a33a9c authored by Xusong Wang's avatar Xusong Wang
Browse files

Clean and reorder operation enums. 

Four operation enums are removed:
- DETECTION_OUTPUT
- PRIOR_BOX
- SPARSE_TO_DENSE
- EMBEDDING_LOOKUP_SPARSE

Operation enums are reorder into alphabetic order.

Bug: 123253865
Bug: 122744669
Test: NeuralNetworksTest_static
Change-Id: Ie5d2bff6fac061bdca0a99e5b8c8ac05733fac4b
parent c02a133f

neuralnetworks/1.2/types.hal

+43 −47
Original line number Diff line number Diff line
@@ -113,17 +113,17 @@ enum OperandTypeRange : uint32_t { 
 */

enum OperationType : @1.1::OperationType {

    // TODO(b/116445845): Sync docs when all ops are implemented.

    ARGMAX = 38,

    ARGMIN = 39,

    PAD_V2 = 40,

    ABS = 38,

    ARGMAX = 39,

    ARGMIN = 40,

    AXIS_ALIGNED_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,

    DETECTION_POSTPROCESSING = 47,

    EQUAL = 48,

    EXP = 49,

    EXPAND_DIMS = 50,

    GATHER = 51,
@@ -132,47 +132,43 @@ enum OperationType : @1.1::OperationType { 
    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_PROD = 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,

    DETECTION_POSTPROCESSING = 87,

    ABS = 88,

    ROI_POOLING = 89,

    EQUAL = 90,

    NOT_EQUAL = 91,

    REDUCE_SUM = 92,

    REDUCE_MAX = 93,

    REDUCE_MIN = 94,

    REDUCE_ANY = 95,

    REDUCE_ALL = 96,

    INSTANCE_NORMALIZATION = 97,

    INSTANCE_NORMALIZATION = 57,

    LESS = 58,

    LESS_EQUAL = 59,

    LOG = 60,

    LOGICAL_AND = 61,

    LOGICAL_NOT = 62,

    LOGICAL_OR = 63,

    LOG_SOFTMAX = 64,

    MAXIMUM = 65,

    MINIMUM = 66,

    NEG = 67,

    NOT_EQUAL = 68,

    PAD_V2 = 69,

    POW = 70,

    PRELU = 71,

    QUANTIZE = 72,

    QUANTIZED_16BIT_LSTM = 73,

    RANDOM_MULTINOMIAL = 74,

    REDUCE_ALL = 75,

    REDUCE_ANY = 76,

    REDUCE_MAX = 77,

    REDUCE_MIN = 78,

    REDUCE_PROD = 79,

    REDUCE_SUM = 80,

    ROI_ALIGN = 81,

    ROI_POOLING = 82,

    RSQRT = 83,

    SELECT = 84,

    SIN = 85,

    SLICE = 86,

    SPLIT = 87,

    SQRT = 88,

    TILE = 89,

    TOPK_V2 = 90,

    TRANSPOSE_CONV_2D = 91,

    UNIDIRECTIONAL_SEQUENCE_LSTM = 92,

    UNIDIRECTIONAL_SEQUENCE_RNN = 93,

    /* ADDING A NEW FUNDAMENTAL OPERATION REQUIRES UPDATING THE VALUE OF

     * OperationTypeRange::OPERATION_FUNDAMENTAL_MAX.

     */
@@ -186,7 +182,7 @@ enum OperationType : @1.1::OperationType { 
 */

enum OperationTypeRange : uint32_t {

    OPERATION_FUNDAMENTAL_MIN = 0,

    OPERATION_FUNDAMENTAL_MAX = 97,

    OPERATION_FUNDAMENTAL_MAX = 93,

    OPERATION_OEM_MIN = 10000,

    OPERATION_OEM_MAX = 10000,

};