diff options
| author |  Yifei Feng <yifeif@google.com> | 2017-11-21 23:32:43 -0800 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2017-11-21 23:36:22 -0800 |
| commit | c6d603f02e1a98f871912cda6716cdcbed6b439e (patch) | |
| tree | 4658788770c03d8a5bfd48eee59c247559344f08 /tensorflow/contrib/batching | |
| parent | f93c48dc061d23495a4425fcad17d55159cb02b1 (diff) | |
Merge changes from github.
PiperOrigin-RevId: 176615107
Diffstat (limited to 'tensorflow/contrib/batching')
| -rw-r--r-- | tensorflow/contrib/batching/BUILD | 1 | ||||
| -rw-r--r-- | tensorflow/contrib/batching/kernels/batch_kernels.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tensorflow/contrib/batching/BUILD b/tensorflow/contrib/batching/BUILD index 8b7df4a84c..a111cfecb3 100644 --- a/tensorflow/contrib/batching/BUILD +++ b/tensorflow/contrib/batching/BUILD @@ -82,6 +82,7 @@ cc_library( tf_cc_test( name = "adaptive_shared_batch_scheduler_test", srcs = ["adaptive_shared_batch_scheduler_test.cc"], + tags = ["manual"], # b/69013768 deps = [ ":adaptive_shared_batch_scheduler", "//tensorflow/contrib/batching/test_util:fake_clock_env", diff --git a/tensorflow/contrib/batching/kernels/batch_kernels.cc b/tensorflow/contrib/batching/kernels/batch_kernels.cc index 3b7c538fcc..6041d8c9b2 100644 --- a/tensorflow/contrib/batching/kernels/batch_kernels.cc +++ b/tensorflow/contrib/batching/kernels/batch_kernels.cc @@ -461,7 +461,7 @@ class BatchResource : public ResourceBase { return Status::OK(); } - // Looks up the batcher queue for 'queue_name'. If it did't previously exist, + // Looks up the batcher queue for 'queue_name'. If it didn't previously exist, // creates it. Status LookupOrCreateBatcherQueue(const string& queue_name, BatcherQueue** queue) { |