Skip to content

Commit e222d72

Browse files
tensorflower-gardenertensorflow-copybara
tensorflower-gardener
authored and
tensorflow-copybara
committed
Automated Code Change
PiperOrigin-RevId: 642582640
1 parent 67a2dcb commit e222d72

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+210
-208
lines changed

‎tensorflow_serving/servables/tensorflow/bundle_factory_util.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ Status GetPerModelBatchingParams(const string& path,
8282
<< "using session config batching params: "
8383
<< params->value().DebugString();
8484
}
85-
return OkStatus();
85+
return absl::OkStatus();
8686
}
8787

8888
Status EstimateResourceFromValidationResult(const string& path,
@@ -150,7 +150,7 @@ Status WrapSessionForBatching(const BatchingParameters& batching_config,
150150
std::unique_ptr<BatchScheduler<BatchingSessionTask>>* queue) {
151151
TF_RETURN_IF_ERROR(batch_scheduler->AddQueue(
152152
queue_options, process_batch_callback, queue));
153-
return OkStatus();
153+
return absl::OkStatus();
154154
};
155155
std::vector<SignatureWithBatchingSessionSchedulerCreator>
156156
signatures_with_scheduler_creators;
@@ -168,13 +168,13 @@ Status WrapSessionForBatching(const BatchingParameters& batching_config,
168168

169169
Status WrapSession(std::unique_ptr<Session>* session) {
170170
session->reset(new ServingSessionWrapper(std::move(*session)));
171-
return OkStatus();
171+
return absl::OkStatus();
172172
}
173173

174174
Status WrapSessionIgnoreThreadPoolOptions(std::unique_ptr<Session>* session) {
175175
session->reset(
176176
new SessionWrapperIgnoreThreadPoolOptions(std::move(*session)));
177-
return OkStatus();
177+
return absl::OkStatus();
178178
}
179179

180180
} // namespace serving

‎tensorflow_serving/servables/tensorflow/bundle_factory_util_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class MockSession : public Session {
6868
test::FillFn<float>(&output,
6969
[&](int i) -> float { return input(i) / 2 + 2; });
7070
outputs->push_back(output);
71-
return tensorflow::OkStatus();
71+
return absl::OkStatus();
7272
}
7373

7474
// Unused, but we need to provide a definition (virtual = 0).

‎tensorflow_serving/servables/tensorflow/classification_service.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Status TensorflowClassificationServiceImpl::Classify(
3434
// Verify Request Metadata and create a ServableRequest
3535
if (!request.has_model_spec()) {
3636
return tensorflow::Status(
37-
static_cast<tsl::errors::Code>(absl::StatusCode::kInvalidArgument),
37+
static_cast<absl::StatusCode>(absl::StatusCode::kInvalidArgument),
3838
"Missing ModelSpec");
3939
}
4040

‎tensorflow_serving/servables/tensorflow/classification_service_test.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,15 @@ TEST_F(ClassificationServiceTest, InvalidModelSpec) {
8383
RunOptions(), server_core_.get(), thread::ThreadPoolOptions(),
8484
request, &response)
8585
.code(),
86-
static_cast<tsl::errors::Code>(absl::StatusCode::kInvalidArgument));
86+
static_cast<absl::StatusCode>(absl::StatusCode::kInvalidArgument));
8787

8888
// No model name specified.
8989
auto* model_spec = request.mutable_model_spec();
9090
EXPECT_EQ(TensorflowClassificationServiceImpl::Classify(
9191
RunOptions(), server_core_.get(), thread::ThreadPoolOptions(),
9292
request, &response)
9393
.code(),
94-
static_cast<tsl::errors::Code>(absl::StatusCode::kInvalidArgument));
94+
static_cast<absl::StatusCode>(absl::StatusCode::kInvalidArgument));
9595

9696
// No servable found for model name "foo".
9797
model_spec->set_name("foo");
@@ -115,7 +115,7 @@ TEST_F(ClassificationServiceTest, InvalidSignature) {
115115
RunOptions(), server_core_.get(), thread::ThreadPoolOptions(),
116116
request, &response)
117117
.code(),
118-
static_cast<tsl::errors::Code>(absl::StatusCode::kInvalidArgument));
118+
static_cast<absl::StatusCode>(absl::StatusCode::kInvalidArgument));
119119
}
120120

