Move kTfLiteAbort to micro_context.h (#2072)

BUG=http://b/149795762

tensorflow/lite/micro/kernels/circular_buffer.cc

@@ -99,8 +99,7 @@ TfLiteStatus CircularBufferEval(TfLiteContext* context, TfLiteNode* node) {
   if (--data->cycles_until_run != 0) {
     // Signal the interpreter to end current run if the delay before op invoke
     // has not been reached.
-    // TODO(b/149795762): Add kTfLiteAbort to TfLiteStatus enum.
-    return static_cast<TfLiteStatus>(kTfLiteAbort);
+    return kTfLiteAbort;
   }
 
   data->cycles_until_run = data->cycles_max;

tensorflow/lite/micro/kernels/circular_buffer.h

@@ -30,9 +30,6 @@ extern const int kCircularBufferOutputTensor;
 // Elements in the vectors are ordered alphabetically by parameter name.
 extern const int kCircularBufferCyclesMaxIndex;  // 'cycles_max'
 
-// TODO(b/149795762): Add this to TfLiteStatus enum.
-extern const TfLiteStatus kTfLiteAbort;
-
 // These fields control the stride period of a strided streaming model. This op
 // returns kTfLiteAbort until cycles_until_run-- is zero.  At this time,
 // cycles_until_run is reset to cycles_max.

tensorflow/lite/micro/kernels/circular_buffer_common.cc

@@ -35,9 +35,6 @@ const int kCircularBufferOutputTensor = 0;
 // Elements in the vectors are ordered alphabetically by parameter name.
 const int kCircularBufferCyclesMaxIndex = 0;  // 'cycles_max'
 
-// TODO(b/149795762): Add this to TfLiteStatus enum.
-const TfLiteStatus kTfLiteAbort = static_cast<TfLiteStatus>(-9);
-
 TfLiteStatus CircularBufferPrepare(TfLiteContext* context, TfLiteNode* node) {
   MicroContext* micro_context = GetMicroContext(context);
 

tensorflow/lite/micro/kernels/circular_buffer_test.cc

@@ -27,9 +27,6 @@ namespace {
 
 constexpr int kRunPeriod = 2;
 
-// TODO(b/149795762): Add this to TfLiteStatus enum.
-const TfLiteStatus kTfLiteAbort = static_cast<TfLiteStatus>(-9);
-
 }  // namespace
 }  // namespace testing
 }  // namespace tflite
@@ -102,7 +99,7 @@ TF_LITE_MICRO_TEST(OutputTensorLength4) {
     if (i % tflite::testing::kRunPeriod == tflite::testing::kRunPeriod - 1) {
       TF_LITE_MICRO_EXPECT_EQ(kTfLiteOk, status);
     } else {
-      TF_LITE_MICRO_EXPECT_EQ(tflite::testing::kTfLiteAbort, status);
+      TF_LITE_MICRO_EXPECT_EQ(tflite::kTfLiteAbort, status);
     }
   }
 }

tensorflow/lite/micro/micro_context.h

@@ -21,6 +21,9 @@ limitations under the License.
 #include "tensorflow/lite/micro/micro_graph.h"
 
 namespace tflite {
+// TODO(b/149795762): kTfLiteAbort cannot be part of the tflite TfLiteStatus.
+const TfLiteStatus kTfLiteAbort = static_cast<TfLiteStatus>(15);
+
 // MicroContext is eventually going to become the API between TFLM and the
 // kernels, replacing all the functions in TfLiteContext. The end state is code
 // kernels to have code like: