Skip to content

Commit

Permalink
(Mostly) Remove operator version support in TfLite Micro.
Browse files Browse the repository at this point in the history 
Only one op registration of a particular type can be added and that same op
registration is returned via FindOp. The version number still exists in the API
for backwards compatibility as well as compatibility with TfLite but is
irrelevant for TfLiteMicro after this change.

AddBuiltin/AddCustom API with min and max version params is removed.

This is a step towards completely removing operator versioning from TFLiteMicro.

PiperOrigin-RevId: 313882723
Change-Id: I2bfa8dcee69226d498597b6d0dbfc67c60641a48
  • Loading branch information
@advaitjain @tensorflower-gardener
advaitjain authored and tensorflower-gardener committed May 30, 2020
1 parent ea8070d commit 3ebdec4
Show file tree
Hide file tree
Showing 45 changed files with 258 additions and 346 deletions.
2 changes: 1 addition & 1 deletion tensorflow/lite/micro/benchmarks/keyword_benchmark.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class KeywordRunner {
resolver_.AddBuiltin(tflite::BuiltinOperator_QUANTIZE,
tflite::ops::micro::Register_QUANTIZE());
resolver_.AddBuiltin(tflite::BuiltinOperator_DEQUANTIZE,
tflite::ops::micro::Register_DEQUANTIZE(), 1, 2);
tflite::ops::micro::Register_DEQUANTIZE());
resolver_.AddBuiltin(tflite::BuiltinOperator_SOFTMAX,
tflite::ops::micro::Register_SOFTMAX());
interpreter_.AllocateTensors();
Expand Down
15 changes: 7 additions & 8 deletions tensorflow/lite/micro/examples/person_detection_experimental/main_functions.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,19 +72,18 @@ void setup() {
//
// tflite::ops::micro::AllOpsResolver resolver;
// NOLINTNEXTLINE(runtime-global-variables)
static tflite::MicroMutableOpResolver<12> micro_op_resolver;
micro_op_resolver.AddBuiltin(tflite::BuiltinOperator_DEPTHWISE_CONV_2D,
tflite::ops::micro::Register_DEPTHWISE_CONV_2D(),
1, 3);
static tflite::MicroMutableOpResolver<5> micro_op_resolver;
micro_op_resolver.AddBuiltin(
tflite::BuiltinOperator_DEPTHWISE_CONV_2D,
tflite::ops::micro::Register_DEPTHWISE_CONV_2D());
micro_op_resolver.AddBuiltin(tflite::BuiltinOperator_CONV_2D,
tflite::ops::micro::Register_CONV_2D(), 1, 3);
tflite::ops::micro::Register_CONV_2D());
micro_op_resolver.AddBuiltin(tflite::BuiltinOperator_AVERAGE_POOL_2D,
tflite::ops::micro::Register_AVERAGE_POOL_2D(),
1, 2);
tflite::ops::micro::Register_AVERAGE_POOL_2D());
micro_op_resolver.AddBuiltin(tflite::BuiltinOperator_RESHAPE,
tflite::ops::micro::Register_RESHAPE());
micro_op_resolver.AddBuiltin(tflite::BuiltinOperator_SOFTMAX,
tflite::ops::micro::Register_SOFTMAX(), 1, 3);
tflite::ops::micro::Register_SOFTMAX());

// Build an interpreter to run the model with.
// NOLINTNEXTLINE(runtime-global-variables)
Expand Down
15 changes: 7 additions & 8 deletions tensorflow/lite/micro/examples/person_detection_experimental/person_detection_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,19 +52,18 @@ TF_LITE_MICRO_TEST(TestInvoke) {
// An easier approach is to just use the AllOpsResolver, but this will
// incur some penalty in code space for op implementations that are not
// needed by this graph.
tflite::MicroMutableOpResolver<11> micro_op_resolver;
micro_op_resolver.AddBuiltin(tflite::BuiltinOperator_DEPTHWISE_CONV_2D,
tflite::ops::micro::Register_DEPTHWISE_CONV_2D(),
1, 3);
tflite::MicroMutableOpResolver<5> micro_op_resolver;
micro_op_resolver.AddBuiltin(
tflite::BuiltinOperator_DEPTHWISE_CONV_2D,
tflite::ops::micro::Register_DEPTHWISE_CONV_2D());
micro_op_resolver.AddBuiltin(tflite::BuiltinOperator_CONV_2D,
tflite::ops::micro::Register_CONV_2D(), 1, 3);
tflite::ops::micro::Register_CONV_2D());
micro_op_resolver.AddBuiltin(tflite::BuiltinOperator_AVERAGE_POOL_2D,
tflite::ops::micro::Register_AVERAGE_POOL_2D(),
1, 2);
tflite::ops::micro::Register_AVERAGE_POOL_2D());
micro_op_resolver.AddBuiltin(tflite::BuiltinOperator_RESHAPE,
tflite::ops::micro::Register_RESHAPE());
micro_op_resolver.AddBuiltin(tflite::BuiltinOperator_SOFTMAX,
tflite::ops::micro::Register_SOFTMAX(), 1, 2);
tflite::ops::micro::Register_SOFTMAX());

