Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Bugfix][Frontend][TF] Fix tutorial for TF<=1.12 compatible #4593

Merged
merged 1 commit into from
Dec 28, 2019
Merged

[Bugfix][Frontend][TF] Fix tutorial for TF<=1.12 compatible #4593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions python/tvm/relay/testing/tf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,13 @@
# Tensorflow imports
import tensorflow as tf
from tensorflow.core.framework import graph_pb2

from tvm.contrib.download import download_testdata

try:
tf_compat_v1 = tf.compat.v1
except ImportError:
tf_compat_v1 = tf

######################################################################
# Some helper functions
# ---------------------
Expand Down Expand Up @@ -80,7 +84,7 @@ def AddShapesToGraphDef(session, out_node):

"""

graph_def = tf.compat.v1.graph_util.convert_variables_to_constants(
graph_def = tf_compat_v1.graph_util.convert_variables_to_constants(
session,
session.graph.as_graph_def(add_shapes=True),
[out_node],
Expand Down Expand Up @@ -112,13 +116,13 @@ def load(self, label_lookup_path, uid_lookup_path):
dict from integer node ID to human-readable string.

"""
if not tf.compat.v1.io.gfile.exists(uid_lookup_path):
if not tf_compat_v1.gfile.Exists(uid_lookup_path):
tf.logging.fatal('File does not exist %s', uid_lookup_path)
if not tf.compat.v1.io.gfile.exists(label_lookup_path):
if not tf_compat_v1.gfile.Exists(label_lookup_path):
tf.logging.fatal('File does not exist %s', label_lookup_path)

# Loads mapping from string UID to human-readable string
proto_as_ascii_lines = tf.compat.v1.gfile.GFile(uid_lookup_path).readlines()
proto_as_ascii_lines = tf_compat_v1.gfile.GFile(uid_lookup_path).readlines()
uid_to_human = {}
p = re.compile(r'[n\d]*[ \S,]*')
for line in proto_as_ascii_lines:
Expand All @@ -129,7 +133,7 @@ def load(self, label_lookup_path, uid_lookup_path):

# Loads mapping from string UID to integer node ID.
node_id_to_uid = {}
proto_as_ascii = tf.compat.v1.gfile.GFile(label_lookup_path).readlines()
proto_as_ascii = tf_compat_v1.gfile.GFile(label_lookup_path).readlines()
for line in proto_as_ascii:
if line.startswith(' target_class:'):
target_class = int(line.split(': ')[1])
Expand Down Expand Up @@ -209,7 +213,7 @@ def get_workload(model_path, model_sub_path=None):
path_model = download_testdata(model_url, model_path, module='tf')

# Creates graph from saved graph_def.pb.
with tf.compat.v1.gfile.FastGFile(path_model, 'rb') as f:
with tf_compat_v1.gfile.FastGFile(path_model, 'rb') as f:
graph_def = tf.GraphDef()
graph_def.ParseFromString(f.read())
graph = tf.import_graph_def(graph_def, name='')
Expand Down Expand Up @@ -299,7 +303,7 @@ def _create_ptb_vocabulary(data_dir):
file_name = 'ptb.train.txt'
def _read_words(filename):
"""Read the data for creating vocabulary"""
with tf.compat.v1.gfile.GFile(filename, "r") as f:
with tf_compat_v1.gfile.GFile(filename, "r") as f:
return f.read().encode("utf-8").decode("utf-8").replace("\n", "<eos>").split()

def _build_vocab(filename):
Expand Down
20 changes: 12 additions & 8 deletions tutorials/frontend/from_tensorflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@

# Tensorflow imports
import tensorflow as tf
try:
tf_compat_v1 = tf.compat.v1
except ImportError:
tf_compat_v1 = tf

# Tensorflow utility functions
import tvm.relay.testing.tf as tf_testing
Expand Down Expand Up @@ -89,14 +93,14 @@
# ------------
# Creates tensorflow graph definition from protobuf file.

with tf.compat.v1.gfile.GFile(model_path, 'rb') as f:
graph_def = tf.compat.v1.GraphDef()
with tf_compat_v1.gfile.GFile(model_path, 'rb') as f:
graph_def = tf_compat_v1.GraphDef()
graph_def.ParseFromString(f.read())
graph = tf.import_graph_def(graph_def, name='')
# Call the utility to import the graph definition into default graph.
graph_def = tf_testing.ProcessGraphDefParam(graph_def)
# Add shapes to the graph.
with tf.compat.v1.Session() as sess:
with tf_compat_v1.Session() as sess:
graph_def = tf_testing.AddShapesToGraphDef(sess, 'softmax')

######################################################################
Expand Down Expand Up @@ -187,8 +191,8 @@
def create_graph():
"""Creates a graph from saved GraphDef file and returns a saver."""
# Creates graph from saved graph_def.pb.
with tf.compat.v1.gfile.GFile(model_path, 'rb') as f:
graph_def = tf.compat.v1.GraphDef()
with tf_compat_v1.gfile.GFile(model_path, 'rb') as f:
graph_def = tf_compat_v1.GraphDef()
graph_def.ParseFromString(f.read())
graph = tf.import_graph_def(graph_def, name='')
# Call the utility to import the graph definition into default graph.
Expand All @@ -206,14 +210,14 @@ def run_inference_on_image(image):
-------
Nothing
"""
if not tf.compat.v1.io.gfile.exists(image):
if not tf_compat_v1.gfile.Exists(image):
tf.logging.fatal('File does not exist %s', image)
image_data = tf.compat.v1.gfile.GFile(image, 'rb').read()
image_data = tf_compat_v1.gfile.GFile(image, 'rb').read()

# Creates graph from saved GraphDef.
create_graph()

with tf.compat.v1.Session() as sess:
with tf_compat_v1.Session() as sess:
softmax_tensor = sess.graph.get_tensor_by_name('softmax:0')
predictions = sess.run(softmax_tensor,
{'DecodeJpeg/contents:0': image_data})
Expand Down