experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix SavedModel export when predictions is a single tensor and output_alternatives not given

Browse Source 
Change: 144470271
This commit is contained in:
David Soergel 2017-01-13 12:14:41 -08:00 committed by TensorFlower Gardener
parent 8f893368fc
commit 1c5120141b
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tensorflow/contrib/learn/python/learn/estimators/prediction_key.py
View File

@ -25,3 +25,4 @@ class PredictionKey(object):
LOGISTIC = "logistic" LOGISTIC = "logistic"
SCORES = "scores" SCORES = "scores"
TOP_K = "top_k" TOP_K = "top_k"
GENERIC = "output"

2
tensorflow/contrib/learn/python/learn/utils/saved_model_export_utils.py
View File

@ -167,6 +167,8 @@ def get_output_alternatives(
# interpret the model as single-headed of unknown type. # interpret the model as single-headed of unknown type.
default_problem_type = constants.ProblemType.UNSPECIFIED default_problem_type = constants.ProblemType.UNSPECIFIED
default_outputs = model_fn_ops.predictions default_outputs = model_fn_ops.predictions
if not isinstance(default_outputs, dict):
default_outputs = {prediction_key.PredictionKey.GENERIC: default_outputs}
actual_default_output_alternative_key = DEFAULT_OUTPUT_ALTERNATIVE_KEY actual_default_output_alternative_key = DEFAULT_OUTPUT_ALTERNATIVE_KEY
output_alternatives = {actual_default_output_alternative_key: output_alternatives = {actual_default_output_alternative_key:
(default_problem_type, default_outputs)} (default_problem_type, default_outputs)}

15
tensorflow/contrib/learn/python/learn/utils/saved_model_export_utils_test.py
View File

@ -124,6 +124,21 @@ class SavedModelExportUtilsTest(test.TestCase):
}) })
}, output_alternatives) }, output_alternatives)
def test_get_output_alternatives_implicit_single(self):
prediction_tensor = constant_op.constant(["bogus"])
model_fn_ops = model_fn.ModelFnOps(
model_fn.ModeKeys.INFER,
predictions=prediction_tensor,
output_alternatives=None)
output_alternatives, _ = saved_model_export_utils.get_output_alternatives(
model_fn_ops)
self.assertEqual({
"default_output_alternative": (constants.ProblemType.UNSPECIFIED, {
"output": prediction_tensor
})
}, output_alternatives)
def test_build_all_signature_defs(self): def test_build_all_signature_defs(self):
input_features = constant_op.constant(["10"]) input_features = constant_op.constant(["10"])
input_example = constant_op.constant(["11"]) input_example = constant_op.constant(["11"])