From 38f264b268139ba1b83b4c7278e33cf358885562 Mon Sep 17 00:00:00 2001 From: Juhyun Lee Date: Mon, 8 Jul 2019 11:17:59 -0700 Subject: [PATCH] TFLite GPU: Fix sanitizer failures. PiperOrigin-RevId: 257018327 --- tensorflow/lite/delegates/gpu/common/model_builder.cc | 2 +- tensorflow/lite/delegates/gpu/common/model_builder_test.cc | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tensorflow/lite/delegates/gpu/common/model_builder.cc b/tensorflow/lite/delegates/gpu/common/model_builder.cc index 2bbbef73b5e..253f792b0fd 100644 --- a/tensorflow/lite/delegates/gpu/common/model_builder.cc +++ b/tensorflow/lite/delegates/gpu/common/model_builder.cc @@ -1474,7 +1474,7 @@ Status ExtractTensorShape(const TfLiteTensor& tflite_tensor, BHWC* bhwc) { return OkStatus(); default: return InvalidArgumentError( - absl::StrCat("Tensor \"", tflite_tensor.name, + absl::StrCat("Tensor \"", tflite_tensor.name ?: "nullptr", "\" has bad input dims size: ", dims->size, ".")); } } diff --git a/tensorflow/lite/delegates/gpu/common/model_builder_test.cc b/tensorflow/lite/delegates/gpu/common/model_builder_test.cc index fce0bd590de..1f182b2e41d 100644 --- a/tensorflow/lite/delegates/gpu/common/model_builder_test.cc +++ b/tensorflow/lite/delegates/gpu/common/model_builder_test.cc @@ -31,6 +31,7 @@ namespace { TEST(ModelBuilderTest, ConvertTfLiteTensorToTensorRefSucceedsForRank0) { TfLiteTensor tflite_tensor; + tflite_tensor.name = "tensor_name"; tflite_tensor.type = TfLiteType::kTfLiteFloat32; tflite_tensor.dims = TfLiteIntArrayCreate(1); tflite_tensor.dims->data[0] = 4; @@ -45,6 +46,7 @@ TEST(ModelBuilderTest, ConvertTfLiteTensorToTensorRefSucceedsForRank0) { TEST(ModelBuilderTest, ConvertTfLiteTensorToTensorRefSucceedsForRank1) { TfLiteTensor tflite_tensor; + tflite_tensor.name = "tensor_name"; tflite_tensor.type = TfLiteType::kTfLiteInt32; tflite_tensor.dims = TfLiteIntArrayCreate(2); tflite_tensor.dims->data[0] = 4; @@ -60,6 +62,7 @@ TEST(ModelBuilderTest, ConvertTfLiteTensorToTensorRefSucceedsForRank1) { TEST(ModelBuilderTest, ConvertTfLiteTensorToTensorRefSucceedsForRank2) { TfLiteTensor tflite_tensor; + tflite_tensor.name = "tensor_name"; tflite_tensor.type = TfLiteType::kTfLiteInt64; tflite_tensor.dims = TfLiteIntArrayCreate(3); tflite_tensor.dims->data[0] = 4; @@ -76,6 +79,7 @@ TEST(ModelBuilderTest, ConvertTfLiteTensorToTensorRefSucceedsForRank2) { TEST(ModelBuilderTest, ConvertTfLiteTensorToTensorRefSucceedsForRank3) { TfLiteTensor tflite_tensor; + tflite_tensor.name = "tensor_name"; tflite_tensor.type = TfLiteType::kTfLiteUInt8; tflite_tensor.dims = TfLiteIntArrayCreate(4); tflite_tensor.dims->data[0] = 4; @@ -93,6 +97,7 @@ TEST(ModelBuilderTest, ConvertTfLiteTensorToTensorRefSucceedsForRank3) { TEST(ModelBuilderTest, ConvertTfLiteTensorToTensorRefFailsForRankLT0) { TfLiteTensor tflite_tensor; + tflite_tensor.name = "tensor_name"; tflite_tensor.type = TfLiteType::kTfLiteFloat32; tflite_tensor.dims = TfLiteIntArrayCreate(0); TensorRef tensor_ref; @@ -105,6 +110,7 @@ TEST(ModelBuilderTest, ConvertTfLiteTensorToTensorRefFailsForRankLT0) { TEST(ModelBuilderTest, ConvertTfLiteTensorToTensorRefFailsForRankGT3) { TfLiteTensor tflite_tensor; + tflite_tensor.name = "tensor_name"; tflite_tensor.type = TfLiteType::kTfLiteFloat32; tflite_tensor.dims = TfLiteIntArrayCreate(5); TensorRef tensor_ref;