diff --git a/tensorflow/lite/micro/all_ops_resolver.h b/tensorflow/lite/micro/all_ops_resolver.h index f39c24ec732..e8105b96e44 100644 --- a/tensorflow/lite/micro/all_ops_resolver.h +++ b/tensorflow/lite/micro/all_ops_resolver.h @@ -26,6 +26,7 @@ class AllOpsResolver : public MicroMutableOpResolver<128> { public: AllOpsResolver(); + private: TF_LITE_REMOVE_VIRTUAL_DELETE }; diff --git a/tensorflow/lite/micro/micro_mutable_op_resolver.h b/tensorflow/lite/micro/micro_mutable_op_resolver.h index def0bbcc8e9..fc13dad637e 100644 --- a/tensorflow/lite/micro/micro_mutable_op_resolver.h +++ b/tensorflow/lite/micro/micro_mutable_op_resolver.h @@ -36,7 +36,6 @@ class MicroMutableOpResolver : public MicroOpResolver { explicit MicroMutableOpResolver(ErrorReporter* error_reporter = nullptr) : error_reporter_(error_reporter) {} - TF_LITE_REMOVE_VIRTUAL_DELETE const TfLiteRegistration* FindOp(tflite::BuiltinOperator op) const override { if (op == BuiltinOperator_CUSTOM) return nullptr; @@ -406,6 +405,8 @@ class MicroMutableOpResolver : public MicroOpResolver { unsigned int GetRegistrationLength() { return registrations_len_; } private: + TF_LITE_REMOVE_VIRTUAL_DELETE + TfLiteStatus AddBuiltin(tflite::BuiltinOperator op, const TfLiteRegistration& registration, MicroOpResolver::BuiltinParseFunction parser) { diff --git a/tensorflow/lite/micro/tools/ci_build/test_x86.sh b/tensorflow/lite/micro/tools/ci_build/test_x86.sh index dfd779a485b..844dccbafb7 100755 --- a/tensorflow/lite/micro/tools/ci_build/test_x86.sh +++ b/tensorflow/lite/micro/tools/ci_build/test_x86.sh @@ -37,6 +37,13 @@ readable_run make -j8 -f tensorflow/lite/micro/tools/make/Makefile BUILD_TYPE=no readable_run make -f tensorflow/lite/micro/tools/make/Makefile clean readable_run make -j8 -f tensorflow/lite/micro/tools/make/Makefile BUILD_TYPE=release build +# Next, build with TAGS=posix. See b/170223867 for more details. +# TODO(b/168123200): Since the benchmarks can not currently be run as a test, we +# only build with TAGS=posix. Once benchmarks can be run (and are added to make +# test) we should switch to running all the tests with TAGS=posix. +readable_run make -f tensorflow/lite/micro/tools/make/Makefile clean +readable_run make -s -j8 -f tensorflow/lite/micro/tools/make/Makefile build TAGS=posix + # Next, build w/o release so that we can run the tests and get additional # debugging info on failures. readable_run make -f tensorflow/lite/micro/tools/make/Makefile clean