diff options
Diffstat (limited to 'tensorflow/contrib/learn/python')
3 files changed, 6 insertions, 5 deletions
diff --git a/tensorflow/contrib/learn/python/learn/datasets/mnist.py b/tensorflow/contrib/learn/python/learn/datasets/mnist.py index 59bdea7293..01262ff5f8 100644 --- a/tensorflow/contrib/learn/python/learn/datasets/mnist.py +++ b/tensorflow/contrib/learn/python/learn/datasets/mnist.py @@ -193,8 +193,8 @@ class DataSet(object): start = 0 self._index_in_epoch = batch_size - rest_num_examples end = self._index_in_epoch - images_new_part = self.images[start:end] - labels_new_part = self.labels[start:end] + images_new_part = self._images[start:end] + labels_new_part = self._labels[start:end] return numpy.concatenate((images_rest_part, images_new_part), axis=0) , numpy.concatenate((labels_rest_part, labels_new_part), axis=0) else: self._index_in_epoch += batch_size diff --git a/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined.py b/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined.py index d1113678a9..f472034225 100644 --- a/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined.py +++ b/tensorflow/contrib/learn/python/learn/estimators/dnn_linear_combined.py @@ -171,7 +171,7 @@ def _dnn_linear_combined_model_fn(features, labels, mode, params, config=None): dnn_feature_columns = params.get("dnn_feature_columns") dnn_optimizer = params.get("dnn_optimizer") or "Adagrad" dnn_hidden_units = params.get("dnn_hidden_units") - dnn_activation_fn = params.get("dnn_activation_fn") + dnn_activation_fn = params.get("dnn_activation_fn") or nn.relu dnn_dropout = params.get("dnn_dropout") gradient_clip_norm = params.get("gradient_clip_norm") input_layer_min_slice_size = ( @@ -346,7 +346,7 @@ class _DNNLinearCombinedEstimator(estimator.Estimator): dnn_feature_columns=None, dnn_optimizer=None, dnn_hidden_units=None, - dnn_activation_fn=nn.relu, + dnn_activation_fn=None, dnn_dropout=None, gradient_clip_norm=None, config=None, diff --git a/tensorflow/contrib/learn/python/learn/experiment.py b/tensorflow/contrib/learn/python/learn/experiment.py index e64becd888..043ce349d1 100644 --- a/tensorflow/contrib/learn/python/learn/experiment.py +++ b/tensorflow/contrib/learn/python/learn/experiment.py @@ -407,7 +407,8 @@ class Experiment(object): performing evaluation allows for the second. Returns: - The result of the `evaluate` call to the `Estimator`. + The result of the `evaluate` call to the `Estimator` as well as the + export results using the specified `ExportStrategy`. """ # The directory to which evaluation summaries are written are determined # by adding a suffix to 'eval'; that suffix is the 'name' parameter to |