Skip to content

Commit 22c111c

Browse files
Vijay Vasudevantensorflower-gardener
Vijay Vasudevan
authored and
tensorflower-gardener
committed
Merge changes from github.
Change: 123427036
1 parent 3ae0153 commit 22c111c

18 files changed

Lines changed: 128 additions & 81 deletions

File tree

‎WORKSPACE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ tf_workspace()
2020

2121
# Specify the minimum required bazel version.
2222
load("//tensorflow:tensorflow.bzl", "check_version")
23-
check_version("0.1.4")
23+
check_version("0.2.0")
2424

2525
# TENSORBOARD_BOWER_AUTOGENERATED_BELOW_THIS_LINE_DO_NOT_EDIT
2626

‎configure‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,6 @@
22

33
DO_NOT_SUBMIT_WARNING="Unofficial setting. DO NOT SUBMIT!!!"
44

5-
## Verify that the submodule google/protobuf is available
6-
# TODO(cais): Remove this check once protobuf is no longer depended upon
7-
if [[ ! -f "google/protobuf/protobuf.bzl" ]]; then
8-
echo "ERROR: It appears that the required submodule google/protobuf is not "\
9-
"available in this TensorFlow git clone."
10-
echo "Please be sure to use the --recurse-submodules flag when performing "\
11-
"git clone of TensorFlow."
12-
13-
exit 1
14-
fi
15-
165
## Set up python-related environment settings
176
while true; do
187
fromuser=""

‎gmock.BUILD‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
cc_library(
2+
name = "gtest",
3+
srcs = [
4+
"gmock-1.7.0/gtest/src/gtest-all.cc",
5+
"gmock-1.7.0/src/gmock-all.cc",
6+
],
7+
hdrs = glob([
8+
"gmock-1.7.0/**/*.h",
9+
"gmock-1.7.0/gtest/src/*.cc",
10+
"gmock-1.7.0/src/*.cc",
11+
]),
12+
includes = [
13+
"gmock-1.7.0",
14+
"gmock-1.7.0/gtest",
15+
"gmock-1.7.0/gtest/include",
16+
"gmock-1.7.0/include",
17+
],
18+
linkopts = ["-pthread"],
19+
visibility = ["//visibility:public"],
20+
)
21+
22+
cc_library(
23+
name = "gtest_main",
24+
srcs = ["gmock-1.7.0/src/gmock_main.cc"],
25+
linkopts = ["-pthread"],
26+
visibility = ["//visibility:public"],
27+
deps = [":gtest"],
28+
)

‎tensorflow/contrib/ffmpeg/default/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ cc_library(
1616
"//tensorflow/contrib/ffmpeg:ffmpeg_lib.h",
1717
],
1818
deps = [
19-
"//google/protobuf",
19+
"@protobuf//:protobuf",
2020
"//tensorflow/core:framework_headers_lib",
2121
],
2222
)

