aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Eugene Brevdo <ebrevdo@gmail.com>2016-03-16 12:19:23 -0800
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2016-03-16 16:21:48 -0700
commitf1bccd320a742c67245ded0cbe5eba971294d769 (patch)
treedf696850ce969537edce277193983c2bade09edc
parent8ae38cb7d80ee4155c54ae3b704063def227b102 (diff)
Another bugfix in run_and_gather_logs.
Change: 117375431
-rw-r--r--tensorflow/contrib/lookup/BUILD3
-rw-r--r--tensorflow/core/util/test_log.proto3
-rw-r--r--tensorflow/tools/test/run_and_gather_logs.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/tensorflow/contrib/lookup/BUILD b/tensorflow/contrib/lookup/BUILD
index 22c34f5fa3..dcc82af182 100644
--- a/tensorflow/contrib/lookup/BUILD
+++ b/tensorflow/contrib/lookup/BUILD
@@ -22,8 +22,7 @@ py_test(
srcs_version = "PY2AND3",
deps = [
":lookup_py",
- "//third_party/py/numpy",
- "//third_party/py/tensorflow",
+ "//tensorflow:tensorflow_py",
"//tensorflow/python:framework_test_lib",
"//tensorflow/python:platform_test",
],
diff --git a/tensorflow/core/util/test_log.proto b/tensorflow/core/util/test_log.proto
index 3ade562533..e6b8ab416f 100644
--- a/tensorflow/core/util/test_log.proto
+++ b/tensorflow/core/util/test_log.proto
@@ -51,7 +51,8 @@ message BenchmarkEntries {
message BuildConfiguration {
string mode = 1; // opt, dbg, etc
- repeated string cc_flags = 2; // CC compiler flags
+ repeated string cc_flags = 2; // CC compiler flags, if known
+ repeated string opts = 3; // Bazel compilation options, if known
};
message CommitId {
diff --git a/tensorflow/tools/test/run_and_gather_logs.py b/tensorflow/tools/test/run_and_gather_logs.py
index 69fa39b152..40a8542a46 100644
--- a/tensorflow/tools/test/run_and_gather_logs.py
+++ b/tensorflow/tools/test/run_and_gather_logs.py
@@ -35,7 +35,7 @@ try:
import psutil
except ImportError as e:
tf.logging.error("\n\n\nERROR: Unable to import necessary library: {}. "
- "Issuing a soft exit.\n\n\n".format(e.message))
+ "Issuing a soft exit.\n\n\n".format(e))
sys.exit(0)
# pylint: enable=g-bad-import-order
# pylint: enable=unused-import