From 12975054b9f1890a7c6cb8e96291bda7c803f2d5 Mon Sep 17 00:00:00 2001 From: seetea Date: Thu, 24 Mar 2016 18:30:59 +0800 Subject: [PATCH] Fix issue #21,support both python 2.7 and python 3.4 --- .../session_bundle/example/export_half_plus_two.py | 4 +++- tensorflow_serving/session_bundle/exporter.py | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tensorflow_serving/session_bundle/example/export_half_plus_two.py b/tensorflow_serving/session_bundle/example/export_half_plus_two.py index bce1b736fb6..fc9a458ce94 100644 --- a/tensorflow_serving/session_bundle/example/export_half_plus_two.py +++ b/tensorflow_serving/session_bundle/example/export_half_plus_two.py @@ -26,6 +26,8 @@ loading and execution code. """ +from __future__ import print_function + # This is a placeholder for a Google-internal import. import tensorflow as tf @@ -63,7 +65,7 @@ def Export(): # CopyAssets is used as a callback during export to copy files to the # given export directory. def CopyAssets(export_path): - print "copying asset files to: %s" % export_path + print("copying asset files to: %s" % export_path) # Use a fixed global step number. global_step_tensor = tf.Variable(123, name="global_step") diff --git a/tensorflow_serving/session_bundle/exporter.py b/tensorflow_serving/session_bundle/exporter.py index 16decb9143a..e22f494efb5 100644 --- a/tensorflow_serving/session_bundle/exporter.py +++ b/tensorflow_serving/session_bundle/exporter.py @@ -20,6 +20,7 @@ import os import re +import six import tensorflow as tf @@ -94,7 +95,7 @@ def generic_signature(name_tensor_map): A Signature message. """ signature = manifest_pb2.Signature() - for name, tensor in name_tensor_map.iteritems(): + for name, tensor in six.iteritems(name_tensor_map): signature.generic_signature.map[name].tensor_name = tensor.name return signature @@ -167,7 +168,7 @@ def init(self, signatures_proto = manifest_pb2.Signatures() if default_graph_signature: signatures_proto.default_signature.CopyFrom(default_graph_signature) - for signature_name, signature in named_graph_signatures.iteritems(): + for signature_name, signature in six.iteritems(named_graph_signatures): signatures_proto.named_signatures[signature_name].CopyFrom(signature) signatures_any_buf = any_pb2.Any() signatures_any_buf.Pack(signatures_proto)