Update tensorflow to version 1.4.

Fix WORKSPACE, BUILD, and fold.bzl.

Author: delesley

WORKSPACE

@@ -6,7 +6,7 @@ local_repository(
 )
 
 local_repository(
- name = "com_google_abseil",
+ name = "com_google_absl",
  path = "abseil-cpp",
 )
 

tensorflow

@@ -261,7 +261,7 @@ def _register_options(register, default_plan_name='plan'):
  # Flags for data processing
  register(
  flags.DEFINE_integer,
- 'num_multiprocess_processes', None, 'Number of worked processes to use '
+ 'num_multiprocess_processes', 0, 'Number of worked processes to use '
  'for multiprocessing when building loom inputs. Defaults to the cpu '
  'count. Zero to disable multiprocessing')
  register(

tensorflow_fold/blocks/plan.py

@@ -156,7 +156,7 @@ def setUp(self):
  # Reset flags.
  tf.flags.FLAGS.master = ''
  tf.flags.FLAGS.mode = 'train'
- tf.flags.FLAGS.num_multiprocess_processes = None
+ tf.flags.FLAGS.num_multiprocess_processes = 0
  tf.flags.FLAGS.task = 0
  tf.flags.FLAGS.truncate_examples = 0
  # Recreate tmpdir.
@@ -290,15 +290,15 @@ def test_create_from_flags(self):
  sess.run(p.train_op) # should make loss smaller
  self.assertLess(p.loss_total.eval(), 4)
 
- tf.flags.FLAGS.num_multiprocess_processes = None
+ tf.flags.FLAGS.num_multiprocess_processes = 0
  tf.flags.FLAGS.task = 42
  train_op = tf.no_op()
  p = plan.Plan.create_from_flags(_setup_plan(
  compiler=block_compiler.Compiler.create(blocks.Scalar()),
  losses={'foo': tf.constant(3.14)},
  train_op=train_op,
  examples=xrange(5)))
- self.assertEqual(p.num_multiprocess_processes, None)
+ self.assertEqual(p.num_multiprocess_processes, 0)
  self.assertEqual(p.compute_summaries, False)
  self.assertEqual(p.is_chief_trainer, False)
  self.assertEqual(p.train_op, train_op)
@@ -331,15 +331,15 @@ def test_create_from_params(self):
  sess.run(p.train_op) # should make loss smaller
  self.assertLess(p.loss_total.eval(), 4)
 
- tf.flags.FLAGS.num_multiprocess_processes = None
+ tf.flags.FLAGS.num_multiprocess_processes = 0
  tf.flags.FLAGS.task = 42
  train_op = tf.no_op()
  p = plan.Plan.create_from_flags(_setup_plan(
  compiler=block_compiler.Compiler.create(blocks.Scalar()),
  losses={'foo': tf.constant(3.14)},
  train_op=train_op,
  examples=xrange(5)))
- self.assertEqual(p.num_multiprocess_processes, None)
+ self.assertEqual(p.num_multiprocess_processes, 0)
  self.assertEqual(p.compute_summaries, False)
  self.assertEqual(p.is_chief_trainer, False)
  self.assertEqual(p.train_op, train_op)

tensorflow_fold/blocks/plan_test.py

@@ -1,44 +1,87 @@
 # -*- Python -*-
 
-load("@protobuf//:protobuf.bzl", "cc_proto_library")
-load("@protobuf//:protobuf.bzl", "py_proto_library")
+load("@protobuf_archive//:protobuf.bzl", "cc_proto_library")
+load("@protobuf_archive//:protobuf.bzl", "py_proto_library")
+load("@local_config_cuda//cuda:build_defs.bzl", "if_cuda", "cuda_default_copts")
+
+# From tensorflow.bzl:
+def _cuda_copts():
+ """Gets the appropriate set of copts for (maybe) CUDA compilation.
+
+ If we're doing CUDA compilation, returns copts for our particular CUDA
+ compiler. If we're not doing CUDA compilation, returns an empty list.
+
+ """
+ return cuda_default_copts() + select({
+ "//conditions:default": [],
+ "@local_config_cuda//cuda:using_nvcc": ([
+ "-nvcc_options=relaxed-constexpr",
+ "-nvcc_options=ftz=true",
+ ]),
+ "@local_config_cuda//cuda:using_clang": ([
+ "-fcuda-flush-denormals-to-zero",
+ ]),
+ })
+
 
 fold_cc_binary = native.cc_binary
 fold_cc_library = native.cc_library
 
+
 def fold_cc_test(deps=[], **kwargs):
  native.cc_test(deps=deps + ["//tensorflow_fold/util:test_main"],
  **kwargs)
 
-fold_cuda_cc_binary = fold_cc_binary
-fold_cuda_cc_library = fold_cc_library
-fold_cuda_cc_test = fold_cc_test
+
+def fold_cuda_library(deps=[], cuda_deps=[], copts=[], **kwargs):
+ native.cc_library(
+ deps=deps + if_cuda(cuda_deps + [
+ "@local_config_cuda//cuda:cuda_headers",
+ "@org_tensorflow//tensorflow/core:cuda",
+ "@org_tensorflow//tensorflow/core:framework_lite",
+ ]),
+ copts=copts + _cuda_copts() + if_cuda(["-DGOOGLE_CUDA=1"]),
+ **kwargs)
+
+
+def fold_cuda_cc_test(deps=[], cuda_deps=[], copts=[], **kwargs):
+ native.cc_test(
+ deps=deps + ["//tensorflow_fold/util:test_main"],
+ copts=copts + if_cuda(["-DGOOGLE_CUDA=1"]),
+ **kwargs)
+
 
 def fold_fake_cc_binary(*args, **kwargs):
+ # Not currently supported in open source version.
+ # Dummy rule that will make the BUILD file work.
  pass
 
-def fold_py_nocompile_test(*args, **kwargs):
- pass
 
-def if_cuda(x):
- return []
+def fold_py_nocompile_test(name, srcs=[], **kwargs):
+ # Not currently supported in open source version.
+ # Dummy rule that will make the BUILD file work.
+ native.py_test(name=name,
+ srcs=srcs,
+ deps=[],
+ srcs_version="PY2AND3")
+
 
 def fold_proto_library(cc_name, py_name, srcs, cc_deps=[], py_deps=[],
  visibility=None, testonly=0):
  cc_proto_library(name=cc_name,
  srcs=srcs,
  deps=cc_deps,
- cc_libs=["@protobuf//:protobuf"],
- protoc="@protobuf//:protoc",
- default_runtime="@protobuf//:protobuf",
+ cc_libs=["@protobuf_archive//:protobuf"],
+ protoc="@protobuf_archive//:protoc",
+ default_runtime="@protobuf_archive//:protobuf",
  visibility=visibility,
  testonly=testonly)
  py_proto_library(name=py_name,
  srcs=srcs,
  srcs_version = "PY2AND3",
- deps=["@protobuf//:protobuf_python"] + py_deps,
- default_runtime="@protobuf//:protobuf_python",
- protoc="@protobuf//:protoc",
+ deps=["@protobuf_archive//:protobuf_python"] + py_deps,
+ default_runtime="@protobuf_archive//:protobuf_python",
+ protoc="@protobuf_archive//:protoc",
  visibility=visibility,
  testonly=testonly)
 

tensorflow_fold/fold.bzl

@@ -49,7 +49,7 @@ fold_py_test(
  deps = [
  ":calculator",
  ":calculator_py_pb2",
- "@protobuf//:protobuf_python",
+ "@protobuf_archive//:protobuf_python",
  "@six_archive//:six",
  "@org_tensorflow//tensorflow:tensorflow_py",
  ],

tensorflow_fold/loom/calculator_example/BUILD

@@ -42,7 +42,7 @@ fold_cc_library(
  srcs = ["test_main.cc"],
  linkopts = ["-lm"],
  deps = [
- "//external:gtest",
+ "@com_google_googletest//:gtest",
  "@org_tensorflow//tensorflow/core:framework_lite",
  "@org_tensorflow//tensorflow/core:testlib",
  ],
@@ -55,7 +55,7 @@ fold_py_extension(
  deps = [
  "@org_tensorflow//tensorflow/core:framework_headers_lib",
  "@org_tensorflow//util/python:python_headers",
- "@protobuf//:protobuf",
+ "@protobuf_archive//:protobuf",
  ],
 )