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

Commit ed85890b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Clean and reorder operation enums."

parents ee40679a 28a33a9c
Loading
Loading
Loading
Loading
+43 −47
Original line number Original line Diff line number Diff line
@@ -114,17 +114,17 @@ enum OperandTypeRange : uint32_t {
 */
 */
enum OperationType : @1.1::OperationType {
enum OperationType : @1.1::OperationType {
    // TODO(b/116445845): Sync docs when all ops are implemented.
    // TODO(b/116445845): Sync docs when all ops are implemented.
    ARGMAX = 38,
    ABS = 38,
    ARGMIN = 39,
    ARGMAX = 39,
    PAD_V2 = 40,
    ARGMIN = 40,
    AXIS_ALIGNED_BBOX_TRANSFORM = 41,
    AXIS_ALIGNED_BBOX_TRANSFORM = 41,
    BIDIRECTIONAL_SEQUENCE_LSTM = 42,
    BIDIRECTIONAL_SEQUENCE_LSTM = 42,
    BIDIRECTIONAL_SEQUENCE_RNN = 43,
    BIDIRECTIONAL_SEQUENCE_RNN = 43,
    BOX_WITH_NMS_LIMIT = 44,
    BOX_WITH_NMS_LIMIT = 44,
    CAST = 45,
    CAST = 45,
    CHANNEL_SHUFFLE = 46,
    CHANNEL_SHUFFLE = 46,
    DETECTION_OUTPUT = 47,
    DETECTION_POSTPROCESSING = 47,
    EMBEDDING_LOOKUP_SPARSE = 48,
    EQUAL = 48,
    EXP = 49,
    EXP = 49,
    EXPAND_DIMS = 50,
    EXPAND_DIMS = 50,
    GATHER = 51,
    GATHER = 51,
@@ -133,47 +133,43 @@ enum OperationType : @1.1::OperationType {
    GREATER_EQUAL = 54,
    GREATER_EQUAL = 54,
    GROUPED_CONV_2D = 55,
    GROUPED_CONV_2D = 55,
    HEATMAP_MAX_KEYPOINT = 56,
    HEATMAP_MAX_KEYPOINT = 56,
    LESS = 57,
    INSTANCE_NORMALIZATION = 57,
    LESS_EQUAL = 58,
    LESS = 58,
    LOG = 59,
    LESS_EQUAL = 59,
    LOGICAL_AND = 60,
    LOG = 60,
    LOGICAL_NOT = 61,
    LOGICAL_AND = 61,
    LOGICAL_OR = 62,
    LOGICAL_NOT = 62,
    LOG_SOFTMAX = 63,
    LOGICAL_OR = 63,
    MAXIMUM = 64,
    LOG_SOFTMAX = 64,
    MINIMUM = 65,
    MAXIMUM = 65,
    NEG = 66,
    MINIMUM = 66,
    POW = 67,
    NEG = 67,
    PRELU = 68,
    NOT_EQUAL = 68,
    PRIOR_BOX = 69,
    PAD_V2 = 69,
    QUANTIZE = 70,
    POW = 70,
    QUANTIZED_16BIT_LSTM = 71,
    PRELU = 71,
    RANDOM_MULTINOMIAL = 72,
    QUANTIZE = 72,
    REDUCE_PROD = 73,
    QUANTIZED_16BIT_LSTM = 73,
    ROI_ALIGN = 74,
    RANDOM_MULTINOMIAL = 74,
    RSQRT = 75,
    REDUCE_ALL = 75,
    SELECT = 76,
    REDUCE_ANY = 76,
    SIN = 77,
    REDUCE_MAX = 77,
    SLICE = 78,
    REDUCE_MIN = 78,
    SPARSE_TO_DENSE = 79,
    REDUCE_PROD = 79,
    SPLIT = 80,
    REDUCE_SUM = 80,
    SQRT = 81,
    ROI_ALIGN = 81,
    TILE = 82,
    ROI_POOLING = 82,
    TOPK_V2 = 83,
    RSQRT = 83,
    TRANSPOSE_CONV_2D = 84,
    SELECT = 84,
    UNIDIRECTIONAL_SEQUENCE_LSTM = 85,
    SIN = 85,
    UNIDIRECTIONAL_SEQUENCE_RNN = 86,
    SLICE = 86,
    DETECTION_POSTPROCESSING = 87,
    SPLIT = 87,
    ABS = 88,
    SQRT = 88,
    ROI_POOLING = 89,
    TILE = 89,
    EQUAL = 90,
    TOPK_V2 = 90,
    NOT_EQUAL = 91,
    TRANSPOSE_CONV_2D = 91,
    REDUCE_SUM = 92,
    UNIDIRECTIONAL_SEQUENCE_LSTM = 92,
    REDUCE_MAX = 93,
    UNIDIRECTIONAL_SEQUENCE_RNN = 93,
    REDUCE_MIN = 94,
    REDUCE_ANY = 95,
    REDUCE_ALL = 96,
    INSTANCE_NORMALIZATION = 97,
    /* ADDING A NEW FUNDAMENTAL OPERATION REQUIRES UPDATING THE VALUE OF
    /* ADDING A NEW FUNDAMENTAL OPERATION REQUIRES UPDATING THE VALUE OF
     * OperationTypeRange::OPERATION_FUNDAMENTAL_MAX.
     * OperationTypeRange::OPERATION_FUNDAMENTAL_MAX.
     */
     */
@@ -187,7 +183,7 @@ enum OperationType : @1.1::OperationType {
 */
 */
enum OperationTypeRange : uint32_t {
enum OperationTypeRange : uint32_t {
    OPERATION_FUNDAMENTAL_MIN = 0,
    OPERATION_FUNDAMENTAL_MIN = 0,
    OPERATION_FUNDAMENTAL_MAX = 97,
    OPERATION_FUNDAMENTAL_MAX = 93,
    OPERATION_OEM_MIN = 10000,
    OPERATION_OEM_MIN = 10000,
    OPERATION_OEM_MAX = 10000,
    OPERATION_OEM_MAX = 10000,
};
};