121121
// Verifies that Classify() returns the correct score for a valid

‎tensorflow_serving/servables/tensorflow/classifier.cc

+5-5
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ Status CreateClassifierFromSavedModelBundle(
127127
const RunOptions& run_options, std::unique_ptr<SavedModelBundle> bundle,
128128
std::unique_ptr<ClassifierInterface>* service) {
129129
service->reset(new SavedModelClassifier(run_options, std::move(bundle)));
130-
return OkStatus();
130+
return absl::OkStatus();
131131
}
132132

133133
Status CreateFlyweightTensorFlowClassifier(
@@ -145,7 +145,7 @@ Status CreateFlyweightTensorFlowClassifier(
145145
std::unique_ptr<ClassifierInterface>* service) {
146146
service->reset(new SavedModelTensorFlowClassifier(
147147
run_options, session, signature, thread_pool_options));
148-
return OkStatus();
148+
return absl::OkStatus();
149149
}
150150

151151
Status GetClassificationSignatureDef(const ModelSpec& model_spec,
@@ -170,7 +170,7 @@ Status GetClassificationSignatureDef(const ModelSpec& model_spec,
170170
PreProcessClassification(iter->second, nullptr, nullptr));
171171
}
172172
*signature = iter->second;
173-
return OkStatus();
173+
return absl::OkStatus();
174174
}
175175

176176
Status PreProcessClassification(const SignatureDef& signature,
@@ -219,7 +219,7 @@ Status PreProcessClassification(const SignatureDef& signature,
219219
output_tensor_names->push_back(scores_iter->second.name());
220220
}
221221
}
222-
return OkStatus();
222+
return absl::OkStatus();
223223
}
224224

225225
Status PostProcessClassificationResult(
@@ -320,7 +320,7 @@ Status PostProcessClassificationResult(
320320
}
321321
}
322322
}
323-
return OkStatus();
323+
return absl::OkStatus();
324324
}
325325

326326
Status RunClassify(const RunOptions& run_options,

‎tensorflow_serving/servables/tensorflow/classifier_test.cc

+14-14
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ class FakeSession : public tensorflow::Session {
139139
}
140140
}
141141

142-
return OkStatus();
142+
return absl::OkStatus();
143143
}
144144

145145
// Parses TensorFlow Examples from a string Tensor.
@@ -155,7 +155,7 @@ class FakeSession : public tensorflow::Session {
155155
}
156156
examples->push_back(example);
157157
}
158-
return OkStatus();
158+
return absl::OkStatus();
159159
}
160160

161161
// Gets the Feature from an Example with the given name. Returns empty
@@ -217,7 +217,7 @@ class FakeSession : public tensorflow::Session {
217217
scores_matrix(i, c) = scores_feature.float_list().value(c) + offset;
218218
}
219219
}
220-
return OkStatus();
220+
return absl::OkStatus();
221221
}
222222

