diff options
| author |  Yifei Feng <yifeif@google.com> | 2018-05-24 19:12:26 -0700 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2018-05-24 19:15:01 -0700 |
| commit | b59833c3fd91511b33255369016868e4ae6cda2e (patch) | |
| tree | ecbd70cfd3abb5d934f6eb4b7280a35e8589f5cf /tensorflow/core/kernels/batching_util | |
| parent | 2b99d9cbc7166efedaff9eee11744348da30fc8a (diff) | |
Merge changes from github.
Revert #18413. Too many internal test failures due to the name scope change caused by this change.
Revert #18192. Cannot use re2::StringPiece internally. Need alternative for set call. Will pull and clean this up in a separate change.
PiperOrigin-RevId: 197991247
Diffstat (limited to 'tensorflow/core/kernels/batching_util')
| -rw-r--r-- | tensorflow/core/kernels/batching_util/adaptive_shared_batch_scheduler.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tensorflow/core/kernels/batching_util/adaptive_shared_batch_scheduler.h b/tensorflow/core/kernels/batching_util/adaptive_shared_batch_scheduler.h index c6119b5011..b77c14d012 100644 --- a/tensorflow/core/kernels/batching_util/adaptive_shared_batch_scheduler.h +++ b/tensorflow/core/kernels/batching_util/adaptive_shared_batch_scheduler.h @@ -76,7 +76,7 @@ class AdaptiveSharedBatchScheduler AdaptiveSharedBatchScheduler<TaskType>> { public: ~AdaptiveSharedBatchScheduler() { - // Finish processing batches before destorying other class members. + // Finish processing batches before destroying other class members. batch_thread_pool_.reset(); } |