Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
tensorflow
提交
22c111c3
T
tensorflow
项目概览
xxadev
/
tensorflow
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
tensorflow
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
22c111c3
编写于
5月 27, 2016
作者:
V
Vijay Vasudevan
提交者:
TensorFlower Gardener
5月 27, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Merge changes from github.
Change: 123427036
上级
3ae01537
变更
18
隐藏空白更改
内联
并排
Showing
18 changed file
with
128 addition
and
81 deletion
+128
-81
WORKSPACE
WORKSPACE
+1
-1
configure
configure
+0
-11
gmock.BUILD
gmock.BUILD
+28
-0
tensorflow/contrib/ffmpeg/default/BUILD
tensorflow/contrib/ffmpeg/default/BUILD
+1
-1
tensorflow/contrib/layers/kernels/BUILD
tensorflow/contrib/layers/kernels/BUILD
+2
-2
tensorflow/contrib/linear_optimizer/kernels/BUILD
tensorflow/contrib/linear_optimizer/kernels/BUILD
+3
-3
tensorflow/contrib/metrics/kernels/BUILD
tensorflow/contrib/metrics/kernels/BUILD
+1
-1
tensorflow/contrib/tensor_forest/BUILD
tensorflow/contrib/tensor_forest/BUILD
+1
-1
tensorflow/core/platform/default/build_config.bzl
tensorflow/core/platform/default/build_config.bzl
+45
-31
tensorflow/g3doc/api_docs/python/constant_op.md
tensorflow/g3doc/api_docs/python/constant_op.md
+2
-2
tensorflow/g3doc/api_docs/python/nn.md
tensorflow/g3doc/api_docs/python/nn.md
+3
-3
tensorflow/python/BUILD
tensorflow/python/BUILD
+2
-2
tensorflow/tensorflow.bzl
tensorflow/tensorflow.bzl
+1
-1
tensorflow/tools/benchmark/BUILD
tensorflow/tools/benchmark/BUILD
+1
-1
tensorflow/tools/pip_package/BUILD
tensorflow/tools/pip_package/BUILD
+1
-1
tensorflow/tools/pip_package/build_pip_package.sh
tensorflow/tools/pip_package/build_pip_package.sh
+2
-1
tensorflow/workspace.bzl
tensorflow/workspace.bzl
+30
-19
tools/bazel.rc.template
tools/bazel.rc.template
+4
-0
未找到文件。
WORKSPACE
浏览文件 @
22c111c3
...
...
@@ -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
...
...
configure
浏览文件 @
22c111c3
...
...
@@ -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
=
""
...
...
gmock.BUILD
0 → 100644
浏览文件 @
22c111c3
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"],
)
tensorflow/contrib/ffmpeg/default/BUILD
浏览文件 @
22c111c3
...
...
@@ -16,7 +16,7 @@ cc_library(
"//tensorflow/contrib/ffmpeg:ffmpeg_lib.h"
,
],
deps
=
[
"
//google/
protobuf"
,
"
@protobuf//:
protobuf"
,
"//tensorflow/core:framework_headers_lib"
,
],
)
...
...
tensorflow/contrib/layers/kernels/BUILD
浏览文件 @
22c111c3
...
...
@@ -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"
,
],
...
...
tensorflow/contrib/linear_optimizer/kernels/BUILD
浏览文件 @
22c111c3
...
...
@@ -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"
,
...
...
tensorflow/contrib/metrics/kernels/BUILD
浏览文件 @
22c111c3
...
...
@@ -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"
,
],
...
...
tensorflow/contrib/tensor_forest/BUILD
浏览文件 @
22c111c3
...
...
@@ -25,7 +25,7 @@ cc_library(
"core/ops/tree_utils.h"
,
],
deps
=
[
"
//google/
protobuf"
,
"
@protobuf//:
protobuf"
,
"//tensorflow/core:framework_headers_lib"
,
"//third_party/eigen3"
,
],
...
...
tensorflow/core/platform/default/build_config.bzl
浏览文件 @
22c111c3
# 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
[
...
...
tensorflow/g3doc/api_docs/python/constant_op.md
浏览文件 @
22c111c3
...
...
@@ -60,7 +60,7 @@ tf.zeros_like(tensor) ==> [[0, 0, 0], [0, 0, 0]]
*
<b>
`tensor`
</b>
: A
`Tensor`
.
*
<b>
`dtype`
</b>
: 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
`
.
*
<b>
`name`
</b>
: A name for the operation (optional).
...
...
@@ -119,7 +119,7 @@ tf.ones_like(tensor) ==> [[1, 1, 1], [1, 1, 1]]
*
<b>
`tensor`
</b>
: A
`Tensor`
.
*
<b>
`dtype`
</b>
: 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
`
.
*
<b>
`name`
</b>
: A name for the operation (optional).
...
...
tensorflow/g3doc/api_docs/python/nn.md
浏览文件 @
22c111c3
...
...
@@ -163,7 +163,7 @@ case where both types are quantized.
*
<b>
`value`
</b>
: A
`Tensor`
with type
`float`
,
`double`
,
`int64`
,
`int32`
,
`uint8`
,
`int16`
,
`int8`
,
or
`complex64
`
.
`int16`
,
`int8`
,
`complex64`
or
`complex128
`
.
*
<b>
`bias`
</b>
: 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:
*
<b>
`x`
</b>
: A Tensor with type
`float`
,
`double`
,
`int32`
,
`complex64`
,
`int64`
,
*
<b>
`x`
</b>
: A Tensor with type
`float`
,
`double`
,
`int32`
,
`complex64`
,
`
complex128`
,
`
int64`
,
or
`qint32`
.
*
<b>
`name`
</b>
: A name for the operation (optional).
...
...
@@ -205,7 +205,7 @@ Computes hyperbolic tangent of `x` element-wise.
##### Args:
*
<b>
`x`
</b>
: A Tensor with type
`float`
,
`double`
,
`int32`
,
`complex64`
,
`int64`
,
*
<b>
`x`
</b>
: A Tensor with type
`float`
,
`double`
,
`int32`
,
`complex64`
,
`
complex128`
,
`
int64`
,
or
`qint32`
.
*
<b>
`name`
</b>
: A name for the operation (optional).
...
...
tensorflow/python/BUILD
浏览文件 @
22c111c3
...
...
@@ -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
(
...
...
tensorflow/tensorflow.bzl
浏览文件 @
22c111c3
...
...
@@ -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"
,
]
...
...
tensorflow/tools/benchmark/BUILD
浏览文件 @
22c111c3
...
...
@@ -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
(
...
...
tensorflow/tools/pip_package/BUILD
浏览文件 @
22c111c3
...
...
@@ -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"
,
...
...
tensorflow/tools/pip_package/build_pip_package.sh
浏览文件 @
22c111c3
...
...
@@ -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
}
...
...
tensorflow/workspace.bzl
浏览文件 @
22c111c3
...
...
@@ -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
(
...
...
tools/bazel.rc.template
浏览文件 @
22c111c3
...
...
@@ -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
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录