223223
private:
@@ -702,15 +702,15 @@ TEST_P(ClassifierTest, InvalidNamedSignature) {
702702
Status status = classifier_->Classify(request_, &result_);
703703

704704
ASSERT_FALSE(status.ok());
705-
EXPECT_EQ(static_cast<tsl::errors::Code>(absl::StatusCode::kInvalidArgument),
705+
EXPECT_EQ(static_cast<absl::StatusCode>(absl::StatusCode::kInvalidArgument),
706706
status.code())
707707
<< status;
708708

709709
ClassificationResponse response;
710710
status = RunClassify(GetRunOptions(), saved_model_bundle_->meta_graph_def, {},
711711
fake_session_, request_, &response);
712712
ASSERT_FALSE(status.ok());
713-
EXPECT_EQ(static_cast<tsl::errors::Code>(absl::StatusCode::kInvalidArgument),
713+
EXPECT_EQ(static_cast<absl::StatusCode>(absl::StatusCode::kInvalidArgument),
714714
status.code())
715715
<< status;
716716
}
@@ -726,15 +726,15 @@ TEST_P(ClassifierTest, MalformedScores) {
726726
Status status = classifier_->Classify(request_, &result_);
727727

728728
ASSERT_FALSE(status.ok());
729-
EXPECT_EQ(static_cast<tsl::errors::Code>(absl::StatusCode::kInvalidArgument),
729+
EXPECT_EQ(static_cast<absl::StatusCode>(absl::StatusCode::kInvalidArgument),
730730
status.code())
731731
<< status;
732732

733733
ClassificationResponse response;
734734
status = RunClassify(GetRunOptions(), saved_model_bundle_->meta_graph_def, {},
735735
fake_session_, request_, &response);
736736
ASSERT_FALSE(status.ok());
737-
EXPECT_EQ(static_cast<tsl::errors::Code>(absl::StatusCode::kInvalidArgument),
737+
EXPECT_EQ(static_cast<absl::StatusCode>(absl::StatusCode::kInvalidArgument),
738738
status.code())
739739
<< status;
740740
}
@@ -750,15 +750,15 @@ TEST_P(ClassifierTest, MissingClassificationSignature) {
750750
// TODO(b/26220896): This error should move to construction time.
751751
Status status = classifier_->Classify(request_, &result_);
752752
ASSERT_FALSE(status.ok());
753-
EXPECT_EQ(static_cast<tsl::errors::Code>(absl::StatusCode::kInvalidArgument),
753+
EXPECT_EQ(static_cast<absl::StatusCode>(absl::StatusCode::kInvalidArgument),
754754
status.code())
755755
<< status;
756756

757757
ClassificationResponse response;
758758
status = RunClassify(GetRunOptions(), saved_model_bundle_->meta_graph_def, {},
759759
fake_session_, request_, &response);
760760
ASSERT_FALSE(status.ok());
761-
EXPECT_EQ(static_cast<tsl::errors::Code>(absl::StatusCode::kInvalidArgument),
761+
EXPECT_EQ(static_cast<absl::StatusCode>(absl::StatusCode::kInvalidArgument),
762762
status.code())
763763
<< status;
764764
}
@@ -846,7 +846,7 @@ TEST_P(ClassifierTest, ClassesIncorrectTensorBatchSize) {
846846
std::vector<Tensor> outputs = {classes, scores};
847847
EXPECT_CALL(*mock, Run(_, _, _, _, _, _, _))
848848
.WillRepeatedly(::testing::DoAll(::testing::SetArgPointee<4>(outputs),
849-
::testing::Return(OkStatus())));
849+
::testing::Return(absl::OkStatus())));
850850
TF_ASSERT_OK(Create());
851851
auto* examples =
852852
request_.mutable_input()->mutable_example_list()->mutable_examples();
@@ -874,7 +874,7 @@ TEST_P(ClassifierTest, ClassesIncorrectTensorType) {
874874
std::vector<Tensor> outputs = {classes, scores};
875875
EXPECT_CALL(*mock, Run(_, _, _, _, _, _, _))
876876
.WillRepeatedly(::testing::DoAll(::testing::SetArgPointee<4>(outputs),
877-
::testing::Return(OkStatus())));
877+
::testing::Return(absl::OkStatus())));
878878
TF_ASSERT_OK(Create());
879879
auto* examples =
880880
request_.mutable_input()->mutable_example_list()->mutable_examples();
@@ -902,7 +902,7 @@ TEST_P(ClassifierTest, ScoresIncorrectTensorBatchSize) {
902902
std::vector<Tensor> outputs = {classes, scores};
903903
EXPECT_CALL(*mock, Run(_, _, _, _, _, _, _))
904904
.WillRepeatedly(::testing::DoAll(::testing::SetArgPointee<4>(outputs),
905-
::testing::Return(OkStatus())));
905+
::testing::Return(absl::OkStatus())));
906906
TF_ASSERT_OK(Create());
907907
auto* examples =
908908
request_.mutable_input()->mutable_example_list()->mutable_examples();
@@ -929,7 +929,7 @@ TEST_P(ClassifierTest, ScoresIncorrectTensorType) {
929929
std::vector<Tensor> outputs = {classes, scores};
930930
EXPECT_CALL(*mock, Run(_, _, _, _, _, _, _))
931931
.WillRepeatedly(::testing::DoAll(::testing::SetArgPointee<4>(outputs),
932-
::testing::Return(OkStatus())));
932+
::testing::Return(absl::OkStatus())));
933933
TF_ASSERT_OK(Create());
934934
auto* examples =
935935
request_.mutable_input()->mutable_example_list()->mutable_examples();
@@ -958,7 +958,7 @@ TEST_P(ClassifierTest, MismatchedNumberOfTensorClasses) {
958958
std::vector<Tensor> outputs = {classes, scores};
959959
EXPECT_CALL(*mock, Run(_, _, _, _, _, _, _))
960960
.WillRepeatedly(::testing::DoAll(::testing::SetArgPointee<4>(outputs),
961-
::testing::Return(OkStatus())));
961+
::testing::Return(absl::OkStatus())));
962962
TF_ASSERT_OK(Create());
963963
auto* examples =
964964
request_.mutable_input()->mutable_example_list()->mutable_examples();

‎tensorflow_serving/servables/tensorflow/get_model_metadata_impl.cc

+5-5
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ namespace {
3333
Status ValidateGetModelMetadataRequest(const GetModelMetadataRequest& request) {
3434
if (request.metadata_field_size() == 0) {
3535
return tensorflow::Status(
36-
static_cast<tsl::errors::Code>(absl::StatusCode::kInvalidArgument),
36+
static_cast<absl::StatusCode>(absl::StatusCode::kInvalidArgument),
3737
"GetModelMetadataRequest must specify at least one metadata_field");
3838
}
3939
for (const auto& metadata_field : request.metadata_field()) {
@@ -42,7 +42,7 @@ Status ValidateGetModelMetadataRequest(const GetModelMetadataRequest& request) {
4242
"Metadata field ", metadata_field, " is not supported");
4343
}
4444
}
45-
return tensorflow::OkStatus();
45+
return absl::OkStatus();
4646
}
4747

4848
Status SavedModelGetSignatureDef(ServerCore* core, const ModelSpec& model_spec,
@@ -61,7 +61,7 @@ Status SavedModelGetSignatureDef(ServerCore* core, const ModelSpec& model_spec,
6161

6262
(*response->mutable_metadata())[GetModelMetadataImpl::kSignatureDef].PackFrom(
6363
signature_def_map);
64-
return tensorflow::OkStatus();
64+
return absl::OkStatus();
6565
}
6666

6767
} // namespace
@@ -73,7 +73,7 @@ Status GetModelMetadataImpl::GetModelMetadata(
7373
GetModelMetadataResponse* response) {
7474
if (!request.has_model_spec()) {
7575
return tensorflow::Status(
76-
static_cast<tsl::errors::Code>(absl::StatusCode::kInvalidArgument),
76+
static_cast<absl::StatusCode>(absl::StatusCode::kInvalidArgument),
7777
"Missing ModelSpec");
7878
}
7979
return GetModelMetadataWithModelSpec(core, request.model_spec(), request,
@@ -94,7 +94,7 @@ Status GetModelMetadataImpl::GetModelMetadataWithModelSpec(
9494
"MetadataField ", metadata_field, " is not supported");
9595
}
9696
}
97-
return tensorflow::OkStatus();
97+
return absl::OkStatus();
9898
}
9999

