Skip to content

Commit 39b1410

Browse files
tensorflower-gardenertensorflow-copybara
tensorflower-gardener
authored and
tensorflow-copybara
committed
Automated Code Change
PiperOrigin-RevId: 810314941
1 parent 4ff648e commit 39b1410

16 files changed

Lines changed: 64 additions & 68 deletions

‎tensorflow_serving/servables/tensorflow/bundle_factory_test_util.cc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,12 @@ void TestMultipleRequests(Session* session, int num_requests,
135135
std::vector<std::unique_ptr<Thread>> request_threads;
136136
request_threads.reserve(num_requests);
137137
for (int i = 0; i < num_requests; ++i) {
138-
request_threads.push_back(
139-
std::unique_ptr<Thread>(Env::Default()->StartThread(
140-
ThreadOptions(), strings::StrCat("thread_", i),
141-
[session, input_batch_size] {
142-
TestSingleRequest(session, input_batch_size);
143-
})));
138+
request_threads.push_back(std::unique_ptr<Thread>(
139+
Env::Default()->StartThread(ThreadOptions(), absl::StrCat("thread_", i),
140+
[session, input_batch_size] {
141+
TestSingleRequest(session,
142+
input_batch_size);
143+
})));
144144
}
145145
}
146146

‎tensorflow_serving/servables/tensorflow/classifier.cc‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -156,12 +156,12 @@ absl::Status GetClassificationSignatureDef(const ModelSpec& model_spec,
156156
: model_spec.signature_name();
157157
auto iter = meta_graph_def.signature_def().find(signature_name);
158158
if (iter == meta_graph_def.signature_def().end()) {
159-
return errors::InvalidArgument(strings::StrCat(
160-
"No signature was found with the name: ", signature_name));
159+
return errors::InvalidArgument(
160+
absl::StrCat("No signature was found with the name: ", signature_name));
161161
}
162162
if (GetSignatureMethodNameCheckFeature()) {
163163
if (iter->second.method_name() != kClassifyMethodName) {
164-
return errors::InvalidArgument(strings::StrCat(
164+
return errors::InvalidArgument(absl::StrCat(
165165
"Expected classification signature method_name to be ",
166166
kClassifyMethodName, ". Was: ", iter->second.method_name()));
167167
}
@@ -178,18 +178,17 @@ absl::Status PreProcessClassification(
178178
std::vector<string>* output_tensor_names) {
179179
if (GetSignatureMethodNameCheckFeature() &&
180180
signature.method_name() != kClassifyMethodName) {
181-
return errors::InvalidArgument(strings::StrCat(
182-
"Expected classification signature method_name to be ",
183-
kClassifyMethodName, ". Was: ", signature.method_name()));
181+
return errors::InvalidArgument(
182+
absl::StrCat("Expected classification signature method_name to be ",
183+
kClassifyMethodName, ". Was: ", signature.method_name()));
184184
}
185185
if (signature.inputs().size() != 1) {
186-
return errors::InvalidArgument(
187-
strings::StrCat("Expected one input Tensor."));
186+
return errors::InvalidArgument(absl::StrCat("Expected one input Tensor."));
188187
}
189188
if (signature.outputs().size() != 1 && signature.outputs().size() != 2) {
190189
return errors::InvalidArgument(
191-
strings::StrCat("Expected one or two output Tensors, found ",
192-
signature.outputs().size()));
190+
absl::StrCat("Expected one or two output Tensors, found ",
191+
signature.outputs().size()));
193192
}
194193

195194
auto input_iter = signature.inputs().find(kClassifyInputs);
@@ -228,8 +227,8 @@ absl::Status PostProcessClassificationResult(
228227
const std::vector<Tensor>& output_tensors, ClassificationResult* result) {
229228
if (output_tensors.size() != output_tensor_names.size()) {
230229
return errors::InvalidArgument(
231-
strings::StrCat("Expected ", output_tensor_names.size(),
232-
" output tensor(s). Got: ", output_tensors.size()));
230+
absl::StrCat("Expected ", output_tensor_names.size(),
231+
" output tensor(s). Got: ", output_tensors.size()));
233232
}
234233

235234
auto classes_iter = signature.outputs().find(kClassifyOutputClasses);

‎tensorflow_serving/servables/tensorflow/machine_learning_metadata.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ void MaybePublishMLMDStreamz(const string& export_dir, const string& model_name,
4444
if (!status.ok()) {
4545
LOG(WARNING) << "ML Metadata Key Found But couldn't be read.";
4646
} else {
47-
mlmd_map->GetCell(model_name, strings::StrCat(version))->Set(mlmd_key);
47+
mlmd_map->GetCell(model_name, absl::StrCat(version))->Set(mlmd_key);
4848
}
4949
}
5050
}

‎tensorflow_serving/servables/tensorflow/machine_learning_metadata_test.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ TEST(MachineLearningMetaDataTest, BasicTest_MLMD_present) {
6767
std::string mlmd_uuid;
6868
ASSERT_FALSE(GetMlmdUuid("test_model", "9696", &mlmd_uuid));
6969
const string test_data_path = test_util::TestSrcDirPath(
70-
strings::StrCat("/servables/tensorflow/testdata/",
71-
"saved_model_half_plus_two_mlmd/00000123"));
70+
absl::StrCat("/servables/tensorflow/testdata/",
71+
"saved_model_half_plus_two_mlmd/00000123"));
7272
MaybePublishMLMDStreamz(test_data_path, "test_model", 9696);
7373
EXPECT_TRUE(GetMlmdUuid("test_model", "9696", &mlmd_uuid));
7474
EXPECT_EQ("test_mlmd_uuid", mlmd_uuid);

‎tensorflow_serving/servables/tensorflow/multi_inference.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@ absl::Status TensorFlowMultiInferenceRunner::Infer(
5757
: task.model_spec().signature_name();
5858

5959
if (signature_names.find(signature_name) != signature_names.end()) {
60-
return errors::InvalidArgument(strings::StrCat(
61-
"Duplicate evaluation of signature: ", signature_name));
60+
return errors::InvalidArgument(
61+
absl::StrCat("Duplicate evaluation of signature: ", signature_name));
6262
}
6363
signature_names.insert(signature_name);
6464

6565
auto iter = meta_graph_def_->signature_def().find(signature_name);
6666
if (iter == meta_graph_def_->signature_def().end()) {
67-
return errors::InvalidArgument(strings::StrCat(
67+
return errors::InvalidArgument(absl::StrCat(
6868
"Requested signature not found in model graph: ", signature_name));
6969
}
7070
string input_name;
@@ -103,7 +103,7 @@ absl::Status TensorFlowMultiInferenceRunner::Infer(
103103
: task.model_spec().signature_name();
104104
auto iter = meta_graph_def_->signature_def().find(signature_name);
105105
if (iter == meta_graph_def_->signature_def().end()) {
106-
return errors::InvalidArgument(strings::StrCat(
106+
return errors::InvalidArgument(absl::StrCat(
107107
"Requested signature not found in model graph: ", signature_name));
108108
}
109109
if (task.method_name() == kClassifyMethodName) {

‎tensorflow_serving/servables/tensorflow/predict_util.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ absl::Status RunPredict(
8787
: request.model_spec().signature_name();
8888
auto iter = meta_graph_def.signature_def().find(signature_name);
8989
if (iter == meta_graph_def.signature_def().end()) {
90-
return errors::FailedPrecondition(strings::StrCat(
90+
return errors::FailedPrecondition(absl::StrCat(
9191
"Serving signature key \"", signature_name, "\" not found."));
9292
}
9393
const SignatureDef& signature = iter->second;

‎tensorflow_serving/servables/tensorflow/regressor.cc‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,12 @@ absl::Status GetRegressionSignatureDef(const ModelSpec& model_spec,
151151
: model_spec.signature_name();
152152
auto iter = meta_graph_def.signature_def().find(signature_name);
153153
if (iter == meta_graph_def.signature_def().end()) {
154-
return errors::InvalidArgument(strings::StrCat(
155-
"No signature was found with the name: ", signature_name));
154+
return errors::InvalidArgument(
155+
absl::StrCat("No signature was found with the name: ", signature_name));
156156
}
157157
if (GetSignatureMethodNameCheckFeature()) {
158158
if (iter->second.method_name() != kRegressMethodName) {
159-
return errors::InvalidArgument(strings::StrCat(
159+
return errors::InvalidArgument(absl::StrCat(
160160
"Expected regression signature method_name to be ",
161161
kRegressMethodName, ". Was: ", iter->second.method_name()));
162162
}
@@ -172,17 +172,15 @@ absl::Status PreProcessRegression(const SignatureDef& signature,
172172
std::vector<string>* output_tensor_names) {
173173
if (GetSignatureMethodNameCheckFeature() &&
174174
signature.method_name() != kRegressMethodName) {
175-
return errors::InvalidArgument(strings::StrCat(
176-
"Expected regression signature method_name to be ", kRegressMethodName,
177-
". Was: ", signature.method_name()));
175+
return errors::InvalidArgument(
176+
absl::StrCat("Expected regression signature method_name to be ",
177+
kRegressMethodName, ". Was: ", signature.method_name()));
178178
}
179179
if (signature.inputs().size() != 1) {
180-
return errors::InvalidArgument(
181-
strings::StrCat("Expected one input Tensor."));
180+
return errors::InvalidArgument(absl::StrCat("Expected one input Tensor."));
182181
}
183182
if (signature.outputs().size() != 1) {
184-
return errors::InvalidArgument(
185-
strings::StrCat("Expected one output Tensor."));
183+
return errors::InvalidArgument(absl::StrCat("Expected one output Tensor."));
186184
}
187185

188186
auto input_iter = signature.inputs().find(kRegressInputs);
@@ -234,7 +232,7 @@ absl::Status PostProcessRegressionResult(
234232

235233
// Ensure the regression score output is shaped how we expect.
236234
if (output_tensor == nullptr) {
237-
return errors::InvalidArgument(strings::StrCat(
235+
return errors::InvalidArgument(absl::StrCat(
238236
"Could not find output tensor '", output_tensor_name, "'"));
239237
}
240238
if (!(output_tensor->dims() == 1 ||
@@ -244,7 +242,7 @@ absl::Status PostProcessRegressionResult(
244242
"[batch_size, 1] but got ", output_tensor->shape().DebugString());
245243
}
246244
if (num_examples != output_tensor->dim_size(0)) {
247-
return errors::InvalidArgument(strings::StrCat(
245+
return errors::InvalidArgument(absl::StrCat(
248246
"Input batch size did not match output batch size: ", num_examples,
249247
" vs. ", output_tensor->dim_size(0)));
250248
}

‎tensorflow_serving/servables/tensorflow/saved_model_bundle_source_adapter_test.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ TEST_P(SavedModelBundleSourceAdapterTest, BackwardCompatibility) {
163163
TEST_P(SavedModelBundleSourceAdapterTest, MLMetadata) {
164164
if (!EnableSessionMetadata()) return;
165165
TestSavedModelBundleSourceAdapter(test_util::TestSrcDirPath(
166-
strings::StrCat("/servables/tensorflow/testdata/",
167-
"saved_model_half_plus_two_mlmd/00000123")));
166+
absl::StrCat("/servables/tensorflow/testdata/",
167+
"saved_model_half_plus_two_mlmd/00000123")));
168168
auto* collection_registry = monitoring::CollectionRegistry::Default();
169169
monitoring::CollectionRegistry::CollectMetricsOptions options;
170170
const std::unique_ptr<monitoring::CollectedMetrics> collected_metrics =

‎tensorflow_serving/servables/tensorflow/saved_model_warmup.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ absl::Status RunWarmupRequest(const PredictionLog& warmup_record,
6666
warmup_record.multi_inference_log().request(), &response));
6767
} break;
6868
case PredictionLog::kPredictStreamedLog:
69-
return errors::Unimplemented(strings::StrCat(
69+
return errors::Unimplemented(absl::StrCat(
7070
"Unsupported log_type for warmup: ", warmup_record.log_type_case()));
7171
case PredictionLog::kSessionRunLog:
72-
return errors::Unimplemented(strings::StrCat(
72+
return errors::Unimplemented(absl::StrCat(
7373
"Unsupported log_type for warmup: ", warmup_record.log_type_case()));
7474
default:
7575
break;

‎tensorflow_serving/servables/tensorflow/saved_model_warmup_util.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ absl::Status RunSavedModelWarmupUntracked(
109109
tensorflow::serving::PredictionLog prediction_log;
110110
while (status.ok()) {
111111
if (!prediction_log.ParseFromArray(record.data(), record.size())) {
112-
return errors::InvalidArgument(strings::StrCat(
112+
return errors::InvalidArgument(absl::StrCat(
113113
"Failed to parse warmup record: ", record, " from ", warmup_path));
114114
}
115115

@@ -174,8 +174,8 @@ absl::Status RunSavedModelWarmupUntracked(
174174
}
175175
if (!prediction_log.ParseFromArray(record.data(), record.size())) {
176176
state->warm_up_status = errors::InvalidArgument(
177-
strings::StrCat("Failed to parse warmup record: ", record,
178-
" from ", warmup_path));
177+
absl::StrCat("Failed to parse warmup record: ", record,
178+
" from ", warmup_path));
179179
break;
180180
}
181181
}

0 commit comments

Comments
 (0)