diff --git a/tensorflow_serving/servables/tensorflow/saved_model_bundle_factory.cc b/tensorflow_serving/servables/tensorflow/saved_model_bundle_factory.cc index 689b24382c0..f21f8e78f4b 100644 --- a/tensorflow_serving/servables/tensorflow/saved_model_bundle_factory.cc +++ b/tensorflow_serving/servables/tensorflow/saved_model_bundle_factory.cc @@ -67,6 +67,9 @@ Status LoadTfLiteModel(const string& model_dir, SavedModelBundle* bundle, model_bytes.resize(size); absl::string_view sv; TF_RETURN_IF_ERROR(file->Read(0, size, &sv, &model_bytes[0])); +#if FLATBUFFERS_LITTLEENDIAN == 0 + tflite::FlatBufferModel::ByteSwapSerializedModel(&model_bytes, false); +#endif std::unique_ptr tflite_session; TF_RETURN_IF_ERROR(TfLiteSession::Create( diff --git a/tensorflow_serving/servables/tensorflow/tflite_interpreter_pool_test.cc b/tensorflow_serving/servables/tensorflow/tflite_interpreter_pool_test.cc index caae2cd762f..003a7059bf1 100644 --- a/tensorflow_serving/servables/tensorflow/tflite_interpreter_pool_test.cc +++ b/tensorflow_serving/servables/tensorflow/tflite_interpreter_pool_test.cc @@ -47,6 +47,9 @@ TEST(TfLiteInterpreterPool, CreateTfLiteInterpreterPoolTest) { TF_ASSERT_OK(ReadFileToString(Env::Default(), test_util::TestSrcDirPath(kParseExampleModel), &model_bytes)); +#if FLATBUFFERS_LITTLEENDIAN == 0 + tflite::FlatBufferModel::ByteSwapSerializedModel(&model_bytes, false); +#endif auto model = tflite::FlatBufferModel::BuildFromModel( flatbuffers::GetRoot(model_bytes.data())); int pool_size = 1; @@ -102,6 +105,9 @@ TEST(TfLiteInterpreterWrapper, TfLiteInterpreterWrapperTest) { TF_ASSERT_OK(ReadFileToString(Env::Default(), test_util::TestSrcDirPath(kParseExampleModel), &model_bytes)); +#if FLATBUFFERS_LITTLEENDIAN == 0 + tflite::FlatBufferModel::ByteSwapSerializedModel(&model_bytes, false); +#endif auto model = tflite::FlatBufferModel::BuildFromModel( flatbuffers::GetRoot(model_bytes.data())); tflite::ops::builtin::BuiltinOpResolver resolver; diff --git a/tensorflow_serving/servables/tensorflow/tflite_session_main.cc b/tensorflow_serving/servables/tensorflow/tflite_session_main.cc index d219108bcff..8f374be9c2b 100644 --- a/tensorflow_serving/servables/tensorflow/tflite_session_main.cc +++ b/tensorflow_serving/servables/tensorflow/tflite_session_main.cc @@ -37,6 +37,9 @@ int main(int argc, char** argv) { std::string model_bytes; auto status = ReadFileToString(tensorflow::Env::Default(), filename, &model_bytes); +#if FLATBUFFERS_LITTLEENDIAN == 0 + tflite::FlatBufferModel::ByteSwapSerializedModel(&model_bytes, false); +#endif if (!status.ok()) { std::cerr << "ERROR: Failed to read model file: " << filename << " with error: " << status << std::endl; diff --git a/tensorflow_serving/servables/tensorflow/tflite_session_test.cc b/tensorflow_serving/servables/tensorflow/tflite_session_test.cc index f458bf50af5..7adcecce05d 100644 --- a/tensorflow_serving/servables/tensorflow/tflite_session_test.cc +++ b/tensorflow_serving/servables/tensorflow/tflite_session_test.cc @@ -85,6 +85,9 @@ TEST(TfLiteSession, BasicTest) { TF_ASSERT_OK(ReadFileToString(tensorflow::Env::Default(), test_util::TestSrcDirPath(kTestModel), &model_bytes)); +#if FLATBUFFERS_LITTLEENDIAN == 0 + tflite::FlatBufferModel::ByteSwapSerializedModel(&model_bytes, false); +#endif ::google::protobuf::Map signatures; std::unique_ptr session; @@ -143,6 +146,9 @@ TEST(TfLiteSession, ResizeWithSameNumElementsTest) { TF_ASSERT_OK(ReadFileToString(tensorflow::Env::Default(), test_util::TestSrcDirPath(kTestModel), &model_bytes)); +#if FLATBUFFERS_LITTLEENDIAN == 0 + tflite::FlatBufferModel::ByteSwapSerializedModel(&model_bytes, false); +#endif ::google::protobuf::Map signatures; std::unique_ptr session; @@ -196,6 +202,9 @@ TEST(TfLiteSession, ModelFromLegacyConverterWithSigdef) { TF_ASSERT_OK(ReadFileToString(tensorflow::Env::Default(), test_util::TestSrcDirPath(kTestModelWithSigdef), &model_bytes)); +#if FLATBUFFERS_LITTLEENDIAN == 0 + tflite::FlatBufferModel::ByteSwapSerializedModel(&model_bytes, false); +#endif ::google::protobuf::Map signatures; std::unique_ptr session; @@ -644,6 +653,9 @@ Status BuildSessionInBatch(std::unique_ptr* sess, std::string model_bytes; TF_RETURN_IF_ERROR(ReadFileToString( Env::Default(), test_util::TestSrcDirPath(model_path), &model_bytes)); +#if FLATBUFFERS_LITTLEENDIAN == 0 + tflite::FlatBufferModel::ByteSwapSerializedModel(&model_bytes, false); +#endif auto model = tflite::FlatBufferModel::BuildFromModel( flatbuffers::GetRoot(model_bytes.data())); const int model_batch_size = 5; @@ -781,6 +793,9 @@ TEST(TfLiteSession, TestSetScheduler) { TF_ASSERT_OK(ReadFileToString(Env::Default(), test_util::TestSrcDirPath(kParseExampleModel), &model_bytes)); +#if FLATBUFFERS_LITTLEENDIAN == 0 + tflite::FlatBufferModel::ByteSwapSerializedModel(&model_bytes, false); +#endif auto model = tflite::FlatBufferModel::BuildFromModel( flatbuffers::GetRoot(model_bytes.data())); auto model_signature_def_map = GetTestSignatureDefMap();