Merge changes from github.

END_PUBLIC

---
Commit cf375f067 authored by A. Unique TensorFlower<gardener@tensorflow.org>
Committed by Benoit Steiner<benoitsteiner@users.noreply.github.com>:
Adds cudnn_rnn_ops_op_lib and cudnn_rnn_kernels to contrib_ops_op_lib and
contrib_kernels respectively.

PiperOrigin-RevId: 164170971

---
Commit 95ec58e27 authored by Asim Shankar<ashankar@google.com>
Committed by Benoit Steiner<benoitsteiner@users.noreply.github.com>:
C API: Make TF_TensorFromTensor return an error instead of just logging it.

PiperOrigin-RevId: 164167582

---
Commit 15175c870 authored by Jonathan Hseu<jhseu@google.com>
Committed by Benoit Steiner<benoitsteiner@users.noreply.github.com>:
Build fixes.

- Allow var_list as a positional argument in CrossShardOptimizer.
- Set the number of shards to 1 when not running on TPU, to allow evaluate() and predict() on CPU/GPU to work.

PiperOrigin-RevId: 164161640

---
Commit bd3e894f7 authored by Yao Zhang<yaozhang@google.com>
Committed by Benoit Steiner<benoitsteiner@users.noreply.github.com>:
Support freeze mode for fused batch norm.

PiperOrigin-RevId: 164149032

---
Commit e6b6b84c0 authored by Asim Shankar<ashankar@google.com>
Committed by Benoit Steiner<benoitsteiner@users.noreply.github.com>:
C API: TF_Tensors will always be in host memory.

This change undoes some experimentation in
commit 22651083406ca01ac9d481e3367a3510d25f88cd
and restores TF_Tensor behavior to what is was prior to that change.

PiperOrigin-RevId: 164146670

---
Commit 8bf3f88f7 authored by Peter Hawkins<phawkins@google.com>
Committed by Benoit Steiner<benoitsteiner@users.noreply.github.com>:
[TF:XLA] Add _XLASend and _XLARecv TF ops that wrap the XLA Send/Recv HLO ops.

PiperOrigin-RevId: 164124764

---
Commit 626d3200f authored by Peter Hawkins<phawkins@google.com>
Committed by Benoit Steiner<benoitsteiner@users.noreply.github.com>:
[XLA] Add test blacklist mechanism for XLA C++ unit tests.

PiperOrigin-RevId: 164124423

---
Commit 359cc5f5e authored by A. Unique TensorFlower<gardener@tensorflow.org>
Committed by Benoit Steiner<benoitsteiner@users.noreply.github.com>:
Document dict ordering in nest and make it consistent with sonnet.

PiperOrigin-RevId: 164114335

---
Commit 05813b531 authored by A. Unique TensorFlower<gardener@tensorflow.org>
Committed by Benoit Steiner<benoitsteiner@users.noreply.github.com>:
Go: Update generated wrapper functions for TensorFlow ops.

PiperOrigin-RevId: 164089206

---
Commit c451f465d authored by Anna R<annarev@google.com>
Committed by Benoit Steiner<benoitsteiner@users.noreply.github.com>:
BEGIN_PUBLIC
Automated g4 rollback of changelist 164078808

PiperOrigin-RevId: 164318935

1 files changed, 4 insertions, 4 deletions

diff --git a/tensorflow/contrib/linear_optimizer/python/sdca_estimator.py b/tensorflow/contrib/linear_optimizer/python/sdca_estimator.py
index f4961ab9db..701fc1c059 100644
--- a/tensorflow/contrib/linear_optimizer/python/sdca_estimator.py
+++ b/tensorflow/contrib/linear_optimizer/python/sdca_estimator.py
@@ -227,7 +227,7 @@ class _SDCAEstimator(estimator.Estimator):
         will be multiplied by the loss of the example.
       model_dir: Directory to save model parameters, graph etc. This can also be
         used to load checkpoints from the directory into an estimator to
-        continue  training a previously saved model.
+        continue training a previously saved model.
       head: type of head. Currently, _BinaryLogisticHead and _BinarySvmHead are
         supported for classification and _RegressionHead for regression. It
         should be a subclass of _SingleHead.
@@ -312,7 +312,7 @@ class SDCALogisticClassifier(_SDCAEstimator):
   ```
 
   The input_fn provided to `fit`, `evaluate` and predict_* methods should return
-  the following features, otherwise there  will be a `KeyError`:
+  the following features, otherwise there will be a `KeyError`:
     * A feature with `key=example_id_column` whose value is a `Tensor` of dtype
       string.
     * If `weight_column_name` is not `None`, a feature with
@@ -438,7 +438,7 @@ class SDCALinearRegressor(_SDCAEstimator):
   ```
 
   The input_fn provided to `fit`, `evaluate` and predict_* methods should return
-  the following features, otherwise there  will be a `KeyError`:
+  the following features, otherwise there will be a `KeyError`:
     * A feature with `key=example_id_column` whose value is a `Tensor` of dtype
       string.
     * If `weight_column_name` is not `None`, a feature with
@@ -478,7 +478,7 @@ class SDCALinearRegressor(_SDCAEstimator):
         will be multiplied by the loss of the example.
       model_dir: Directory to save model parameters, graph etc. This can also be
         used to load checkpoints from the directory into an estimator to
-        continue  training a previously saved model.
+        continue training a previously saved model.
       l1_regularization: L1-regularization parameter. Refers to global L1
         regularization (across all examples).
       l2_regularization: L2-regularization parameter. Refers to global L2