From 22c111c34c2a8ebd4a33a6c76e8774088370260c Mon Sep 17 00:00:00 2001 From: Vijay Vasudevan Date: Fri, 27 May 2016 08:41:27 -0800 Subject: Merge changes from github. Change: 123427036 --- WORKSPACE | 2 +- configure | 11 ---- gmock.BUILD | 28 +++++++++ tensorflow/contrib/ffmpeg/default/BUILD | 2 +- tensorflow/contrib/layers/kernels/BUILD | 4 +- tensorflow/contrib/linear_optimizer/kernels/BUILD | 6 +- tensorflow/contrib/metrics/kernels/BUILD | 2 +- tensorflow/contrib/tensor_forest/BUILD | 2 +- tensorflow/core/platform/default/build_config.bzl | 76 ++++++++++++++--------- tensorflow/g3doc/api_docs/python/constant_op.md | 4 +- tensorflow/g3doc/api_docs/python/nn.md | 6 +- tensorflow/python/BUILD | 4 +- tensorflow/tensorflow.bzl | 2 +- tensorflow/tools/benchmark/BUILD | 2 +- tensorflow/tools/pip_package/BUILD | 2 +- tensorflow/tools/pip_package/build_pip_package.sh | 3 +- tensorflow/workspace.bzl | 49 +++++++++------ tools/bazel.rc.template | 4 ++ 18 files changed, 128 insertions(+), 81 deletions(-) create mode 100644 gmock.BUILD diff --git a/WORKSPACE b/WORKSPACE index ffebcde554..04d0e0d3fa 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -20,7 +20,7 @@ tf_workspace() # Specify the minimum required bazel version. load("//tensorflow:tensorflow.bzl", "check_version") -check_version("0.1.4") +check_version("0.2.0") # TENSORBOARD_BOWER_AUTOGENERATED_BELOW_THIS_LINE_DO_NOT_EDIT diff --git a/configure b/configure index 5d6397da57..98048ba91d 100755 --- a/configure +++ b/configure @@ -2,17 +2,6 @@ DO_NOT_SUBMIT_WARNING="Unofficial setting. DO NOT SUBMIT!!!" -## Verify that the submodule google/protobuf is available -# TODO(cais): Remove this check once protobuf is no longer depended upon -if [[ ! -f "google/protobuf/protobuf.bzl" ]]; then - echo "ERROR: It appears that the required submodule google/protobuf is not "\ -"available in this TensorFlow git clone." - echo "Please be sure to use the --recurse-submodules flag when performing "\ -"git clone of TensorFlow." - - exit 1 -fi - ## Set up python-related environment settings while true; do fromuser="" diff --git a/gmock.BUILD b/gmock.BUILD new file mode 100644 index 0000000000..82abf27540 --- /dev/null +++ b/gmock.BUILD @@ -0,0 +1,28 @@ +cc_library( + name = "gtest", + srcs = [ + "gmock-1.7.0/gtest/src/gtest-all.cc", + "gmock-1.7.0/src/gmock-all.cc", + ], + hdrs = glob([ + "gmock-1.7.0/**/*.h", + "gmock-1.7.0/gtest/src/*.cc", + "gmock-1.7.0/src/*.cc", + ]), + includes = [ + "gmock-1.7.0", + "gmock-1.7.0/gtest", + "gmock-1.7.0/gtest/include", + "gmock-1.7.0/include", + ], + linkopts = ["-pthread"], + visibility = ["//visibility:public"], +) + +cc_library( + name = "gtest_main", + srcs = ["gmock-1.7.0/src/gmock_main.cc"], + linkopts = ["-pthread"], + visibility = ["//visibility:public"], + deps = [":gtest"], +) diff --git a/tensorflow/contrib/ffmpeg/default/BUILD b/tensorflow/contrib/ffmpeg/default/BUILD index e1b7bb6192..6e25a61e43 100644 --- a/tensorflow/contrib/ffmpeg/default/BUILD +++ b/tensorflow/contrib/ffmpeg/default/BUILD @@ -16,7 +16,7 @@ cc_library( "//tensorflow/contrib/ffmpeg:ffmpeg_lib.h", ], deps = [ - "//google/protobuf", + "@protobuf//:protobuf", "//tensorflow/core:framework_headers_lib", ], ) diff --git a/tensorflow/contrib/layers/kernels/BUILD b/tensorflow/contrib/layers/kernels/BUILD index 62926e2df4..c540147cd8 100644 --- a/tensorflow/contrib/layers/kernels/BUILD +++ b/tensorflow/contrib/layers/kernels/BUILD @@ -11,7 +11,7 @@ cc_library( name = "bucketization_kernel", srcs = ["bucketization_kernel.cc"], deps = [ - "//google/protobuf", + "@protobuf//:protobuf", "//tensorflow/core:framework_headers_lib", "//third_party/eigen3", ], @@ -22,7 +22,7 @@ cc_library( name = "sparse_feature_cross_kernel", srcs = ["sparse_feature_cross_kernel.cc"], deps = [ - "//google/protobuf", + "@protobuf//:protobuf", "//tensorflow/core:framework_headers_lib", "//third_party/eigen3", ], diff --git a/tensorflow/contrib/linear_optimizer/kernels/BUILD b/tensorflow/contrib/linear_optimizer/kernels/BUILD index ac9a33ccc4..8a92fa2033 100644 --- a/tensorflow/contrib/linear_optimizer/kernels/BUILD +++ b/tensorflow/contrib/linear_optimizer/kernels/BUILD @@ -21,7 +21,7 @@ cc_library( "squared-loss.h", ], deps = [ - "//google/protobuf", + "@protobuf//:protobuf", "//tensorflow/core:framework_headers_lib", ], ) @@ -43,7 +43,7 @@ cc_library( srcs = ["resources.cc"], hdrs = ["resources.h"], deps = [ - "//google/protobuf", + "@protobuf//:protobuf", "//tensorflow/core:framework_headers_lib", "//third_party/eigen3", ], @@ -66,9 +66,9 @@ cc_library( name = "sdca_ops", srcs = ["sdca_ops.cc"], deps = [ + "@protobuf//:protobuf", ":loss_updaters", ":resources", - "//google/protobuf", "//tensorflow/core:framework_headers_lib", "//tensorflow/core/kernels:bounds_check_lib", "//third_party/eigen3", diff --git a/tensorflow/contrib/metrics/kernels/BUILD b/tensorflow/contrib/metrics/kernels/BUILD index 4ba121db83..71dac11c80 100644 --- a/tensorflow/contrib/metrics/kernels/BUILD +++ b/tensorflow/contrib/metrics/kernels/BUILD @@ -11,7 +11,7 @@ cc_library( name = "set_kernels", srcs = ["set_kernels.cc"], deps = [ - "//google/protobuf", + "@protobuf//:protobuf", "//tensorflow/core:framework_headers_lib", "//third_party/eigen3", ], diff --git a/tensorflow/contrib/tensor_forest/BUILD b/tensorflow/contrib/tensor_forest/BUILD index 33c66a6bc2..c9934e50ac 100644 --- a/tensorflow/contrib/tensor_forest/BUILD +++ b/tensorflow/contrib/tensor_forest/BUILD @@ -25,7 +25,7 @@ cc_library( "core/ops/tree_utils.h", ], deps = [ - "//google/protobuf", + "@protobuf//:protobuf", "//tensorflow/core:framework_headers_lib", "//third_party/eigen3", ], diff --git a/tensorflow/core/platform/default/build_config.bzl b/tensorflow/core/platform/default/build_config.bzl index c20db73079..f6eb40f600 100644 --- a/tensorflow/core/platform/default/build_config.bzl +++ b/tensorflow/core/platform/default/build_config.bzl @@ -1,7 +1,7 @@ # Platform-specific build configurations. -load("//google/protobuf:protobuf.bzl", "cc_proto_library") -load("//google/protobuf:protobuf.bzl", "py_proto_library") +load("@protobuf//:protobuf.bzl", "cc_proto_library") +load("@protobuf//:protobuf.bzl", "py_proto_library") # configure may change the following line to True WITH_GCP_SUPPORT = False @@ -31,29 +31,39 @@ def tf_proto_library_cc(name, srcs = [], has_services = None, cc_api_version = 2, go_api_version = 2, java_api_version = 2, py_api_version = 2): - native.filegroup(name=name + "_proto_srcs", - srcs=srcs + tf_deps(deps, "_proto_srcs"), - testonly=testonly,) + native.filegroup( + name = name + "_proto_srcs", + srcs = srcs + tf_deps(deps, "_proto_srcs"), + testonly = testonly, + ) use_grpc_plugin = None if cc_grpc_version: use_grpc_plugin = True - cc_proto_library(name=name + "_cc", - srcs=srcs + tf_deps(deps, "_proto_srcs"), - deps=deps + ["//google/protobuf:cc_wkt_protos"], - cc_libs = cc_libs + ["//google/protobuf:protobuf"], - use_grpc_plugin = use_grpc_plugin, - testonly=testonly, - visibility=visibility,) + cc_proto_library( + name = name + "_cc", + srcs = srcs + tf_deps(deps, "_proto_srcs"), + deps = deps + ["@protobuf//:cc_wkt_protos"], + cc_libs = cc_libs + ["@protobuf//:protobuf"], + protoc = "@protobuf//:protoc", + default_runtime = "@protobuf//:protobuf", + use_grpc_plugin = use_grpc_plugin, + testonly = testonly, + visibility = visibility, + ) def tf_proto_library_py(name, srcs=[], deps=[], visibility=[], testonly=0, srcs_version="PY2AND3"): - py_proto_library(name = name + "_py", - srcs = srcs, - srcs_version = srcs_version, - deps = deps, - visibility = visibility, - testonly = testonly) + py_proto_library( + name = name + "_py", + srcs = srcs, + srcs_version = srcs_version, + deps = deps, + protoc = "@protobuf//:protoc", + default_runtime = "@protobuf//:protobuf_python", + visibility = visibility, + testonly = testonly, + ) def tf_proto_library(name, srcs = [], has_services = None, deps = [], visibility = [], testonly = 0, @@ -61,19 +71,23 @@ def tf_proto_library(name, srcs = [], has_services = None, cc_api_version = 2, go_api_version = 2, java_api_version = 2, py_api_version = 2): - tf_proto_library_cc(name=name, - srcs=srcs + tf_deps(deps, "_proto_srcs"), - deps=deps, - cc_libs=cc_libs, - testonly=testonly, - visibility=visibility,) - - tf_proto_library_py(name=name, - srcs=srcs + tf_deps(deps, "_proto_srcs"), - srcs_version="PY2AND3", - deps=deps + ["//google/protobuf:protobuf_python"], - testonly=testonly, - visibility=visibility,) + tf_proto_library_cc( + name = name, + srcs = srcs + tf_deps(deps, "_proto_srcs"), + deps = deps, + cc_libs = cc_libs, + testonly = testonly, + visibility = visibility, + ) + + tf_proto_library_py( + name = name, + srcs = srcs + tf_deps(deps, "_proto_srcs"), + srcs_version = "PY2AND3", + deps = deps + ["@protobuf//:protobuf_python"], + testonly = testonly, + visibility = visibility, + ) def tf_additional_lib_srcs(): return [ diff --git a/tensorflow/g3doc/api_docs/python/constant_op.md b/tensorflow/g3doc/api_docs/python/constant_op.md index 008174f9d6..1aaf39bd50 100644 --- a/tensorflow/g3doc/api_docs/python/constant_op.md +++ b/tensorflow/g3doc/api_docs/python/constant_op.md @@ -60,7 +60,7 @@ tf.zeros_like(tensor) ==> [[0, 0, 0], [0, 0, 0]] * `tensor`: A `Tensor`. * `dtype`: A type for the returned `Tensor`. Must be `float32`, `float64`, - `int8`, `int16`, `int32`, `int64`, `uint8`, or `complex64`. + `int8`, `int16`, `int32`, `int64`, `uint8`, `complex64`, or `complex128`. * `name`: A name for the operation (optional). @@ -119,7 +119,7 @@ tf.ones_like(tensor) ==> [[1, 1, 1], [1, 1, 1]] * `tensor`: A `Tensor`. * `dtype`: A type for the returned `Tensor`. Must be `float32`, `float64`, - `int8`, `int16`, `int32`, `int64`, `uint8`, or `complex64`. + `int8`, `int16`, `int32`, `int64`, `uint8`, `complex64` or `complex128`. * `name`: A name for the operation (optional). diff --git a/tensorflow/g3doc/api_docs/python/nn.md b/tensorflow/g3doc/api_docs/python/nn.md index 06305b097b..3db704e9d9 100644 --- a/tensorflow/g3doc/api_docs/python/nn.md +++ b/tensorflow/g3doc/api_docs/python/nn.md @@ -163,7 +163,7 @@ case where both types are quantized. * `value`: A `Tensor` with type `float`, `double`, `int64`, `int32`, `uint8`, - `int16`, `int8`, or `complex64`. + `int16`, `int8`, `complex64` or `complex128`. * `bias`: A 1-D `Tensor` with size matching the last dimension of `value`. Must be the same type as `value` unless `value` is a quantized type, in which case a different quantized type may be used. @@ -186,7 +186,7 @@ Specifically, `y = 1 / (1 + exp(-x))`. ##### Args: -* `x`: A Tensor with type `float`, `double`, `int32`, `complex64`, `int64`, +* `x`: A Tensor with type `float`, `double`, `int32`, `complex64`, `complex128`, `int64`, or `qint32`. * `name`: A name for the operation (optional). @@ -205,7 +205,7 @@ Computes hyperbolic tangent of `x` element-wise. ##### Args: -* `x`: A Tensor with type `float`, `double`, `int32`, `complex64`, `int64`, +* `x`: A Tensor with type `float`, `double`, `int32`, `complex64`, `complex128`, `int64`, or `qint32`. * `name`: A name for the operation (optional). diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD index 4b290f1509..b7e2a462e5 100644 --- a/tensorflow/python/BUILD +++ b/tensorflow/python/BUILD @@ -134,7 +134,7 @@ cc_binary( }), linkshared = 1, deps = [ - "//google/protobuf", + "@protobuf//:protobuf", "//tensorflow/core:framework_headers_lib", ], ) @@ -885,7 +885,7 @@ py_library( name = "util", srcs = glob(["util/**/*.py"]), srcs_version = "PY2AND3", - deps = ["//google/protobuf:protobuf_python"], + deps = ["@protobuf//:protobuf_python"], ) tf_proto_library( diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl index 4eb5619ecd..bc22150f23 100644 --- a/tensorflow/tensorflow.bzl +++ b/tensorflow/tensorflow.bzl @@ -539,7 +539,7 @@ def cc_header_only_library(name, deps=[], **kwargs): def tf_custom_op_library_additional_deps(): return [ - "//google/protobuf", + "@protobuf//:protobuf", "//third_party/eigen3", "//tensorflow/core:framework_headers_lib", ] diff --git a/tensorflow/tools/benchmark/BUILD b/tensorflow/tools/benchmark/BUILD index ef7aa2398e..e926a45673 100644 --- a/tensorflow/tools/benchmark/BUILD +++ b/tensorflow/tools/benchmark/BUILD @@ -61,7 +61,7 @@ tf_cc_test( # --host_crosstool_top=@bazel_tools//tools/cpp:toolchain # # NOTE: currently '-pthread' must be removed from the LINK_OPTS variable -# in google/protobuf/BUILD to sucessfully build for Android. This is temporary +# in @protobuf//:BUILD to sucessfully build for Android. This is temporary # pending an update of the version of the protobuf library that Tensorflow # uses. cc_binary( diff --git a/tensorflow/tools/pip_package/BUILD b/tensorflow/tools/pip_package/BUILD index dbf89e5bc6..0253f1e218 100644 --- a/tensorflow/tools/pip_package/BUILD +++ b/tensorflow/tools/pip_package/BUILD @@ -27,10 +27,10 @@ sh_binary( "MANIFEST.in", "README", "setup.py", - "//tensorflow/core:framework_headers", ":other_headers", ":simple_console", "//tensorflow:tensorflow_py", + "//tensorflow/core:framework_headers", "//tensorflow/examples/tutorials/mnist:package", "//tensorflow/models/embedding:package", "//tensorflow/models/image/alexnet:all_files", diff --git a/tensorflow/tools/pip_package/build_pip_package.sh b/tensorflow/tools/pip_package/build_pip_package.sh index 7f123937e8..fd60d1da6e 100755 --- a/tensorflow/tools/pip_package/build_pip_package.sh +++ b/tensorflow/tools/pip_package/build_pip_package.sh @@ -61,8 +61,9 @@ function main() { # protobuf pip package doesn't ship with header files. Copy the headers # over so user defined ops can be compiled. + mkdir -p ${TMPDIR}/google rsync --include "*/" --include "*.h" --exclude "*" --prune-empty-dirs -a \ - $RUNFILES/google ${TMPDIR} + $RUNFILES/external/protobuf ${TMPDIR}/google rsync -a $RUNFILES/third_party/eigen3 ${TMPDIR}/third_party cp tensorflow/tools/pip_package/MANIFEST.in ${TMPDIR} diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl index b95f84ce5e..5632f6850b 100644 --- a/tensorflow/workspace.bzl +++ b/tensorflow/workspace.bzl @@ -4,13 +4,6 @@ # within the workspace (e.g. "tensorflow/"), and tf_repo_name is the name of the # local_repository rule (e.g. "@tf"). def tf_workspace(path_prefix = "", tf_repo_name = ""): - native.new_http_archive( - name = "gmock_archive", - url = "https://archive.openswitch.net/gmock-1.7.0.zip", - sha256 = "26fcbb5925b74ad5fc8c26b0495dfc96353f4d553492eb97e85a8a6d2f43095b", - build_file = path_prefix + "google/protobuf/gmock.BUILD", - ) - native.new_http_archive( name = "eigen_archive", url = "https://bitbucket.org/eigen/eigen/get/f3a13643ac1f.tar.gz", @@ -18,16 +11,6 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""): build_file = path_prefix + "eigen.BUILD", ) - native.bind( - name = "gtest", - actual = "@gmock_archive//:gtest", - ) - - native.bind( - name = "gtest_main", - actual = "@gmock_archive//:gtest_main", - ) - native.git_repository( name = "re2", remote = "https://github.com/google/re2.git", @@ -85,16 +68,44 @@ def tf_workspace(path_prefix = "", tf_repo_name = ""): actual = "@six_archive//:six", ) + native.git_repository( + name = "protobuf", + remote = "https://github.com/google/protobuf", + commit = "ed87c1fe2c6e1633cadb62cf54b2723b2b25c280", + ) + + native.new_http_archive( + name = "gmock_archive", + url = "https://archive.openswitch.net/gmock-1.7.0.zip", + sha256 = "26fcbb5925b74ad5fc8c26b0495dfc96353f4d553492eb97e85a8a6d2f43095b", + build_file = path_prefix + "gmock.BUILD", + ) + + native.bind( + name = "gtest", + actual = "@gmock_archive//:gtest", + ) + + native.bind( + name = "gtest_main", + actual = "@gmock_archive//:gtest_main", + ) + + native.bind( + name = "python_headers", + actual = tf_repo_name + "//util/python:python_headers", + ) + # grpc expects //external:protobuf_clib and //external:protobuf_compiler # to point to the protobuf's compiler library. native.bind( name = "protobuf_clib", - actual = tf_repo_name + "//google/protobuf:protoc_lib", + actual = "@protobuf//:protoc_lib", ) native.bind( name = "protobuf_compiler", - actual = tf_repo_name + "//google/protobuf:protoc_lib", + actual = "@protobuf//:protoc_lib", ) native.git_repository( diff --git a/tools/bazel.rc.template b/tools/bazel.rc.template index 2a88b98f34..d3e70e7a4f 100644 --- a/tools/bazel.rc.template +++ b/tools/bazel.rc.template @@ -9,3 +9,7 @@ build --define=allow_oversize_protos=true build --spawn_strategy=standalone test --spawn_strategy=standalone run --spawn_strategy=standalone + +build --genrule_strategy=standalone +test --genrule_strategy=standalone +run --genrule_strategy=standalone -- cgit v1.2.3