diff options
author | 2018-08-22 22:55:08 -0700 | |
---|---|---|
committer | 2018-08-22 23:01:04 -0700 | |
commit | 5306e10929e8b5aa05c49d32d4a147ca9786ddfa (patch) | |
tree | 731f964b6727f824925543215a7fc40dc30a3851 /tensorflow | |
parent | 0cb022678a143bd2b41f83fff89a4d2f6d54fd3e (diff) |
Add reduce_any to schema.
PiperOrigin-RevId: 209884688
Diffstat (limited to 'tensorflow')
-rw-r--r-- | tensorflow/contrib/lite/builtin_ops.h | 1 | ||||
-rw-r--r-- | tensorflow/contrib/lite/model.cc | 1 | ||||
-rw-r--r-- | tensorflow/contrib/lite/nnapi_delegate.cc | 1 | ||||
-rw-r--r-- | tensorflow/contrib/lite/schema/schema.fbs | 1 | ||||
-rwxr-xr-x | tensorflow/contrib/lite/schema/schema_generated.h | 9 |
5 files changed, 10 insertions, 3 deletions
diff --git a/tensorflow/contrib/lite/builtin_ops.h b/tensorflow/contrib/lite/builtin_ops.h index c3a2cb834c..9cf4bea73e 100644 --- a/tensorflow/contrib/lite/builtin_ops.h +++ b/tensorflow/contrib/lite/builtin_ops.h @@ -116,6 +116,7 @@ typedef enum { kTfLiteBuiltinUnpack = 88, kTfLiteBuiltinReduceMin = 89, kTfLiteBuiltinFloorDiv = 90, + kTfLiteBuiltinReduceAny = 91, } TfLiteBuiltinOperator; #ifdef __cplusplus diff --git a/tensorflow/contrib/lite/model.cc b/tensorflow/contrib/lite/model.cc index 54f2ba384f..7ca12cb841 100644 --- a/tensorflow/contrib/lite/model.cc +++ b/tensorflow/contrib/lite/model.cc @@ -792,6 +792,7 @@ TfLiteStatus ParseOpData(const Operator* op, BuiltinOperator op_type, case BuiltinOperator_LOGICAL_NOT: case BuiltinOperator_UNPACK: case BuiltinOperator_FLOOR_DIV: + case BuiltinOperator_REDUCE_ANY: break; } return kTfLiteOk; diff --git a/tensorflow/contrib/lite/nnapi_delegate.cc b/tensorflow/contrib/lite/nnapi_delegate.cc index f78259846d..38f3e9881b 100644 --- a/tensorflow/contrib/lite/nnapi_delegate.cc +++ b/tensorflow/contrib/lite/nnapi_delegate.cc @@ -650,6 +650,7 @@ TfLiteStatus AddOpsAndParams( case tflite::BuiltinOperator_LOGICAL_NOT: case tflite::BuiltinOperator_UNPACK: case tflite::BuiltinOperator_FLOOR_DIV: + case tflite::BuiltinOperator_REDUCE_ANY: logError("Op code %d is currently not delegated to NNAPI", builtin); return kTfLiteError; break; diff --git a/tensorflow/contrib/lite/schema/schema.fbs b/tensorflow/contrib/lite/schema/schema.fbs index b93f32989b..cf66403ec9 100644 --- a/tensorflow/contrib/lite/schema/schema.fbs +++ b/tensorflow/contrib/lite/schema/schema.fbs @@ -172,6 +172,7 @@ enum BuiltinOperator : byte { UNPACK = 88, REDUCE_MIN = 89, FLOOR_DIV = 90, + REDUCE_ANY = 91, } // Options for the builtin operators. diff --git a/tensorflow/contrib/lite/schema/schema_generated.h b/tensorflow/contrib/lite/schema/schema_generated.h index 692b653b19..6d9630d75e 100755 --- a/tensorflow/contrib/lite/schema/schema_generated.h +++ b/tensorflow/contrib/lite/schema/schema_generated.h @@ -382,11 +382,12 @@ enum BuiltinOperator { BuiltinOperator_UNPACK = 88, BuiltinOperator_REDUCE_MIN = 89, BuiltinOperator_FLOOR_DIV = 90, + BuiltinOperator_REDUCE_ANY = 91, BuiltinOperator_MIN = BuiltinOperator_ADD, - BuiltinOperator_MAX = BuiltinOperator_FLOOR_DIV + BuiltinOperator_MAX = BuiltinOperator_REDUCE_ANY }; -inline BuiltinOperator (&EnumValuesBuiltinOperator())[90] { +inline BuiltinOperator (&EnumValuesBuiltinOperator())[91] { static BuiltinOperator values[] = { BuiltinOperator_ADD, BuiltinOperator_AVERAGE_POOL_2D, @@ -477,7 +478,8 @@ inline BuiltinOperator (&EnumValuesBuiltinOperator())[90] { BuiltinOperator_LOGICAL_NOT, BuiltinOperator_UNPACK, BuiltinOperator_REDUCE_MIN, - BuiltinOperator_FLOOR_DIV + BuiltinOperator_FLOOR_DIV, + BuiltinOperator_REDUCE_ANY }; return values; } @@ -575,6 +577,7 @@ inline const char **EnumNamesBuiltinOperator() { "UNPACK", "REDUCE_MIN", "FLOOR_DIV", + "REDUCE_ANY", nullptr }; return names; |