Merge commit for internal changes
authorYifei Feng <yifeif@google.com>
Tue, 29 May 2018 19:57:14 +0000 (12:57 -0700)
committerYifei Feng <yifeif@google.com>
Tue, 29 May 2018 19:57:14 +0000 (12:57 -0700)
commit48d13f510b70e48b61a435011f78bfef4df55c9b
treefbf5d2505e3bf2aa8121053a16a8f74aa74ae018
parentbaa794b4c02db5a5d4c115383564a271dd8f875d
parent7b5c87e20ccdd1b3194a517e2b7fbf11581293dd
Merge commit for internal changes
24 files changed:
tensorflow/contrib/cmake/tf_c.cmake
tensorflow/contrib/lite/kernels/internal/reference/reference_ops.h
tensorflow/contrib/tensorrt/BUILD
tensorflow/core/BUILD
tensorflow/core/kernels/scoped_allocator_ops_test.cc
tensorflow/core/ops/dataset_ops.cc
tensorflow/docs_src/get_started/index.md
tensorflow/docs_src/programmers_guide/estimators.md
tensorflow/docs_src/programmers_guide/feature_columns.md
tensorflow/go/op/wrappers.go
tensorflow/java/src/gen/cc/java_defs.h
tensorflow/java/src/gen/cc/op_generator.cc
tensorflow/java/src/gen/cc/op_generator.h
tensorflow/java/src/gen/cc/source_writer.cc
tensorflow/python/estimator/exporter.py
tensorflow/python/estimator/keras.py
tensorflow/python/framework/ops.py
tensorflow/python/framework/ops_test.py
tensorflow/python/keras/engine/network.py
tensorflow/python/kernel_tests/py_func_test.py
tensorflow/python/ops/image_ops_impl.py
tensorflow/python/ops/nn_ops.py
tensorflow/tools/dist_test/local_test.sh
tensorflow/workspace.bzl