aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/contrib/training
diff options
context:
space:
mode:
authorGravatar Yifei Feng <yifeif@google.com>2018-04-19 19:39:04 -0700
committerGravatar Yifei Feng <yifeif@google.com>2018-04-19 19:39:04 -0700
commitb1f78498659bd17c2d897a224eb19476d1efce60 (patch)
treedccb2ba37396e2980c098e9d2ea4bc1668ca6f9c /tensorflow/contrib/training
parenta734919fd8fd6d74edf1e7c3abec3ee11fec83fd (diff)
parentb001827146ff95c9e0ce5668c85d8cc2daf6b78d (diff)
Merge commit for internal changes
Diffstat (limited to 'tensorflow/contrib/training')
-rw-r--r--tensorflow/contrib/training/BUILD1
-rw-r--r--tensorflow/contrib/training/__init__.py5
2 files changed, 5 insertions, 1 deletions
diff --git a/tensorflow/contrib/training/BUILD b/tensorflow/contrib/training/BUILD
index 4d2bfd3e43..5de55b5f7f 100644
--- a/tensorflow/contrib/training/BUILD
+++ b/tensorflow/contrib/training/BUILD
@@ -60,6 +60,7 @@ py_library(
"//tensorflow/python:util",
"//tensorflow/python:variable_scope",
"//tensorflow/python:variables",
+ "//tensorflow/python/data",
"//tensorflow/python/estimator:inputs_queues",
"//third_party/py/numpy",
"@six_archive//:six",
diff --git a/tensorflow/contrib/training/__init__.py b/tensorflow/contrib/training/__init__.py
index da2de3e421..edd71fb250 100644
--- a/tensorflow/contrib/training/__init__.py
+++ b/tensorflow/contrib/training/__init__.py
@@ -57,6 +57,8 @@ from tensorflow.contrib.training.python.training.hparam import *
from tensorflow.contrib.training.python.training.resample import *
from tensorflow.contrib.training.python.training.sampling_ops import *
from tensorflow.contrib.training.python.training.sequence_queueing_state_saver import *
+from tensorflow.contrib.training.python.training.tensor_queue_dataset import enqueue_in_queue_dataset
+from tensorflow.contrib.training.python.training.tensor_queue_dataset import prepend_from_queue_and_padded_batch_dataset
from tensorflow.contrib.training.python.training.training import add_gradients_summaries
from tensorflow.contrib.training.python.training.training import clip_gradient_norms
from tensorflow.contrib.training.python.training.training import clip_gradient_norms_fn
@@ -75,6 +77,7 @@ _allowed_symbols = [
'FeedingQueueRunner', 'get_or_create_eval_step', 'StopAfterNEvalsHook',
'SummaryAtEndHook', 'wait_for_new_checkpoint', 'add_gradients_summaries',
'clip_gradient_norms', 'clip_gradient_norms_fn', 'create_train_op',
- 'multiply_gradients', 'train']
+ 'multiply_gradients', 'enqueue_in_queue_dataset',
+ 'prepend_from_queue_and_padded_batch_dataset', 'train']
remove_undocumented(__name__, _allowed_symbols)