‎tensorflow/contrib/layers/kernels/BUILD‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ cc_library(
1111
name = "bucketization_kernel",
1212
srcs = ["bucketization_kernel.cc"],
1313
deps = [
14-
"//google/protobuf",
14+
"@protobuf//:protobuf",
1515
"//tensorflow/core:framework_headers_lib",
1616
"//third_party/eigen3",
1717
],
@@ -22,7 +22,7 @@ cc_library(
2222
name = "sparse_feature_cross_kernel",
2323
srcs = ["sparse_feature_cross_kernel.cc"],
2424
deps = [
25-
"//google/protobuf",
25+
"@protobuf//:protobuf",
2626
"//tensorflow/core:framework_headers_lib",
2727
"//third_party/eigen3",
2828
],

‎tensorflow/contrib/linear_optimizer/kernels/BUILD‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ cc_library(
2121
"squared-loss.h",
2222
],
2323
deps = [
24-
"//google/protobuf",
24+
"@protobuf//:protobuf",
2525
"//tensorflow/core:framework_headers_lib",
2626
],
2727
)
@@ -43,7 +43,7 @@ cc_library(
4343
srcs = ["resources.cc"],
4444
hdrs = ["resources.h"],
4545
deps = [
46-
"//google/protobuf",
46+
"@protobuf//:protobuf",
4747
"//tensorflow/core:framework_headers_lib",
4848
"//third_party/eigen3",
4949
],
@@ -66,9 +66,9 @@ cc_library(
6666
name = "sdca_ops",
6767
srcs = ["sdca_ops.cc"],
6868
deps = [
69+
"@protobuf//:protobuf",
6970
":loss_updaters",
7071
":resources",
71-
"//google/protobuf",
7272
"//tensorflow/core:framework_headers_lib",
7373
"//tensorflow/core/kernels:bounds_check_lib",
7474
"//third_party/eigen3",

‎tensorflow/contrib/metrics/kernels/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ cc_library(
1111
name = "set_kernels",
1212
srcs = ["set_kernels.cc"],
1313
deps = [
14-
"//google/protobuf",
14+
"@protobuf//:protobuf",
1515
"//tensorflow/core:framework_headers_lib",
1616
"//third_party/eigen3",
1717
],

‎tensorflow/contrib/tensor_forest/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ cc_library(
2525
"core/ops/tree_utils.h",
2626
],
2727
deps = [
28-
"//google/protobuf",
28+
"@protobuf//:protobuf",
2929
"//tensorflow/core:framework_headers_lib",
3030
"//third_party/eigen3",
3131
],

‎tensorflow/core/platform/default/build_config.bzl‎

Lines changed: 45 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Platform-specific build configurations.
22

3-
load("//google/protobuf:protobuf.bzl", "cc_proto_library")
4-
load("//google/protobuf:protobuf.bzl", "py_proto_library")
3+
load("@protobuf//:protobuf.bzl", "cc_proto_library")
4+
load("@protobuf//:protobuf.bzl", "py_proto_library")
55

66
# configure may change the following line to True
77
WITH_GCP_SUPPORT = False
@@ -31,49 +31,63 @@ def tf_proto_library_cc(name, srcs = [], has_services = None,
3131
cc_api_version = 2, go_api_version = 2,
3232
java_api_version = 2,
3333
py_api_version = 2):
34-
native.filegroup(name=name + "_proto_srcs",
35-
srcs=srcs + tf_deps(deps, "_proto_srcs"),
36-
testonly=testonly,)
34+
native.filegroup(
35+
name = name + "_proto_srcs",
36+
srcs = srcs + tf_deps(deps, "_proto_srcs"),
37+
testonly = testonly,
38+
)
3739

3840
use_grpc_plugin = None
3941
if cc_grpc_version:
4042
use_grpc_plugin = True
41-
cc_proto_library(name=name + "_cc",
42-
srcs=srcs + tf_deps(deps, "_proto_srcs"),
43-
deps=deps + ["//google/protobuf:cc_wkt_protos"],
44-
cc_libs = cc_libs + ["//google/protobuf:protobuf"],
45-
use_grpc_plugin = use_grpc_plugin,
46-
testonly=testonly,
47-
visibility=visibility,)
43+
cc_proto_library(
44+
name = name + "_cc",
45+
srcs = srcs + tf_deps(deps, "_proto_srcs"),
46+
deps = deps + ["@protobuf//:cc_wkt_protos"],
47+
cc_libs = cc_libs + ["@protobuf//:protobuf"],
48+
protoc = "@protobuf//:protoc",
49+
default_runtime = "@protobuf//:protobuf",
50+
use_grpc_plugin = use_grpc_plugin,
51+
testonly = testonly,
52+
visibility = visibility,
53+
)
4854

4955
def tf_proto_library_py(name, srcs=[], deps=[], visibility=[], testonly=0,
5056
srcs_version="PY2AND3"):
51-
py_proto_library(name = name + "_py",
52-
srcs = srcs,
53-
srcs_version = srcs_version,
54-
deps = deps,
55-
visibility = visibility,
56-
testonly = testonly)
57+
py_proto_library(
58+
name = name + "_py",
59+
srcs = srcs,
60+
srcs_version = srcs_version,
61+
deps = deps,
62+
protoc = "@protobuf//:protoc",
63+
default_runtime = "@protobuf//:protobuf_python",
64+
visibility = visibility,
65+
testonly = testonly,
66+
)
5767

5868
def tf_proto_library(name, srcs = [], has_services = None,
5969
deps = [], visibility = [], testonly = 0,
6070
cc_libs = [],
6171
cc_api_version = 2, go_api_version = 2,
6272
java_api_version = 2,
6373
py_api_version = 2):
64-
tf_proto_library_cc(name=name,
65-
srcs=srcs + tf_deps(deps, "_proto_srcs"),
66-
deps=deps,
67-
cc_libs=cc_libs,
68-
testonly=testonly,
69-
visibility=visibility,)
70-
71-
tf_proto_library_py(name=name,
72-
srcs=srcs + tf_deps(deps, "_proto_srcs"),
73-
srcs_version="PY2AND3",
74-
deps=deps + ["//google/protobuf:protobuf_python"],
75-
testonly=testonly,
76-
visibility=visibility,)
74+
tf_proto_library_cc(
75+
name = name,
76+
srcs = srcs + tf_deps(deps, "_proto_srcs"),
77+
deps = deps,
78+
cc_libs = cc_libs,
79+
testonly = testonly,
80+
visibility = visibility,
81+
)
82+
83+
tf_proto_library_py(
84+
name = name,
85+
srcs = srcs + tf_deps(deps, "_proto_srcs"),
86+
srcs_version = "PY2AND3",
87+
deps = deps + ["@protobuf//:protobuf_python"],
88+
testonly = testonly,
89+
visibility = visibility,
90+
)
7791

7892
def tf_additional_lib_srcs():
7993
return [

‎tensorflow/g3doc/api_docs/python/constant_op.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ tf.zeros_like(tensor) ==> [[0, 0, 0], [0, 0, 0]]
6060

6161
* <b>`tensor`</b>: A `Tensor`.
6262
* <b>`dtype`</b>: A type for the returned `Tensor`. Must be `float32`, `float64`,
63-
`int8`, `int16`, `int32`, `int64`, `uint8`, or `complex64`.
63+
`int8`, `int16`, `int32`, `int64`, `uint8`, `complex64`, or `complex128`.
6464

6565
* <b>`name`</b>: A name for the operation (optional).
6666

@@ -119,7 +119,7 @@ tf.ones_like(tensor) ==> [[1, 1, 1], [1, 1, 1]]
119119

120120
* <b>`tensor`</b>: A `Tensor`.
121121
* <b>`dtype`</b>: A type for the returned `Tensor`. Must be `float32`, `float64`,
122-
`int8`, `int16`, `int32`, `int64`, `uint8`, or `complex64`.
122+
`int8`, `int16`, `int32`, `int64`, `uint8`, `complex64` or `complex128`.
123123

124124
* <b>`name`</b>: A name for the operation (optional).
125125

0 commit comments

Comments
 (0)