Skip to content

Commit e5dffd0

Browse files
tensorflower-gardenertensorflow-copybara
tensorflower-gardener
authored and
tensorflow-copybara
committed
Automated Code Change
PiperOrigin-RevId: 691713054
1 parent 581da43 commit e5dffd0

9 files changed

+147
-140
lines changed

‎tensorflow_serving/servables/tensorflow/multi_inference_test.cc

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ class MultiInferenceTest : public ::testing::Test {
6060
static void TearDownTestSuite() { server_core_.reset(); }
6161

6262
protected:
63-
static Status CreateServerCore(std::unique_ptr<ServerCore>* server_core) {
63+
static absl::Status CreateServerCore(
64+
std::unique_ptr<ServerCore>* server_core) {
6465
ModelServerConfig config;
6566
auto model_config = config.mutable_model_config_list()->add_config();
6667
model_config->set_name(kTestModelName);
@@ -90,7 +91,7 @@ class MultiInferenceTest : public ::testing::Test {
9091

9192
ServerCore* GetServerCore() { return this->server_core_.get(); }
9293

93-
Status GetInferenceRunner(
94+
absl::Status GetInferenceRunner(
9495
std::unique_ptr<TensorFlowMultiInferenceRunner>* inference_runner) {
9596
ServableHandle<SavedModelBundle> bundle;
9697
ModelSpec model_spec;
@@ -103,7 +104,7 @@ class MultiInferenceTest : public ::testing::Test {
103104
return absl::OkStatus();
104105
}
105106

106-
Status GetServableHandle(ServableHandle<SavedModelBundle>* bundle) {
107+
absl::Status GetServableHandle(ServableHandle<SavedModelBundle>* bundle) {
107108
ModelSpec model_spec;
108109
model_spec.set_name(kTestModelName);
109110
return GetServerCore()->GetServableHandle(model_spec, bundle);
@@ -142,8 +143,8 @@ void PopulateTask(const string& signature_name, const string& method_name,
142143
task->set_method_name(method_name);
143144
}
144145

145-
void ExpectStatusError(const Status& status,
146-
const tensorflow::errors::Code expected_code,
146+
void ExpectStatusError(const absl::Status& status,
147+
const absl::StatusCode expected_code,
147148
const string& message_substring) {
148149
EXPECT_EQ(expected_code, status.code());
149150
EXPECT_THAT(status.message(), ::testing::HasSubstr(message_substring));

‎tensorflow_serving/servables/tensorflow/predict_util.cc

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ namespace tensorflow {
3535
namespace serving {
3636
namespace {
3737

38-
Status VerifySignature(const SignatureDef& signature) {
38+
absl::Status VerifySignature(const SignatureDef& signature) {
3939
if (GetSignatureMethodNameCheckFeature() &&
4040
signature.method_name() != kPredictMethodName &&
4141
signature.method_name() != kClassifyMethodName &&
@@ -48,8 +48,8 @@ Status VerifySignature(const SignatureDef& signature) {
4848
return absl::OkStatus();
4949
}
5050

51-
Status VerifyRequestInputsSize(const SignatureDef& signature,
52-
const PredictRequest& request) {
51+
absl::Status VerifyRequestInputsSize(const SignatureDef& signature,
52+
const PredictRequest& request) {
5353
if (request.inputs().size() > signature.inputs().size() ||
5454
(request.inputs().size() < signature.inputs().size() &&
5555
signature.defaults().empty())) {
@@ -59,7 +59,7 @@ Status VerifyRequestInputsSize(const SignatureDef& signature,
5959
SetDifference(request_inputs, signature_inputs);
6060
const std::set<string> missing =
6161
SetDifference(signature_inputs, request_inputs);
62-
return tensorflow::Status(
62+
return absl::Status(
6363
static_cast<absl::StatusCode>(absl::StatusCode::kInvalidArgument),
6464
absl::StrCat(
6565
"input size does not match signature: ", request.inputs().size(),
@@ -75,7 +75,7 @@ Status VerifyRequestInputsSize(const SignatureDef& signature,
7575
} // namespace
7676

7777
namespace internal {
78-
Status RunPredict(
78+
absl::Status RunPredict(
7979
const RunOptions& run_options, const MetaGraphDef& meta_graph_def,
8080
const absl::optional<int64_t>& servable_version,
8181
const internal::PredictResponseTensorSerializationOption option,
@@ -116,11 +116,11 @@ Status RunPredict(
116116
response);
117117
}
118118

119-
Status PreProcessPrediction(const SignatureDef& signature,
120-
const PredictRequest& request,
121-
std::vector<std::pair<string, Tensor>>* inputs,
122-
std::vector<string>* output_tensor_names,
123-
std::vector<string>* output_tensor_aliases) {
119+
absl::Status PreProcessPrediction(
120+
const SignatureDef& signature, const PredictRequest& request,
121+
std::vector<std::pair<string, Tensor>>* inputs,
122+
std::vector<string>* output_tensor_names,
123+
std::vector<string>* output_tensor_aliases) {
124124
TF_RETURN_IF_ERROR(VerifySignature(signature));
125125
TF_RETURN_IF_ERROR(VerifyRequestInputsSize(signature, request));
126126
TF_RETURN_IF_ERROR(
@@ -133,15 +133,15 @@ Status PreProcessPrediction(const SignatureDef& signature,
133133
for (auto& alias : output_filter) {
134134
auto iter = signature.outputs().find(alias);
135135
if (iter == signature.outputs().end()) {
136-
return tensorflow::Status(
136+
return absl::Status(
137137
static_cast<absl::StatusCode>(absl::StatusCode::kInvalidArgument),
138138
strings::StrCat("output tensor alias not found in signature: ", alias,
139139
" Outputs expected to be in the set {",
140140
absl::StrJoin(GetMapKeys(signature.outputs()), ","),
141141
"}."));
142142
}
143143
if (seen_outputs.find(alias) != seen_outputs.end()) {
144-
return tensorflow::Status(
144+
return absl::Status(
145145
static_cast<absl::StatusCode>(absl::StatusCode::kInvalidArgument),
146146
"duplicate output tensor alias: " + alias);
147147
}
@@ -160,15 +160,15 @@ Status PreProcessPrediction(const SignatureDef& signature,
160160
return absl::OkStatus();
161161
}
162162

163-
Status PostProcessPredictionResult(
163+
absl::Status PostProcessPredictionResult(
164164
const std::vector<string>& output_tensor_aliases,
165165
const std::vector<Tensor>& output_tensors,
166166
const internal::PredictResponseTensorSerializationOption option,
167167
PredictResponse* response) {
168168
// Validate and return output.
169169
if (output_tensors.size() != output_tensor_aliases.size()) {
170-
return tensorflow::Status(
171-
static_cast<tensorflow::errors::Code>(absl::StatusCode::kUnknown),
170+
return absl::Status(
171+
static_cast<absl::StatusCode>(absl::StatusCode::kUnknown),
172172
"Predict internal error");
173173
}
174174
switch (option) {
@@ -191,12 +191,12 @@ Status PostProcessPredictionResult(
191191

192192
} // namespace internal
193193

194-
Status RunPredict(const RunOptions& run_options,
195-
const MetaGraphDef& meta_graph_def,
196-
const absl::optional<int64_t>& servable_version,
197-
Session* session, const PredictRequest& request,
198-
PredictResponse* response,
199-
const thread::ThreadPoolOptions& thread_pool_options) {
194+
absl::Status RunPredict(const RunOptions& run_options,
195+
const MetaGraphDef& meta_graph_def,
196+
const absl::optional<int64_t>& servable_version,
197+
Session* session, const PredictRequest& request,
198+
PredictResponse* response,
199+
const thread::ThreadPoolOptions& thread_pool_options) {
200200
return internal::RunPredict(
201201
run_options, meta_graph_def, servable_version,
202202
internal::PredictResponseTensorSerializationOption::kAsProtoField,

‎tensorflow_serving/servables/tensorflow/predict_util_test.cc

Lines changed: 34 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -51,40 +51,42 @@ class FakeSession : public tensorflow::Session {
5151
public:
5252
FakeSession() {}
5353
~FakeSession() override = default;
54-
Status Create(const GraphDef& graph) override {
54+
absl::Status Create(const GraphDef& graph) override {
5555
return errors::Unimplemented("not available in fake");
5656
}
57-
Status Extend(const GraphDef& graph) override {
57+
absl::Status Extend(const GraphDef& graph) override {
5858
return errors::Unimplemented("not available in fake");
5959
}
60-
Status Close() override {
60+
absl::Status Close() override {
6161
return errors::Unimplemented("not available in fake");
6262
}
63-
Status ListDevices(std::vector<DeviceAttributes>* response) override {
63+
absl::Status ListDevices(std::vector<DeviceAttributes>* response) override {
6464
return errors::Unimplemented("not available in fake");
6565
}
66-
Status Run(const std::vector<std::pair<string, Tensor>>& inputs,
67-
const std::vector<string>& output_names,
68-
const std::vector<string>& target_nodes,
69-
std::vector<Tensor>* outputs) override {
66+
absl::Status Run(const std::vector<std::pair<string, Tensor>>& inputs,
67+
const std::vector<string>& output_names,
68+
const std::vector<string>& target_nodes,
69+
std::vector<Tensor>* outputs) override {
7070
RunMetadata run_metadata;
7171
return Run(RunOptions(), inputs, output_names, target_nodes, outputs,
7272
&run_metadata);
7373
}
74-
Status Run(const RunOptions& run_options,
75-
const std::vector<std::pair<string, Tensor>>& inputs,
76-
const std::vector<string>& output_names,
77-
const std::vector<string>& target_nodes,
78-
std::vector<Tensor>* outputs, RunMetadata* run_metadata) override {
74+
absl::Status Run(const RunOptions& run_options,
75+
const std::vector<std::pair<string, Tensor>>& inputs,
76+
const std::vector<string>& output_names,
77+
const std::vector<string>& target_nodes,
78+
std::vector<Tensor>* outputs,
79+
RunMetadata* run_metadata) override {
7980
return Run(run_options, inputs, output_names, target_nodes, outputs,
8081
run_metadata, thread::ThreadPoolOptions());
8182
}
82-
Status Run(const RunOptions& run_options,
83-
const std::vector<std::pair<string, Tensor>>& inputs,
84-
const std::vector<string>& output_names,
85-
const std::vector<string>& target_nodes,
86-
std::vector<Tensor>* outputs, RunMetadata* run_metadata,
87-
const thread::ThreadPoolOptions& thread_pool_options) override {
83+
absl::Status Run(
84+
const RunOptions& run_options,
85+
const std::vector<std::pair<string, Tensor>>& inputs,
86+
const std::vector<string>& output_names,
87+
const std::vector<string>& target_nodes, std::vector<Tensor>* outputs,
88+
RunMetadata* run_metadata,
89+
const thread::ThreadPoolOptions& thread_pool_options) override {
8890
for (const auto& t : inputs) {
8991
outputs->push_back(t.second);
9092
}
@@ -118,8 +120,8 @@ class PredictImplTest : public ::testing::Test {
118120
}
119121

120122
protected:
121-
static Status CreateServerCore(const string& model_path,
122-
std::unique_ptr<ServerCore>* server_core) {
123+
static absl::Status CreateServerCore(
124+
const string& model_path, std::unique_ptr<ServerCore>* server_core) {
123125
ModelServerConfig config;
124126
auto model_config = config.mutable_model_config_list()->add_config();
125127
model_config->set_name(kTestModelName);
@@ -152,17 +154,18 @@ class PredictImplTest : public ::testing::Test {
152154
return saved_model_server_core_counter_model_.get();
153155
}
154156

155-
Status GetSavedModelServableHandle(ServerCore* server_core,
156-
ServableHandle<SavedModelBundle>* bundle) {
157+
absl::Status GetSavedModelServableHandle(
158+
ServerCore* server_core, ServableHandle<SavedModelBundle>* bundle) {
157159
ModelSpec model_spec;
158160
model_spec.set_name(kTestModelName);
159161
return server_core->GetServableHandle(model_spec, bundle);
160162
}
161163

162-
Status CallPredict(ServerCore* server_core, const PredictRequest& request,
163-
PredictResponse* response,
164-
const thread::ThreadPoolOptions& thread_pool_options =
165-
thread::ThreadPoolOptions()) {
164+
absl::Status CallPredict(
165+
ServerCore* server_core, const PredictRequest& request,
166+
PredictResponse* response,
167+
const thread::ThreadPoolOptions& thread_pool_options =
168+
thread::ThreadPoolOptions()) {
166169
ServableHandle<SavedModelBundle> bundle;
167170
TF_RETURN_IF_ERROR(GetSavedModelServableHandle(server_core, &bundle));
168171
return RunPredict(GetRunOptions(), bundle->meta_graph_def,
@@ -238,7 +241,7 @@ TEST_F(PredictImplTest, InputTensorsDontMatchModelSpecInputs) {
238241
tensor_proto2.mutable_tensor_shape()->add_dim()->set_size(1);
239242
(*inputs)["unknown_key2"] = tensor_proto2;
240243

241-
Status status = CallPredict(GetServerCore(), request, &response);
244+
absl::Status status = CallPredict(GetServerCore(), request, &response);
242245
EXPECT_EQ(status.code(),
243246
static_cast<absl::StatusCode>(absl::StatusCode::kInvalidArgument));
244247
EXPECT_THAT(status.message(),
@@ -283,7 +286,7 @@ TEST_F(PredictImplTest, OutputFiltersDontMatchModelSpecOutputs) {
283286
request.add_output_filter("output_filter");
284287

285288
// Output filter like this doesn't exist.
286-
Status status1 = CallPredict(GetServerCore(), request, &response);
289+
absl::Status status1 = CallPredict(GetServerCore(), request, &response);
287290
EXPECT_EQ(status1.code(),
288291
static_cast<absl::StatusCode>(absl::StatusCode::kInvalidArgument));
289292
EXPECT_THAT(status1.message(),
@@ -296,7 +299,7 @@ TEST_F(PredictImplTest, OutputFiltersDontMatchModelSpecOutputs) {
296299
request.add_output_filter(kOutputTensorKey);
297300

298301
// Duplicate output filter specified.
299-
Status status2 = CallPredict(GetServerCore(), request, &response);
302+
absl::Status status2 = CallPredict(GetServerCore(), request, &response);
300303
EXPECT_EQ(status2.code(),
301304
static_cast<absl::StatusCode>(absl::StatusCode::kInvalidArgument));
302305
EXPECT_THAT(status2.message(),
@@ -319,7 +322,7 @@ TEST_F(PredictImplTest, InputTensorsHaveWrongType) {
319322
request.add_output_filter(kOutputTensorKey);
320323

321324
// Input tensors are all wrong.
322-
Status status = CallPredict(GetServerCore(), request, &response);
325+
absl::Status status = CallPredict(GetServerCore(), request, &response);
323326
EXPECT_EQ(status.code(),
324327
static_cast<absl::StatusCode>(absl::StatusCode::kInvalidArgument));
325328
EXPECT_THAT(status.message(),

‎tensorflow_serving/servables/tensorflow/regressor.cc

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ class SavedModelTensorFlowRegressor : public RegressorInterface {
5858

5959
~SavedModelTensorFlowRegressor() override = default;
6060

61-
Status Regress(const RegressionRequest& request,
62-
RegressionResult* result) override {
61+
absl::Status Regress(const RegressionRequest& request,
62+
RegressionResult* result) override {
6363
TRACELITERAL("SavedModelTensorFlowRegressor::Regress");
6464

6565
string input_tensor_name;
@@ -99,8 +99,8 @@ class SavedModelRegressor : public RegressorInterface {
9999

100100
~SavedModelRegressor() override = default;
101101

102-
Status Regress(const RegressionRequest& request,
103-
RegressionResult* result) override {
102+
absl::Status Regress(const RegressionRequest& request,
103+
RegressionResult* result) override {
104104
SignatureDef signature;
105105
TF_RETURN_IF_ERROR(GetRegressionSignatureDef(
106106
request.model_spec(), bundle_->meta_graph_def, &signature));
@@ -118,22 +118,22 @@ class SavedModelRegressor : public RegressorInterface {
118118

119119
} // namespace
120120

121-
Status CreateRegressorFromSavedModelBundle(
121+
absl::Status CreateRegressorFromSavedModelBundle(
122122
const RunOptions& run_options, std::unique_ptr<SavedModelBundle> bundle,
123123
std::unique_ptr<RegressorInterface>* service) {
124124
service->reset(new SavedModelRegressor(run_options, std::move(bundle)));
125125
return absl::OkStatus();
126126
}
127127

128-
Status CreateFlyweightTensorFlowRegressor(
128+
absl::Status CreateFlyweightTensorFlowRegressor(
129129
const RunOptions& run_options, Session* session,
130130
const SignatureDef* signature,
131131
std::unique_ptr<RegressorInterface>* service) {
132132
return CreateFlyweightTensorFlowRegressor(
133133
run_options, session, signature, thread::ThreadPoolOptions(), service);
134134
}
135135

136-
Status CreateFlyweightTensorFlowRegressor(
136+
absl::Status CreateFlyweightTensorFlowRegressor(
137137
const RunOptions& run_options, Session* session,
138138
const SignatureDef* signature,
139139
const thread::ThreadPoolOptions& thread_pool_options,
@@ -143,9 +143,9 @@ Status CreateFlyweightTensorFlowRegressor(
143143
return absl::OkStatus();
144144
}
145145

146-
Status GetRegressionSignatureDef(const ModelSpec& model_spec,
147-
const MetaGraphDef& meta_graph_def,
148-
SignatureDef* signature) {
146+
absl::Status GetRegressionSignatureDef(const ModelSpec& model_spec,
147+
const MetaGraphDef& meta_graph_def,
148+
SignatureDef* signature) {
149149
const string signature_name = model_spec.signature_name().empty()
150150
? kDefaultServingSignatureDefKey
151151
: model_spec.signature_name();
@@ -167,9 +167,9 @@ Status GetRegressionSignatureDef(const ModelSpec& model_spec,
167167
return absl::OkStatus();
168168
}
169169

170-
Status PreProcessRegression(const SignatureDef& signature,
171-
string* input_tensor_name,
172-
std::vector<string>* output_tensor_names) {
170+
absl::Status PreProcessRegression(const SignatureDef& signature,
171+
string* input_tensor_name,
172+
std::vector<string>* output_tensor_names) {
173173
if (GetSignatureMethodNameCheckFeature() &&
174174
signature.method_name() != kRegressMethodName) {
175175
return errors::InvalidArgument(strings::StrCat(
@@ -207,7 +207,7 @@ Status PreProcessRegression(const SignatureDef& signature,
207207
return absl::OkStatus();
208208
}
209209

210-
Status PostProcessRegressionResult(
210+
absl::Status PostProcessRegressionResult(
211211
const SignatureDef& signature, int num_examples,
212212
const std::vector<string>& output_tensor_names,
213213
const std::vector<Tensor>& output_tensors, RegressionResult* result) {
@@ -266,12 +266,12 @@ Status PostProcessRegressionResult(
266266
return absl::OkStatus();
267267
}
268268

269-
Status RunRegress(const RunOptions& run_options,
270-
const MetaGraphDef& meta_graph_def,
271-
const absl::optional<int64_t>& servable_version,
272-
Session* session, const RegressionRequest& request,
273-
RegressionResponse* response,
274-
const thread::ThreadPoolOptions& thread_pool_options) {
269+
absl::Status RunRegress(const RunOptions& run_options,
270+
const MetaGraphDef& meta_graph_def,
271+
const absl::optional<int64_t>& servable_version,
272+
Session* session, const RegressionRequest& request,
273+
RegressionResponse* response,
274+
const thread::ThreadPoolOptions& thread_pool_options) {
275275
SignatureDef signature;
276276
TF_RETURN_IF_ERROR(GetRegressionSignatureDef(request.model_spec(),
277277
meta_graph_def, &signature));

0 commit comments

Comments
 (0)