From d2e0f03dc45d03290c6e7bce24e598699a70cb1e Mon Sep 17 00:00:00 2001 From: Nat Jeffries Date: Mon, 13 Jan 2020 15:33:08 -0800 Subject: [PATCH] Fix operator versions in all_ops_resolver. Based on op versions listed in https://github.com/tensorflow/tensorflow/blob/master/tensorflow/lite/tools/versioning/op_version.cc. PiperOrigin-RevId: 289533905 Change-Id: I86cbf44116941541872032c5aeaf790846d014ea --- .../lite/micro/kernels/all_ops_resolver.cc | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tensorflow/lite/micro/kernels/all_ops_resolver.cc b/tensorflow/lite/micro/kernels/all_ops_resolver.cc index 4929d2a5cc1..ba725f6056d 100644 --- a/tensorflow/lite/micro/kernels/all_ops_resolver.cc +++ b/tensorflow/lite/micro/kernels/all_ops_resolver.cc @@ -23,9 +23,9 @@ namespace micro { AllOpsResolver::AllOpsResolver() { AddBuiltin(BuiltinOperator_FULLY_CONNECTED, Register_FULLY_CONNECTED(), 1, 4); AddBuiltin(BuiltinOperator_MAX_POOL_2D, Register_MAX_POOL_2D()); - AddBuiltin(BuiltinOperator_SOFTMAX, Register_SOFTMAX()); + AddBuiltin(BuiltinOperator_SOFTMAX, Register_SOFTMAX(), 1, 2); AddBuiltin(BuiltinOperator_LOGISTIC, Register_LOGISTIC()); - AddBuiltin(BuiltinOperator_SVDF, Register_SVDF()); + AddBuiltin(BuiltinOperator_SVDF, Register_SVDF(), 1, 3); AddBuiltin(BuiltinOperator_CONV_2D, Register_CONV_2D(), 1, 3); AddBuiltin(BuiltinOperator_CONCATENATION, Register_CONCATENATION(), 1, 3); AddBuiltin(BuiltinOperator_DEPTHWISE_CONV_2D, Register_DEPTHWISE_CONV_2D(), 1, @@ -48,23 +48,23 @@ AllOpsResolver::AllOpsResolver() { AddBuiltin(BuiltinOperator_LOGICAL_AND, Register_LOGICAL_AND()); AddBuiltin(BuiltinOperator_LOGICAL_NOT, Register_LOGICAL_NOT()); AddBuiltin(BuiltinOperator_RESHAPE, Register_RESHAPE()); - AddBuiltin(BuiltinOperator_EQUAL, Register_EQUAL()); - AddBuiltin(BuiltinOperator_NOT_EQUAL, Register_NOT_EQUAL()); - AddBuiltin(BuiltinOperator_GREATER, Register_GREATER()); - AddBuiltin(BuiltinOperator_GREATER_EQUAL, Register_GREATER_EQUAL()); - AddBuiltin(BuiltinOperator_LESS, Register_LESS()); - AddBuiltin(BuiltinOperator_LESS_EQUAL, Register_LESS_EQUAL()); + AddBuiltin(BuiltinOperator_EQUAL, Register_EQUAL(), 1, 2); + AddBuiltin(BuiltinOperator_NOT_EQUAL, Register_NOT_EQUAL(), 1, 2); + AddBuiltin(BuiltinOperator_GREATER, Register_GREATER(), 1, 2); + AddBuiltin(BuiltinOperator_GREATER_EQUAL, Register_GREATER_EQUAL(), 1, 2); + AddBuiltin(BuiltinOperator_LESS, Register_LESS(), 1, 2); + AddBuiltin(BuiltinOperator_LESS_EQUAL, Register_LESS_EQUAL(), 1, 2); AddBuiltin(BuiltinOperator_CEIL, Register_CEIL()); AddBuiltin(BuiltinOperator_ROUND, Register_ROUND()); AddBuiltin(BuiltinOperator_STRIDED_SLICE, Register_STRIDED_SLICE()); - AddBuiltin(BuiltinOperator_PACK, Register_PACK()); - AddBuiltin(BuiltinOperator_PAD, Register_PAD()); - AddBuiltin(BuiltinOperator_PADV2, Register_PADV2()); + AddBuiltin(BuiltinOperator_PACK, Register_PACK(), 1, 2); + AddBuiltin(BuiltinOperator_PAD, Register_PAD(), 1, 2); + AddBuiltin(BuiltinOperator_PADV2, Register_PADV2(), 1, 2); AddBuiltin(BuiltinOperator_SPLIT, Register_SPLIT(), 1, 3); - AddBuiltin(BuiltinOperator_UNPACK, Register_UNPACK()); + AddBuiltin(BuiltinOperator_UNPACK, Register_UNPACK(), 1, 2); AddBuiltin(BuiltinOperator_NEG, Register_NEG()); - AddBuiltin(BuiltinOperator_ADD, Register_ADD()); - AddBuiltin(BuiltinOperator_MUL, Register_MUL()); + AddBuiltin(BuiltinOperator_ADD, Register_ADD(), 1, 2); + AddBuiltin(BuiltinOperator_MUL, Register_MUL(), 1, 3); AddBuiltin(BuiltinOperator_QUANTIZE, Register_QUANTIZE()); AddBuiltin(BuiltinOperator_DEQUANTIZE, Register_DEQUANTIZE(), 1, 2); AddBuiltin(BuiltinOperator_RELU, Register_RELU());