aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/core/ops/dataset_ops.cc
diff options
context:
space:
mode:
authorGravatar Jacques Pienaar <jpienaar@google.com>2018-03-15 12:58:08 -0700
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2018-03-15 13:03:19 -0700
commitccd8079e579604547f4b4d8a6b061cfdc6ce49bf (patch)
tree0d498e84ca32a101afcada0993a30a5e3b0452a2 /tensorflow/core/ops/dataset_ops.cc
parent61032e9ca7bf9849cb65db9b646381d124080856 (diff)
Merge changes from github.
PiperOrigin-RevId: 189231636
Diffstat (limited to 'tensorflow/core/ops/dataset_ops.cc')
-rw-r--r--tensorflow/core/ops/dataset_ops.cc12
1 files changed, 11 insertions, 1 deletions
diff --git a/tensorflow/core/ops/dataset_ops.cc b/tensorflow/core/ops/dataset_ops.cc
index bdbbf6d7c3..9a4b616e5d 100644
--- a/tensorflow/core/ops/dataset_ops.cc
+++ b/tensorflow/core/ops/dataset_ops.cc
@@ -1,4 +1,4 @@
-/* Copyright 2017 The TensorFlow Authors. All Rights Reserved.
+/* Copyright 2018 The TensorFlow Authors. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -265,6 +265,16 @@ REGISTER_OP("BatchDataset")
.Attr("output_shapes: list(shape) >= 1")
.SetShapeFn(shape_inference::ScalarShape);
+// TODO(mrry): move SlideDataset to contrib in the future.
+REGISTER_OP("SlideDataset")
+ .Input("input_dataset: variant")
+ .Input("window_size: int64")
+ .Input("stride: int64")
+ .Output("handle: variant")
+ .Attr("output_types: list(type) >= 1")
+ .Attr("output_shapes: list(shape) >= 1")
+ .SetShapeFn(shape_inference::ScalarShape);
+
REGISTER_OP("PaddedBatchDataset")
.Input("input_dataset: variant")
.Input("batch_size: int64")