100100
} // namespace serving

‎tensorflow_serving/servables/tensorflow/get_model_metadata_impl_test.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -125,14 +125,14 @@ TEST_P(GetModelMetadataImplTest, EmptyOrInvalidMetadataFieldList) {
125125
GetModelMetadataResponse response;
126126

127127
// Empty metadata field list is invalid.
128-
EXPECT_EQ(static_cast<tsl::errors::Code>(absl::StatusCode::kInvalidArgument),
128+
EXPECT_EQ(static_cast<absl::StatusCode>(absl::StatusCode::kInvalidArgument),
129129
GetModelMetadataImpl::GetModelMetadata(GetServerCore(), request,
130130
&response)
131131
.code());
132132
request.add_metadata_field("some_stuff");
133133

134134
// Field enum is outside of valid range.
135-
EXPECT_EQ(static_cast<tsl::errors::Code>(absl::StatusCode::kInvalidArgument),
135+
EXPECT_EQ(static_cast<absl::StatusCode>(absl::StatusCode::kInvalidArgument),
136136
GetModelMetadataImpl::GetModelMetadata(GetServerCore(), request,
137137
&response)
138138
.code());
@@ -143,7 +143,7 @@ TEST_P(GetModelMetadataImplTest, MissingOrEmptyModelSpec) {
143143
GetModelMetadataResponse response;
144144

145145
request.add_metadata_field(GetModelMetadataImpl::kSignatureDef);
146-
EXPECT_EQ(static_cast<tsl::errors::Code>(absl::StatusCode::kInvalidArgument),
146+
EXPECT_EQ(static_cast<absl::StatusCode>(absl::StatusCode::kInvalidArgument),
147147
GetModelMetadataImpl::GetModelMetadata(GetServerCore(), request,
148148
&response)
149149
.code());
@@ -152,7 +152,7 @@ TEST_P(GetModelMetadataImplTest, MissingOrEmptyModelSpec) {
152152
model_spec->clear_name();
153153

154154
// Model name is not specified.
155-
EXPECT_EQ(static_cast<tsl::errors::Code>(absl::StatusCode::kInvalidArgument),
155+
EXPECT_EQ(static_cast<absl::StatusCode>(absl::StatusCode::kInvalidArgument),
156156
GetModelMetadataImpl::GetModelMetadata(GetServerCore(), request,
157157
&response)
158158
.code());

‎tensorflow_serving/servables/tensorflow/multi_inference.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ Status TensorFlowMultiInferenceRunner::Infer(
123123
response->mutable_results(response->results_size() - 1)
124124
->mutable_model_spec());
125125
}
126-
return OkStatus();
126+
return absl::OkStatus();
127127
}
128128

129129
Status RunMultiInference(

‎tensorflow_serving/servables/tensorflow/multi_inference_helper_test.cc

+5-5
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ TYPED_TEST_P(MultiInferenceTest, MissingInputTest) {
146146
RunMultiInferenceWithServerCore(RunOptions(), this->GetServerCore(),
147147
thread::ThreadPoolOptions(), request,
148148
&response),
149-
static_cast<tsl::errors::Code>(absl::StatusCode::kInvalidArgument),
149+
static_cast<absl::StatusCode>(absl::StatusCode::kInvalidArgument),
150150
"Input is empty");
151151
}
152152

@@ -161,7 +161,7 @@ TYPED_TEST_P(MultiInferenceTest, UndefinedSignatureTest) {
161161
RunMultiInferenceWithServerCore(RunOptions(), this->GetServerCore(),
162162
thread::ThreadPoolOptions(), request,
163163
&response),
164-
static_cast<tsl::errors::Code>(absl::StatusCode::kInvalidArgument),
164+
static_cast<absl::StatusCode>(absl::StatusCode::kInvalidArgument),
165165
"signature not found");
166166
}
167167

@@ -185,7 +185,7 @@ TYPED_TEST_P(MultiInferenceTest, InconsistentModelSpecsInRequestTest) {
185185
RunMultiInferenceWithServerCore(RunOptions(), this->GetServerCore(),
186186
thread::ThreadPoolOptions(), request,
187187
&response),
188-
static_cast<tsl::errors::Code>(absl::StatusCode::kInvalidArgument),
188+
static_cast<absl::StatusCode>(absl::StatusCode::kInvalidArgument),
189189
"must access the same model name");
190190
}
191191

@@ -201,7 +201,7 @@ TYPED_TEST_P(MultiInferenceTest, EvaluateDuplicateSignaturesTest) {
201201
RunMultiInferenceWithServerCore(RunOptions(), this->GetServerCore(),
202202
thread::ThreadPoolOptions(), request,
203203
&response),
204-
static_cast<tsl::errors::Code>(absl::StatusCode::kInvalidArgument),
204+
static_cast<absl::StatusCode>(absl::StatusCode::kInvalidArgument),
205205
"Duplicate evaluation of signature: regress_x_to_y");
206206
}
207207

@@ -215,7 +215,7 @@ TYPED_TEST_P(MultiInferenceTest, UsupportedSignatureTypeTest) {
215215
RunMultiInferenceWithServerCore(RunOptions(), this->GetServerCore(),
216216
thread::ThreadPoolOptions(), request,
217217
&response),
218-
static_cast<tsl::errors::Code>(absl::StatusCode::kUnimplemented),
218+
static_cast<absl::StatusCode>(absl::StatusCode::kUnimplemented),
219219
"Unsupported signature");
220220
}
221221

0 commit comments

Comments
 (0)