// Build an interpreter to run the model with.
tflite::MicroInterpreter interpreter(model, micro_op_resolver, tensor_arena,
Expand Down
12 changes: 6 additions & 6 deletions tensorflow/lite/micro/kernels/activations_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ void TestReluFloat(const int* input_dims_data, const float* input_data,

::tflite::ops::micro::AllOpsResolver resolver;
const TfLiteRegistration* registration =
resolver.FindOp(tflite::BuiltinOperator_RELU, 1);
resolver.FindOp(tflite::BuiltinOperator_RELU);
TF_LITE_MICRO_EXPECT_NE(nullptr, registration);

const char* init_data = nullptr;
Expand Down Expand Up @@ -99,7 +99,7 @@ void TestRelu6Float(const int* input_dims_data, const float* input_data,

::tflite::ops::micro::AllOpsResolver resolver;
const TfLiteRegistration* registration =
resolver.FindOp(tflite::BuiltinOperator_RELU6, 1);
resolver.FindOp(tflite::BuiltinOperator_RELU6);
TF_LITE_MICRO_EXPECT_NE(nullptr, registration);

const char* init_data = nullptr;
Expand Down Expand Up @@ -160,7 +160,7 @@ void TestReluUint8(const int* input_dims_data, const float* input_data,

::tflite::ops::micro::AllOpsResolver resolver;
const TfLiteRegistration* registration =
resolver.FindOp(tflite::BuiltinOperator_RELU, 1);
resolver.FindOp(tflite::BuiltinOperator_RELU);
TF_LITE_MICRO_EXPECT_NE(nullptr, registration);

const char* init_data = nullptr;
Expand Down Expand Up @@ -225,7 +225,7 @@ void TestRelu6Uint8(const int* input_dims_data, const float* input_data,

::tflite::ops::micro::AllOpsResolver resolver;
const TfLiteRegistration* registration =
resolver.FindOp(tflite::BuiltinOperator_RELU6, 1);
resolver.FindOp(tflite::BuiltinOperator_RELU6);
TF_LITE_MICRO_EXPECT_NE(nullptr, registration);

const char* init_data = nullptr;
Expand Down Expand Up @@ -289,7 +289,7 @@ void TestReluInt8(const int* input_dims_data, const float* input_data,

::tflite::ops::micro::AllOpsResolver resolver;
const TfLiteRegistration* registration =
resolver.FindOp(tflite::BuiltinOperator_RELU, 1);
resolver.FindOp(tflite::BuiltinOperator_RELU);
TF_LITE_MICRO_EXPECT_NE(nullptr, registration);

const char* init_data = nullptr;
Expand Down Expand Up @@ -355,7 +355,7 @@ void TestRelu6Int8(const int* input_dims_data, const float* input_data,

::tflite::ops::micro::AllOpsResolver resolver;
const TfLiteRegistration* registration =
resolver.FindOp(tflite::BuiltinOperator_RELU6, 1);
resolver.FindOp(tflite::BuiltinOperator_RELU6);
TF_LITE_MICRO_EXPECT_NE(nullptr, registration);

const char* init_data = nullptr;
Expand Down
2 changes: 1 addition & 1 deletion tensorflow/lite/micro/kernels/add_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ void ValidateAddGoldens(TfLiteTensor* tensors, int tensors_size,

::tflite::ops::micro::AllOpsResolver resolver;
const TfLiteRegistration* registration =
resolver.FindOp(::tflite::BuiltinOperator_ADD, 1);
resolver.FindOp(::tflite::BuiltinOperator_ADD);

TF_LITE_MICRO_EXPECT_NE(nullptr, registration);

Expand Down
90 changes: 43 additions & 47 deletions tensorflow/lite/micro/kernels/all_ops_resolver.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,65 +18,61 @@ namespace tflite {
namespace ops {
namespace micro {

// Register each supported op with:
// AddBuiltin(<operator ID>, <registration>, [min version], [max version])
AllOpsResolver::AllOpsResolver() {
AddBuiltin(BuiltinOperator_FULLY_CONNECTED, Register_FULLY_CONNECTED(), 1, 4);
AddBuiltin(BuiltinOperator_MAX_POOL_2D, Register_MAX_POOL_2D(), 1, 2);
AddBuiltin(BuiltinOperator_SOFTMAX, Register_SOFTMAX(), 1, 2);
AddBuiltin(BuiltinOperator_LOGISTIC, Register_LOGISTIC(), 1, 2);
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,
3);
AddBuiltin(BuiltinOperator_AVERAGE_POOL_2D, Register_AVERAGE_POOL_2D(), 1, 2);
// Please keep this list of Builtin Operators in alphabetical order.
AddBuiltin(BuiltinOperator_ABS, Register_ABS());
AddBuiltin(BuiltinOperator_SIN, Register_SIN());
AddBuiltin(BuiltinOperator_COS, Register_COS());
AddBuiltin(BuiltinOperator_LOG, Register_LOG());
AddBuiltin(BuiltinOperator_SQRT, Register_SQRT());
AddBuiltin(BuiltinOperator_RSQRT, Register_RSQRT());
AddBuiltin(BuiltinOperator_SQUARE, Register_SQUARE());
AddBuiltin(BuiltinOperator_PRELU, Register_PRELU());
AddBuiltin(BuiltinOperator_FLOOR, Register_FLOOR());
AddBuiltin(BuiltinOperator_MAXIMUM, Register_MAXIMUM());
AddBuiltin(BuiltinOperator_MINIMUM, Register_MINIMUM());
AddBuiltin(BuiltinOperator_ADD, Register_ADD());
AddBuiltin(BuiltinOperator_ARG_MAX, Register_ARG_MAX());
AddBuiltin(BuiltinOperator_ARG_MIN, Register_ARG_MIN());
AddBuiltin(BuiltinOperator_LOGICAL_OR, Register_LOGICAL_OR());
AddBuiltin(BuiltinOperator_AVERAGE_POOL_2D, Register_AVERAGE_POOL_2D());
AddBuiltin(BuiltinOperator_CEIL, Register_CEIL());
AddBuiltin(BuiltinOperator_CONCATENATION, Register_CONCATENATION());
AddBuiltin(BuiltinOperator_CONV_2D, Register_CONV_2D());
AddBuiltin(BuiltinOperator_COS, Register_COS());
AddBuiltin(BuiltinOperator_DEPTHWISE_CONV_2D, Register_DEPTHWISE_CONV_2D());
AddBuiltin(BuiltinOperator_DEQUANTIZE, Register_DEQUANTIZE());
AddBuiltin(BuiltinOperator_EQUAL, Register_EQUAL());
AddBuiltin(BuiltinOperator_FLOOR, Register_FLOOR());
AddBuiltin(BuiltinOperator_FULLY_CONNECTED, Register_FULLY_CONNECTED());
AddBuiltin(BuiltinOperator_GREATER, Register_GREATER());
AddBuiltin(BuiltinOperator_GREATER_EQUAL, Register_GREATER_EQUAL());
AddBuiltin(BuiltinOperator_L2_NORMALIZATION, Register_L2_NORMALIZATION());
AddBuiltin(BuiltinOperator_LESS, Register_LESS());
AddBuiltin(BuiltinOperator_LESS_EQUAL, Register_LESS_EQUAL());
AddBuiltin(BuiltinOperator_LOG, Register_LOG());
AddBuiltin(BuiltinOperator_LOGICAL_AND, Register_LOGICAL_AND());
AddBuiltin(BuiltinOperator_LOGICAL_NOT, Register_LOGICAL_NOT());
AddBuiltin(BuiltinOperator_RESHAPE, Register_RESHAPE());
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(), 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(), 1, 2);
AddBuiltin(BuiltinOperator_LOGICAL_OR, Register_LOGICAL_OR());
AddBuiltin(BuiltinOperator_LOGISTIC, Register_LOGISTIC());
AddBuiltin(BuiltinOperator_MAX_POOL_2D, Register_MAX_POOL_2D());
AddBuiltin(BuiltinOperator_MAXIMUM, Register_MAXIMUM());
AddBuiltin(BuiltinOperator_MEAN, Register_MEAN());
AddBuiltin(BuiltinOperator_MINIMUM, Register_MINIMUM());
AddBuiltin(BuiltinOperator_MUL, Register_MUL());
AddBuiltin(BuiltinOperator_NEG, Register_NEG());
AddBuiltin(BuiltinOperator_ADD, Register_ADD(), 1, 2);
AddBuiltin(BuiltinOperator_MUL, Register_MUL(), 1, 3);
AddBuiltin(BuiltinOperator_SUB, Register_SUB(), 1, 2);
AddBuiltin(BuiltinOperator_NOT_EQUAL, Register_NOT_EQUAL());
AddBuiltin(BuiltinOperator_PACK, Register_PACK());
AddBuiltin(BuiltinOperator_PAD, Register_PAD());
AddBuiltin(BuiltinOperator_PADV2, Register_PADV2());
AddBuiltin(BuiltinOperator_PRELU, Register_PRELU());
AddBuiltin(BuiltinOperator_QUANTIZE, Register_QUANTIZE());
AddBuiltin(BuiltinOperator_DEQUANTIZE, Register_DEQUANTIZE(), 1, 2);
AddBuiltin(BuiltinOperator_RELU, Register_RELU());
AddBuiltin(BuiltinOperator_RELU6, Register_RELU6());
AddBuiltin(BuiltinOperator_MEAN, Register_MEAN());
AddBuiltin(BuiltinOperator_RESHAPE, Register_RESHAPE());
AddBuiltin(BuiltinOperator_RESIZE_NEAREST_NEIGHBOR,
Register_RESIZE_NEAREST_NEIGHBOR(),
/* min_version = */ 1,
/* max_version = */ 2);
AddBuiltin(BuiltinOperator_L2_NORMALIZATION, Register_L2_NORMALIZATION());
Register_RESIZE_NEAREST_NEIGHBOR());
AddBuiltin(BuiltinOperator_ROUND, Register_ROUND());
AddBuiltin(BuiltinOperator_RSQRT, Register_RSQRT());
AddBuiltin(BuiltinOperator_SIN, Register_SIN());
AddBuiltin(BuiltinOperator_SOFTMAX, Register_SOFTMAX());
AddBuiltin(BuiltinOperator_SPLIT, Register_SPLIT());
AddBuiltin(BuiltinOperator_SQRT, Register_SQRT());
AddBuiltin(BuiltinOperator_SQUARE, Register_SQUARE());
AddBuiltin(BuiltinOperator_STRIDED_SLICE, Register_STRIDED_SLICE());
AddBuiltin(BuiltinOperator_SUB, Register_SUB());
AddBuiltin(BuiltinOperator_SVDF, Register_SVDF());
AddBuiltin(BuiltinOperator_TANH, Register_TANH());
AddBuiltin(BuiltinOperator_UNPACK, Register_UNPACK());
}

} // namespace micro
Expand Down
2 changes: 1 addition & 1 deletion tensorflow/lite/micro/kernels/arc_mli/conv_slicing_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ TfLiteStatus ValidateConvGoldens(TfLiteTensor* tensors, int tensors_size,
::tflite::ops::micro::AllOpsResolver resolver;

const TfLiteRegistration* registration =
resolver.FindOp(tflite::BuiltinOperator_CONV_2D, 1);
resolver.FindOp(tflite::BuiltinOperator_CONV_2D);

TF_LITE_MICRO_EXPECT_NE(nullptr, registration);

Expand Down
2 changes: 1 addition & 1 deletion tensorflow/lite/micro/kernels/arc_mli/depthwise_conv_slicing_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ TfLiteStatus ValidateDepthwiseConvGoldens(const T* expected_output_data,

::tflite::ops::micro::AllOpsResolver resolver;
const TfLiteRegistration* registration =
resolver.FindOp(tflite::BuiltinOperator_DEPTHWISE_CONV_2D, 1);
resolver.FindOp(tflite::BuiltinOperator_DEPTHWISE_CONV_2D);
TF_LITE_MICRO_EXPECT_NE(nullptr, registration);

int input_depth = tensors[0].dims->data[3];
Expand Down
4 changes: 2 additions & 2 deletions tensorflow/lite/micro/kernels/arc_mli/pooling_slicing_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ void TestAveragePoolingQuantized(

::tflite::ops::micro::AllOpsResolver resolver;
const TfLiteRegistration* registration =
resolver.FindOp(tflite::BuiltinOperator_AVERAGE_POOL_2D, 1);
resolver.FindOp(tflite::BuiltinOperator_AVERAGE_POOL_2D);
TF_LITE_MICRO_EXPECT_NE(nullptr, registration);

TfLitePoolParams builtin_data = {padding, stride_width, stride_height,
Expand Down Expand Up @@ -133,7 +133,7 @@ void TestMaxPoolQuantized(const int* input_dims_data, const T* input_data,

::tflite::ops::micro::AllOpsResolver resolver;
const TfLiteRegistration* registration =
resolver.FindOp(tflite::BuiltinOperator_MAX_POOL_2D, 1);
resolver.FindOp(tflite::BuiltinOperator_MAX_POOL_2D);
TF_LITE_MICRO_EXPECT_NE(nullptr, registration);

TfLitePoolParams builtin_data = {
Expand Down
4 changes: 2 additions & 2 deletions tensorflow/lite/micro/kernels/arg_min_max_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ void ValidateArgMinMaxGoldens(TfLiteTensor* tensors, int tensors_size,
::tflite::ops::micro::AllOpsResolver resolver;
const TfLiteRegistration* registration;
if (using_min) {
registration = resolver.FindOp(tflite::BuiltinOperator_ARG_MIN, 1);
registration = resolver.FindOp(tflite::BuiltinOperator_ARG_MIN);
} else {
registration = resolver.FindOp(tflite::BuiltinOperator_ARG_MAX, 1);
registration = resolver.FindOp(tflite::BuiltinOperator_ARG_MAX);
}
TF_LITE_MICRO_EXPECT_NE(nullptr, registration);

Expand Down
2 changes: 1 addition & 1 deletion tensorflow/lite/micro/kernels/ceil_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ void TestCeil(const int* input_dims_data, const float* input_data,
PopulateContext(tensors, tensors_size, micro_test::reporter, &context);
::tflite::ops::micro::AllOpsResolver resolver;
const TfLiteRegistration* registration =
resolver.FindOp(tflite::BuiltinOperator_CEIL, 1);
resolver.FindOp(tflite::BuiltinOperator_CEIL);
TF_LITE_MICRO_EXPECT_NE(nullptr, registration);

int inputs_array_data[] = {1, 0};
Expand Down
2 changes: 1 addition & 1 deletion tensorflow/lite/micro/kernels/comparisons_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ void TestComparison(tflite::BuiltinOperator op, TfLiteTensor* tensors,
PopulateContext(tensors, tensors_size, micro_test::reporter, &context);

::tflite::ops::micro::AllOpsResolver resolver;
const TfLiteRegistration* registration = resolver.FindOp(op, 1);
const TfLiteRegistration* registration = resolver.FindOp(op);
TF_LITE_MICRO_EXPECT_NE(nullptr, registration);

const int inputs_array_data[] = {2, 0, 1};
Expand Down
4 changes: 2 additions & 2 deletions tensorflow/lite/micro/kernels/concatenation_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ void TestConcatenateTwoInputs(std::initializer_list<int> input1_dims_data,

::tflite::ops::micro::AllOpsResolver resolver;
const TfLiteRegistration* registration =
resolver.FindOp(tflite::BuiltinOperator_CONCATENATION, /* version */ 1);
resolver.FindOp(tflite::BuiltinOperator_CONCATENATION);
TF_LITE_MICRO_EXPECT_NE(nullptr, registration);

TfLiteConcatenationParams builtin_data = {
Expand Down Expand Up @@ -111,7 +111,7 @@ void TestConcatenateQuantizedTwoInputs(

::tflite::ops::micro::AllOpsResolver resolver;
const TfLiteRegistration* registration =
resolver.FindOp(tflite::BuiltinOperator_CONCATENATION, /* version */ 1);
resolver.FindOp(tflite::BuiltinOperator_CONCATENATION);
TF_LITE_MICRO_EXPECT_NE(nullptr, registration);

TfLiteConcatenationParams builtin_data = {
Expand Down
2 changes: 1 addition & 1 deletion tensorflow/lite/micro/kernels/conv_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ TfLiteStatus ValidateConvGoldens(TfLiteTensor* tensors, int tensors_size,
::tflite::ops::micro::AllOpsResolver resolver;

const TfLiteRegistration* registration =
resolver.FindOp(tflite::BuiltinOperator_CONV_2D, 1);
resolver.FindOp(tflite::BuiltinOperator_CONV_2D);

TF_LITE_MICRO_EXPECT_NE(nullptr, registration);

Expand Down
2 changes: 1 addition & 1 deletion tensorflow/lite/micro/kernels/depthwise_conv_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ TfLiteStatus ValidateDepthwiseConvGoldens(const T* expected_output_data,

::tflite::ops::micro::AllOpsResolver resolver;
const TfLiteRegistration* registration =
resolver.FindOp(tflite::BuiltinOperator_DEPTHWISE_CONV_2D, 1);
resolver.FindOp(tflite::BuiltinOperator_DEPTHWISE_CONV_2D);
TF_LITE_MICRO_EXPECT_NE(nullptr, registration);

int input_depth = tensors[0].dims->data[3];
Expand Down
3 changes: 1 addition & 2 deletions tensorflow/lite/micro/kernels/dequantize_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,8 @@ void ValidateDequantizeGoldens(TfLiteTensor* tensors, int tensors_size,
::tflite::ops::micro::AllOpsResolver resolver;
PopulateContext(tensors, tensors_size, micro_test::reporter, &context);

// Version 2 of dequantize supports int8 quantization.
const TfLiteRegistration* registration =
resolver.FindOp(tflite::BuiltinOperator_DEQUANTIZE, 2);
resolver.FindOp(tflite::BuiltinOperator_DEQUANTIZE);

TF_LITE_MICRO_EXPECT_NE(nullptr, registration);

Expand Down
6 changes: 2 additions & 4 deletions tensorflow/lite/micro/kernels/elementwise_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ void TestElementwiseFloat(tflite::BuiltinOperator op,
TfLiteContext context;
PopulateContext(tensors, tensors_size, micro_test::reporter, &context);
tflite::ops::micro::AllOpsResolver resolver;
const TfLiteRegistration* registration =
resolver.FindOp(op, /* version= */ 1);
const TfLiteRegistration* registration = resolver.FindOp(op);
TF_LITE_MICRO_EXPECT_NE(nullptr, registration);

void* user_data = nullptr;
Expand Down Expand Up @@ -113,8 +112,7 @@ void TestElementwiseBool(tflite::BuiltinOperator op,
TfLiteContext context;
PopulateContext(tensors, tensors_size, micro_test::reporter, &context);
tflite::ops::micro::AllOpsResolver resolver;
const TfLiteRegistration* registration =
resolver.FindOp(op, /* version= */ 1);
const TfLiteRegistration* registration = resolver.FindOp(op);
TF_LITE_MICRO_EXPECT_NE(nullptr, registration);

void* user_data = nullptr;
Expand Down
2 changes: 1 addition & 1 deletion tensorflow/lite/micro/kernels/floor_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ void TestFloor(const int* input_dims_data, const float* input_data,
PopulateContext(tensors, tensors_size, micro_test::reporter, &context);
::tflite::ops::micro::AllOpsResolver resolver;
const TfLiteRegistration* registration =
resolver.FindOp(tflite::BuiltinOperator_FLOOR, 1);
resolver.FindOp(tflite::BuiltinOperator_FLOOR);
TF_LITE_MICRO_EXPECT_NE(nullptr, registration);

int inputs_array_data[] = {1, 0};
Expand Down
4 changes: 2 additions & 2 deletions tensorflow/lite/micro/kernels/fully_connected_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ TfLiteStatus TestFullyConnectedFloat(

::tflite::ops::micro::AllOpsResolver resolver;
const TfLiteRegistration* registration =
resolver.FindOp(tflite::BuiltinOperator_FULLY_CONNECTED, 1);
resolver.FindOp(tflite::BuiltinOperator_FULLY_CONNECTED);
TF_LITE_MICRO_EXPECT_NE(nullptr, registration);

TfLiteFullyConnectedParams builtin_data = {
Expand Down Expand Up @@ -135,7 +135,7 @@ TfLiteStatus TestFullyConnectedQuantized(

::tflite::ops::micro::AllOpsResolver resolver;
const TfLiteRegistration* registration =
resolver.FindOp(tflite::BuiltinOperator_FULLY_CONNECTED, 4);
resolver.FindOp(tflite::BuiltinOperator_FULLY_CONNECTED);
TF_LITE_MICRO_EXPECT_NE(nullptr, registration);

TfLiteFullyConnectedParams builtin_data = {
Expand Down
Loading

0 comments on commit 3ebdec4

Please sign in to comment.