aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/contrib/tfprof
diff options
context:
space:
mode:
authorGravatar A. Unique TensorFlower <gardener@tensorflow.org>2016-12-07 17:06:10 -0800
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2016-12-07 17:22:03 -0800
commitfe5740fef35b3dae53d40f59451523cd5360c6ba (patch)
tree47e70064f141478df1ed186534723a6ff142f9bd /tensorflow/contrib/tfprof
parent74b73c2b5896b3d172d275a1a9c39ff5e6ba71dc (diff)
Fix iteritems break in python3
Change: 141377833
Diffstat (limited to 'tensorflow/contrib/tfprof')
-rw-r--r--tensorflow/contrib/tfprof/python/tools/tfprof/tfprof_logger.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tensorflow/contrib/tfprof/python/tools/tfprof/tfprof_logger.py b/tensorflow/contrib/tfprof/python/tools/tfprof/tfprof_logger.py
index a89d966939..50ec954ff8 100644
--- a/tensorflow/contrib/tfprof/python/tools/tfprof/tfprof_logger.py
+++ b/tensorflow/contrib/tfprof/python/tools/tfprof/tfprof_logger.py
@@ -23,6 +23,7 @@ from __future__ import print_function
import os
import sys
+import six
import tensorflow as tf
from tensorflow.python.framework import ops
from tensorflow.tools.tfprof import tfprof_log_pb2
@@ -124,7 +125,7 @@ def _merge_default_with_oplog(graph, op_log=None, run_meta=None):
all_ops = dict()
for entry in op_log.log_entries:
all_ops[entry.name] = entry
- for op_name, entry in logged_ops.iteritems():
+ for op_name, entry in six.iteritems(logged_ops):
if op_name in all_ops:
all_ops[op_name].types.extend(entry.types)
if entry.float_ops > 0 and all_ops[op_name].float_ops == 0: