Permalink
Browse files

Merge changes from github.

Change: 142074581
  • Loading branch information...
1 parent 811629a commit 2e4869af1afe55135d522142be3a2a483162a1b1 @martinwicke martinwicke committed with tensorflower-gardener Dec 14, 2016
Showing with 2,586 additions and 2,232 deletions.
  1. +4 −4 README.md
  2. +1 −3 RELEASE.md
  3. +4 −3 configure
  4. +6 −0 tensorflow/BUILD
  5. +28 −2 tensorflow/contrib/cmake/README.md
  6. +1 −1 tensorflow/contrib/cmake/setup.py
  7. +1 −1 tensorflow/contrib/cmake/tf_core_kernels.cmake
  8. +1 −1 tensorflow/contrib/cmake/tf_core_ops.cmake
  9. +20 −2 tensorflow/contrib/cmake/tf_python.cmake
  10. +2 −2 tensorflow/contrib/cmake/tf_tests.cmake
  11. +7 −7 tensorflow/contrib/layers/python/layers/layers_test.py
  12. +0 −1 tensorflow/contrib/learn/python/learn/estimators/estimator_test.py
  13. +2 −1 tensorflow/contrib/learn/python/learn/export_strategy.py
  14. +0 −51 tensorflow/contrib/learn/python/learn/utils/checkpoints.py
  15. +1 −0 tensorflow/contrib/makefile/tf_op_files.txt
  16. +0 −2 tensorflow/contrib/metrics/BUILD
  17. +20 −21 tensorflow/contrib/slim/README.md
  18. +1 −1 tensorflow/contrib/slim/python/slim/nets/inception_v3_test.py
  19. +1 −0 tensorflow/core/BUILD
  20. +4 −2 tensorflow/core/common_runtime/sycl/sycl_allocator.cc
  21. +0 −1 tensorflow/core/common_runtime/sycl/sycl_allocator.h
  22. +29 −2 tensorflow/core/common_runtime/sycl/sycl_device.cc
  23. +5 −2 tensorflow/core/common_runtime/sycl/sycl_device.h
  24. +0 −1 tensorflow/core/common_runtime/sycl/sycl_device_context.cc
  25. +1 −1 tensorflow/core/distributed_runtime/master_session.cc
  26. +1 −1 tensorflow/core/distributed_runtime/rpc/grpc_worker_service.cc
  27. +5 −2 tensorflow/core/framework/tensor.proto
  28. +9 −7 tensorflow/core/kernels/argmax_op.cc
  29. +34 −3 tensorflow/core/kernels/constant_op.cc
  30. +0 −2 tensorflow/core/kernels/cwise_op_digamma.cc
  31. +1 −0 tensorflow/core/kernels/cwise_op_div.cc
  32. +0 −2 tensorflow/core/kernels/cwise_op_erf.cc
  33. +0 −2 tensorflow/core/kernels/cwise_op_erfc.cc
  34. +0 −2 tensorflow/core/kernels/cwise_op_igammas.cc
  35. +0 −2 tensorflow/core/kernels/cwise_op_lgamma.cc
  36. +0 −2 tensorflow/core/kernels/cwise_op_zeta.cc
  37. +0 −1 tensorflow/core/kernels/cwise_ops_sycl_common.h
  38. +0 −3 tensorflow/core/kernels/dense_update_ops.cc
  39. +14 −0 tensorflow/core/kernels/dynamic_stitch_op.cc
  40. +13 −0 tensorflow/core/kernels/fill_functor.cc
  41. +9 −0 tensorflow/core/kernels/fill_functor.h
  42. +6 −2 tensorflow/core/kernels/function_ops.cc
  43. +21 −2 tensorflow/core/kernels/identity_op.cc
  44. +21 −0 tensorflow/core/kernels/reshape_op.cc
  45. +6 −0 tensorflow/core/kernels/sequence_ops.cc
  46. +62 −0 tensorflow/core/kernels/shape_ops.cc
  47. +16 −3 tensorflow/core/kernels/training_ops.cc
  48. +3 −0 tensorflow/core/ops/math_grad_test.cc
  49. +6 −5 tensorflow/core/ops/math_ops.cc
  50. +6 −2 tensorflow/core/ops/math_ops_test.cc
  51. +4 −0 tensorflow/core/platform/cpu_info.h
  52. +10 −15 tensorflow/{python/lib/core/status_helper.i → core/platform/windows/cpu_info.h}
  53. +21 −0 tensorflow/examples/tutorials/monitors/iris_monitors.py
  54. +2 −2 tensorflow/g3doc/api_docs/cc/ClassEnv.md
  55. +1 −1 tensorflow/g3doc/api_docs/cc/ClassEnvWrapper.md
  56. +0 −1 tensorflow/g3doc/api_docs/leftnav_files
  57. +244 −0 tensorflow/g3doc/api_docs/python/functions_and_classes/shard0/tf.summary.TaggedRunMetadata.md
  58. +1 −1 tensorflow/g3doc/api_docs/python/functions_and_classes/shard1/tf.all_variables.md
  59. +17 −0 tensorflow/g3doc/api_docs/python/functions_and_classes/shard1/tf.merge_all_summaries.md
  60. +49 −0 tensorflow/g3doc/api_docs/python/functions_and_classes/shard2/tf.image_summary.md
  61. +237 −0 tensorflow/g3doc/api_docs/python/functions_and_classes/shard2/tf.summary.SummaryDescription.md
  62. +10 −511 tensorflow/g3doc/api_docs/python/functions_and_classes/shard2/tf.test.TestCase.md
  63. +22 −0 tensorflow/g3doc/api_docs/python/functions_and_classes/shard3/tf.scalar_summary.md
  64. +4 −0 ...c/api_docs/python/functions_and_classes/shard4/tf.summary.SummaryDescription.RegisterExtension.md
  65. +26 −0 tensorflow/g3doc/api_docs/python/functions_and_classes/shard5/tf.histogram_summary.md
  66. +27 −0 tensorflow/g3doc/api_docs/python/functions_and_classes/shard5/tf.merge_summary.md
  67. +4 −0 ...ow/g3doc/api_docs/python/functions_and_classes/shard5/tf.summary.SummaryDescription.FromString.md
  68. +4 −0 ...oc/api_docs/python/functions_and_classes/shard6/tf.summary.TaggedRunMetadata.RegisterExtension.md
  69. +207 −0 tensorflow/g3doc/api_docs/python/functions_and_classes/shard7/tf.train.SummaryWriter.md
  70. +1 −1 tensorflow/g3doc/api_docs/python/functions_and_classes/shard8/tf.summary.merge.md
  71. +37 −0 tensorflow/g3doc/api_docs/python/functions_and_classes/shard9/tf.audio_summary.md
  72. +4 −0 ...low/g3doc/api_docs/python/functions_and_classes/shard9/tf.summary.TaggedRunMetadata.FromString.md
  73. +1 −1 tensorflow/g3doc/api_docs/python/state_ops.md
  74. +482 −1 tensorflow/g3doc/api_docs/python/summary.md
  75. +10 −511 tensorflow/g3doc/api_docs/python/test.md
  76. +66 −37 tensorflow/g3doc/get_started/os_setup.md
  77. +2 −6 tensorflow/g3doc/how_tos/tool_developers/index.md
  78. +16 −0 tensorflow/g3doc/resources/bib.md
  79. +6 −1 tensorflow/g3doc/resources/index.md
  80. +5 −3 tensorflow/g3doc/tutorials/estimators/index.md
  81. +1 −1 tensorflow/g3doc/tutorials/mnist/tf/index.md
  82. +1 −0 tensorflow/python/BUILD
  83. +0 −1 tensorflow/python/client/device_lib.i
  84. +1 −0 tensorflow/python/debug/BUILD
  85. +6 −0 tensorflow/python/framework/dtypes.py
  86. +1 −1 tensorflow/python/kernel_tests/argmax_op_test.py
  87. +2 −2 tensorflow/python/kernel_tests/atrous_convolution_test.py
  88. +3 −3 tensorflow/python/kernel_tests/bias_op_test.py
  89. +6 −6 tensorflow/python/kernel_tests/conv2d_transpose_test.py
  90. +2 −2 tensorflow/python/kernel_tests/pool_test.py
  91. +0 −770 tensorflow/python/kernel_tests/seq2seq_test.py
  92. +37 −0 tensorflow/python/kernel_tests/variable_scope_test.py
  93. +8 −0 tensorflow/python/kernel_tests/variables_test.py
  94. +2 −1 tensorflow/python/ops/init_ops.py
  95. +12 −12 tensorflow/python/ops/nn_fused_batchnorm_test.py
  96. +43 −4 tensorflow/python/ops/variable_scope.py
  97. +41 −1 tensorflow/python/ops/variables.py
  98. +2 −0 tensorflow/python/saved_model/BUILD
  99. +1 −1 tensorflow/python/summary/summary.py
  100. +2 −0 tensorflow/python/tools/BUILD
  101. +4 −0 tensorflow/python/training/momentum.py
  102. +3 −2 tensorflow/stream_executor/cuda/cuda_gpu_executor.cc
  103. +20 −4 tensorflow/tensorflow.bzl
  104. +10 −10 tensorflow/tools/ci_build/builds/test_tutorials.sh
  105. +0 −22 tensorflow/tools/ci_build/linux/libtensorflow_gpu.sh
  106. +201 −0 tensorflow/tools/ci_build/windows/bazel/bazel_test_lib.sh
  107. +57 −0 tensorflow/tools/ci_build/windows/bazel/common_env.sh
  108. +11 −93 tensorflow/tools/ci_build/windows/cpu/bazel/run_cc_test_windows.sh
  109. +1 −1 tensorflow/tools/ci_build/windows/cpu/cmake/run_py.bat
  110. +25 −15 tensorflow/tools/ci_build/windows/cpu/pip/build_tf_windows.sh
  111. +1 −0 tensorflow/tools/ci_build/windows/gpu/bazel/run_cc_test_windows.bat
  112. +60 −0 tensorflow/tools/ci_build/windows/gpu/bazel/run_cc_test_windows.sh
  113. +70 −0 tensorflow/tools/ci_build/windows/gpu/pip/build_tf_windows.sh
  114. +1 −0 tensorflow/tools/ci_build/windows/gpu/pip/run.bat
  115. +0 −9 tensorflow/tools/docker/parameterized_docker_build.sh
  116. +1 −1 tensorflow/tools/pip_package/setup.py
  117. +11 −1 third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl
  118. +13 −0 third_party/gpus/cuda_configure.bzl
  119. +25 −17 third_party/sycl/crosstool/computecpp.tpl
  120. +6 −5 third_party/sycl/sycl_configure.bzl
  121. +3 −0 tools/bazel.rc.template
View
@@ -33,10 +33,10 @@ and discussion.**
People who are a little more adventurous can also try our nightly binaries:
-* Linux CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-0.12.0rc0-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-0.12.0rc0-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-0.12.0rc0-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/))
-* Linux GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-0.12.0rc0-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-0.12.0rc0-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-0.12.0rc0-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/))
-* Mac CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-0.12.0rc0-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-0.12.0rc0-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/))
-* Mac GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-0.12.0rc0-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-0.12.0rc0-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/))
+* Linux CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-0.12.0rc1-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=cpu-slave)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-0.12.0rc1-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=cpu-slave/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-0.12.0rc1-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-python35-linux-cpu/))
+* Linux GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-0.12.0rc1-cp27-none-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-linux/)) / [Python 3.4](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-0.12.0rc1-cp34-cp34m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-linux/)) / [Python 3.5](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-0.12.0rc1-cp35-cp35m-linux_x86_64.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-linux-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3.5,label=gpu-linux/))
+* Mac CPU-only: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-0.12.0rc1-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=mac-slave/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow-0.12.0rc1-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-cpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=mac-slave/))
+* Mac GPU: [Python 2](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-0.12.0rc1-py2-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=gpu-mac/)) / [Python 3](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/lastSuccessfulBuild/artifact/pip_test/whl/tensorflow_gpu-0.12.0rc1-py3-none-any.whl) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-mac-gpu/TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=PIP,TF_BUILD_PYTHON_VERSION=PYTHON3,label=gpu-mac/))
* [Android](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-android/TF_BUILD_CONTAINER_TYPE=ANDROID,TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=NO_PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=android-slave/lastSuccessfulBuild/artifact/bazel-out/local_linux/bin/tensorflow/examples/android/tensorflow_demo.apk) ([build history](https://ci.tensorflow.org/view/Nightly/job/nightly-matrix-android/TF_BUILD_CONTAINER_TYPE=ANDROID,TF_BUILD_IS_OPT=OPT,TF_BUILD_IS_PIP=NO_PIP,TF_BUILD_PYTHON_VERSION=PYTHON2,label=android-slave/))
#### *Try your first TensorFlow program*
View
@@ -61,9 +61,7 @@
acceleration. Known limitations include: It is not currently possible to load
a custom op library. The GCS and HDFS file systems are not currently
supported. The following ops are not currently implemented:
- DepthwiseConv2dNative, DepthwiseConv2dNativeBackpropFilter,
- DepthwiseConv2dNativeBackpropInput, Dequantize, Digamma, Erf, Erfc, Igamma,
- Igammac, Lgamma, Polygamma, QuantizeAndDequantize, QuantizedAvgPool,
+ Dequantize, QuantizeAndDequantize, QuantizedAvgPool,
QuantizedBatchNomWithGlobalNormalization, QuantizedBiasAdd, QuantizedConcat,
QuantizedConv2D, QuantizedMatmul, QuantizedMaxPool,
QuantizeDownAndShrinkRange, QuantizedRelu, QuantizedRelu6, QuantizedReshape,
View
@@ -24,7 +24,8 @@ function bazel_clean_and_fetch() {
if ! is_windows; then
bazel clean --expunge
fi
- bazel fetch //tensorflow/...
+ # TODO(https://github.com/bazelbuild/bazel/issues/2220) Remove the nested `bazel query`.
+ bazel fetch $(bazel query "//tensorflow/... -//tensorflow/examples/android/...")
}
## Set up python-related environment settings
@@ -279,7 +280,7 @@ while true; do
TF_CUDNN_VERSION=${BASH_REMATCH[1]}
echo "libcudnn.so resolves to libcudnn${TF_CUDNN_EXT}"
elif [[ "$REALVAL" =~ ([0-9]*).dylib ]]; then
- TF_CUDNN_EXT=${BASH_REMATCH[1]}".dylib"
+ TF_CUDNN_EXT="."${BASH_REMATCH[1]}".dylib"
TF_CUDNN_VERSION=${BASH_REMATCH[1]}
echo "libcudnn.dylib resolves to libcudnn${TF_CUDNN_EXT}"
fi
@@ -435,7 +436,7 @@ while true; do
# Point to ComputeCpp root
if [ -z "$COMPUTECPP_TOOLKIT_PATH" ]; then
default_computecpp_toolkit_path=/usr/local/computecpp
- read -p "Please specify the location where ComputeCpp $TF_OPENCL_VERSION is installed. Refer to README.md for more details. [Default is $default_computecpp_toolkit_path]: " COMPUTECPP_TOOLKIT_PATH
+ read -p "Please specify the location where ComputeCpp for SYCL $TF_OPENCL_VERSION is installed. [Default is $default_computecpp_toolkit_path]: " COMPUTECPP_TOOLKIT_PATH
fromuser="1"
if [ -z "$COMPUTECPP_TOOLKIT_PATH" ]; then
COMPUTECPP_TOOLKIT_PATH=$default_computecpp_toolkit_path
View
@@ -51,6 +51,12 @@ config_setting(
)
config_setting(
+ name = "no_tensorflow_py_deps",
+ values = {"define": "no_tensorflow_py_deps=true"},
+ visibility = ["//visibility:public"],
+)
+
+config_setting(
name = "ios",
values = {
"crosstool_top": "//tools/osx/crosstool:crosstool",
@@ -13,12 +13,36 @@ Linux.
Current Status
--------------
+CMake can be used to build TensorFlow on Windows. See the [getting started documentation](https://www.tensorflow.org/get_started/os_setup.html#pip-installation-on-windows)
+for instructions on how to install a pre-built TensorFlow package on Windows.
+
+### Current known limitations
+* It is not possible to load a custom Op library.
+* GCS and HDFS file systems are not supported.
+* The following Ops are not currently implemented:
+ - Dequantize
+ - QuantizeAndDequantize
+ - QuantizedAvgPool
+ - QuantizedBatchNomWithGlobalNormalization
+ - QuantizedBiasAdd
+ - QuantizedConcat
+ - QuantizedConv2D
+ - QuantizedMatmul
+ - QuantizedMaxPoo
+ - QuantizeDownAndShrinkRange
+ - QuantizedRelu
+ - QuantizedRelu6
+ - QuantizedReshape
+ - QuantizeV2
+ - RequantizationRange
+ - Requantize
+
+## Building with CMake
+
The CMake files in this directory can build the core TensorFlow runtime, an
example C++ binary, and a PIP package containing the runtime and Python
bindings.
-Note: Windows support is in an **alpha** state, and we welcome your feedback.
-
### Pre-requisites
* CMake version 3.5 up to 3.6
@@ -46,6 +70,8 @@ Note: Windows support is in an **alpha** state, and we welcome your feedback.
- [swigwin-3.0.10](http://www.swig.org/download.html)
- [NVidia CUDA Toolkit 8.0] (https://developer.nvidia.com/cuda-downloads)
- [NVidia CUDNN 5.1] (https://developer.nvidia.com/cudnn)
+ - [CMake 3.6](https://cmake.org/files/v3.6/cmake-3.6.3-win64-x64.msi)
+
* Ubuntu 14.04
- Makefile generator
- Docker 1.9.1 (for automated testing)
@@ -26,7 +26,7 @@
from setuptools.command.install import install as InstallCommandBase
from setuptools.dist import Distribution
-_VERSION = '0.12.0-rc0-cmake-experimental'
+_VERSION = '0.12.0-rc1-cmake-experimental'
REQUIRED_PACKAGES = [
'numpy >= 1.11.0',
@@ -62,7 +62,7 @@ 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"
- )
+ )
list(APPEND tf_core_kernels_srcs ${tf_contrib_kernels_srcs})
endif(tensorflow_BUILD_CONTRIB_KERNELS)
@@ -48,7 +48,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(tensor_forest "${tensorflow_source_dir}/tensorflow/contrib/tensor_forest/ops/tensor_forest_ops.cc")
########################################################
# tf_user_ops library
@@ -188,6 +188,7 @@ add_python_module("tensorflow/python/lib")
add_python_module("tensorflow/python/lib/core")
add_python_module("tensorflow/python/lib/io")
add_python_module("tensorflow/python/ops")
+add_python_module("tensorflow/python/ops/losses")
add_python_module("tensorflow/python/platform")
add_python_module("tensorflow/python/platform/default")
add_python_module("tensorflow/python/platform/summary")
@@ -220,6 +221,7 @@ add_python_module("tensorflow/contrib/bayesflow/examples/reinforce_simple")
add_python_module("tensorflow/contrib/bayesflow/python")
add_python_module("tensorflow/contrib/bayesflow/python/kernel_tests")
add_python_module("tensorflow/contrib/bayesflow/python/ops")
+add_python_module("tensorflow/contrib/compiler")
add_python_module("tensorflow/contrib/copy_graph")
add_python_module("tensorflow/contrib/copy_graph/python")
add_python_module("tensorflow/contrib/copy_graph/python/util")
@@ -261,6 +263,12 @@ add_python_module("tensorflow/contrib/grid_rnn")
add_python_module("tensorflow/contrib/grid_rnn/python")
add_python_module("tensorflow/contrib/grid_rnn/python/kernel_tests")
add_python_module("tensorflow/contrib/grid_rnn/python/ops")
+add_python_module("tensorflow/contrib/image")
+add_python_module("tensorflow/contrib/image/python")
+add_python_module("tensorflow/contrib/image/python/ops")
+add_python_module("tensorflow/contrib/input_pipeline")
+add_python_module("tensorflow/contrib/input_pipeline/python")
+add_python_module("tensorflow/contrib/input_pipeline/python/ops")
add_python_module("tensorflow/contrib/integrate")
add_python_module("tensorflow/contrib/integrate/python")
add_python_module("tensorflow/contrib/integrate/python/ops")
@@ -301,6 +309,7 @@ add_python_module("tensorflow/contrib/learn/python/learn/preprocessing/tests")
add_python_module("tensorflow/contrib/learn/python/learn/tests")
add_python_module("tensorflow/contrib/learn/python/learn/tests/dataframe")
add_python_module("tensorflow/contrib/learn/python/learn/utils")
+add_python_module("tensorflow/contrib/legacy_seq2seq")
add_python_module("tensorflow/contrib/linalg")
add_python_module("tensorflow/contrib/linalg/python")
add_python_module("tensorflow/contrib/linalg/python/ops")
@@ -392,6 +401,7 @@ add_python_module("tensorflow/contrib/training/python")
add_python_module("tensorflow/contrib/training/python/training")
add_python_module("tensorflow/contrib/util")
+
# Additional directories with no Python sources.
add_custom_command(TARGET tf_python_touchup_modules PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/tensorboard/dist")
@@ -423,6 +433,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
@@ -432,7 +443,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.
@@ -453,7 +469,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
)
@@ -496,6 +512,8 @@ 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_tensor_forest_ops"
+ DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/tf_python/tensorflow/contrib/tensor_forest/python/ops/gen_tensor_forest_ops.py)
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)
Oops, something went wrong.

0 comments on commit 2e4869a

Please sign in to comment.