Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
码匠许师傅
Tensorflow
提交
873e5d02
T
Tensorflow
项目概览
码匠许师傅
/
Tensorflow
通知
3
Star
0
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,发现更多精彩内容 >>
提交
873e5d02
编写于
12月 02, 2016
作者:
G
gunan
提交者:
GitHub
12月 02, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'r0.12' into docs_fix
上级
48b17b04
d74c3389
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
28 addition
and
5 deletion
+28
-5
tensorflow/contrib/cmake/tf_core_kernels.cmake
tensorflow/contrib/cmake/tf_core_kernels.cmake
+2
-1
tensorflow/contrib/cmake/tf_core_ops.cmake
tensorflow/contrib/cmake/tf_core_ops.cmake
+2
-1
tensorflow/contrib/cmake/tf_python.cmake
tensorflow/contrib/cmake/tf_python.cmake
+22
-2
tensorflow/contrib/cmake/tf_tests.cmake
tensorflow/contrib/cmake/tf_tests.cmake
+1
-0
tensorflow/python/ops/variables.py
tensorflow/python/ops/variables.py
+1
-1
未找到文件。
tensorflow/contrib/cmake/tf_core_kernels.cmake
浏览文件 @
873e5d02
...
...
@@ -64,7 +64,8 @@ if(tensorflow_BUILD_CONTRIB_KERNELS)
"
${
tensorflow_source_dir
}
/tensorflow/contrib/tensor_forest/hybrid/core/ops/stochastic_hard_routing_gradient_op.cc"
"
${
tensorflow_source_dir
}
/tensorflow/contrib/tensor_forest/hybrid/core/ops/unpack_path_op.cc"
"
${
tensorflow_source_dir
}
/tensorflow/contrib/tensor_forest/hybrid/core/ops/utils.cc"
)
"
${
tensorflow_source_dir
}
/tensorflow/models/embedding/word2vec_kernels.cc"
)
list
(
APPEND tf_core_kernels_srcs
${
tf_contrib_kernels_srcs
}
)
endif
(
tensorflow_BUILD_CONTRIB_KERNELS
)
...
...
tensorflow/contrib/cmake/tf_core_ops.cmake
浏览文件 @
873e5d02
...
...
@@ -46,7 +46,7 @@ GENERATE_CONTRIB_OP_LIBRARY(cudnn_rnn "${tensorflow_source_dir}/tensorflow/contr
GENERATE_CONTRIB_OP_LIBRARY
(
factorization_clustering
"
${
tensorflow_source_dir
}
/tensorflow/contrib/factorization/ops/clustering_ops.cc"
)
GENERATE_CONTRIB_OP_LIBRARY
(
factorization_factorization
"
${
tensorflow_source_dir
}
/tensorflow/contrib/factorization/ops/factorization_ops.cc"
)
GENERATE_CONTRIB_OP_LIBRARY
(
framework_variable
"
${
tensorflow_source_dir
}
/tensorflow/contrib/framework/ops/variable_ops.cc"
)
GENERATE_CONTRIB_OP_LIBRARY
(
word2vec
"
${
tensorflow_source_dir
}
/tensorflow/models/embedding/word2vec_ops.cc"
)
########################################################
# tf_user_ops library
...
...
@@ -67,6 +67,7 @@ file(GLOB_RECURSE tf_core_ops_srcs
"
${
tensorflow_source_dir
}
/tensorflow/core/ops/*.cc"
"
${
tensorflow_source_dir
}
/tensorflow/core/user_ops/*.h"
"
${
tensorflow_source_dir
}
/tensorflow/core/user_ops/*.cc"
"
${
tensorflow_source_dir
}
/tensorflow/models/embedding/word2vec_ops.cc"
)
file
(
GLOB_RECURSE tf_core_ops_exclude_srcs
...
...
tensorflow/contrib/cmake/tf_python.cmake
浏览文件 @
873e5d02
...
...
@@ -384,6 +384,17 @@ add_python_module("tensorflow/contrib/training")
add_python_module
(
"tensorflow/contrib/training/python"
)
add_python_module
(
"tensorflow/contrib/training/python/training"
)
add_python_module
(
"tensorflow/contrib/util"
)
add_python_module
(
"tensorflow/models"
)
add_python_module
(
"tensorflow/models/embedding"
)
add_python_module
(
"tensorflow/models/image"
)
add_python_module
(
"tensorflow/models/image/alexnet"
)
add_python_module
(
"tensorflow/models/image/cifar10"
)
add_python_module
(
"tensorflow/models/image/imagenet"
)
add_python_module
(
"tensorflow/models/image/mnist"
)
add_python_module
(
"tensorflow/models/rnn"
)
add_python_module
(
"tensorflow/models/rnn/ptb"
)
add_python_module
(
"tensorflow/models/rnn/translate"
)
# Additional directories with no Python sources.
add_custom_command
(
TARGET tf_python_touchup_modules PRE_BUILD
...
...
@@ -416,6 +427,7 @@ set(tf_python_op_lib_names
)
function
(
GENERATE_PYTHON_OP_LIB tf_python_op_lib_name
)
set
(
options SHAPE_FUNCTIONS_NOT_REQUIRED
)
set
(
oneValueArgs DESTINATION
)
set
(
multiValueArgs ADDITIONAL_LIBRARIES
)
cmake_parse_arguments
(
GENERATE_PYTHON_OP_LIB
...
...
@@ -425,7 +437,12 @@ function(GENERATE_PYTHON_OP_LIB tf_python_op_lib_name)
set
(
GENERATE_PYTHON_OP_LIB_DESTINATION
"
${
python_ops_target_dir
}
/gen_
${
tf_python_op_lib_name
}
.py"
)
endif
()
if
(
GENERATE_PYTHON_OP_LIB_SHAPE_FUNCTIONS_NOT_REQUIRED
)
set
(
require_shape_fn 0
)
else
()
set
(
require_shape_fn 1
)
endif
()
# Create a C++ executable that links in the appropriate op
# registrations and generates Python wrapper code based on the
# registered ops.
...
...
@@ -446,7 +463,7 @@ function(GENERATE_PYTHON_OP_LIB tf_python_op_lib_name)
# containing the wrappers.
add_custom_command
(
OUTPUT
${
GENERATE_PYTHON_OP_LIB_DESTINATION
}
COMMAND
${
tf_python_op_lib_name
}
_gen_python @
${
tensorflow_source_dir
}
/tensorflow/python/ops/hidden_ops.txt
1
>
${
GENERATE_PYTHON_OP_LIB_DESTINATION
}
COMMAND
${
tf_python_op_lib_name
}
_gen_python @
${
tensorflow_source_dir
}
/tensorflow/python/ops/hidden_ops.txt
${
require_shape_fn
}
>
${
GENERATE_PYTHON_OP_LIB_DESTINATION
}
DEPENDS
${
tf_python_op_lib_name
}
_gen_python
)
...
...
@@ -487,6 +504,9 @@ GENERATE_PYTHON_OP_LIB("contrib_factorization_factorization_ops"
DESTINATION
${
CMAKE_CURRENT_BINARY_DIR
}
/tf_python/tensorflow/contrib/factorization/python/ops/gen_factorization_ops.py
)
GENERATE_PYTHON_OP_LIB
(
"contrib_framework_variable_ops"
DESTINATION
${
CMAKE_CURRENT_BINARY_DIR
}
/tf_python/tensorflow/contrib/framework/python/ops/gen_variable_ops.py
)
GENERATE_PYTHON_OP_LIB
(
"contrib_word2vec_ops"
DESTINATION
${
CMAKE_CURRENT_BINARY_DIR
}
/tf_python/tensorflow/models/embedding/gen_word2vec.py
SHAPE_FUNCTIONS_NOT_REQUIRED
)
add_custom_target
(
tf_python_ops SOURCES
${
tf_python_ops_generated_files
}
${
PYTHON_PROTO_GENFILES
}
)
add_dependencies
(
tf_python_ops tf_python_op_gen_main
)
...
...
tensorflow/contrib/cmake/tf_tests.cmake
浏览文件 @
873e5d02
...
...
@@ -118,6 +118,7 @@ if (tensorflow_BUILD_PYTHON_TESTS)
"
${
tensorflow_source_dir
}
/tensorflow/python/kernel_tests/*.py"
"
${
tensorflow_source_dir
}
/tensorflow/python/training/*_test.py"
"
${
tensorflow_source_dir
}
/tensorflow/tensorboard/*_test.py"
"
${
tensorflow_source_dir
}
/tensorflow/models/*_test.py"
)
# exclude the onces we don't want
...
...
tensorflow/python/ops/variables.py
浏览文件 @
873e5d02
...
...
@@ -1071,7 +1071,7 @@ def global_variables():
return
ops
.
get_collection
(
ops
.
GraphKeys
.
GLOBAL_VARIABLES
)
@
deprecated
(
"201
6
-03-02"
,
"Please use tf.global_variables instead."
)
@
deprecated
(
"201
7
-03-02"
,
"Please use tf.global_variables instead."
)
def
all_variables
():
"""See `tf.global_variables`."""
return
global_variables
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录