Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add shape check for batch related Dataset ops #18683

Merged
merged 5 commits into from
Apr 19, 2018
Merged

Add shape check for batch related Dataset ops #18683

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6c8fc1f
Add shape check for PrefetchDataset
yongtang Apr 19, 2018
a1a75b4
Add BatchDataset shape check
yongtang Apr 19, 2018
8923f79
Add shape check for SlideDataset
yongtang Apr 19, 2018
e2ef019
Add shape check for DenseToSparseBatchDataset
yongtang Apr 19, 2018
c38f3d3
Sanitize with clang-format -i --style=Google
yongtang Apr 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 27 additions & 4 deletions tensorflow/core/ops/dataset_ops.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,12 @@ REGISTER_OP("PrefetchDataset")
.Output("handle: variant")
.Attr("output_types: list(type) >= 1")
.Attr("output_shapes: list(shape) >= 1")
.SetShapeFn(shape_inference::ScalarShape);
.SetShapeFn([](shape_inference::InferenceContext* c) {
shape_inference::ShapeHandle unused;
// buffer_size should be a scalar.
TF_RETURN_IF_ERROR(c->WithRank(c->input(1), 0, &unused));
return shape_inference::ScalarShape(c);
});

REGISTER_OP("ScanDataset")
.Input("input_dataset: variant")
Expand Down Expand Up @@ -283,7 +288,12 @@ REGISTER_OP("BatchDataset")
.Output("handle: variant")
.Attr("output_types: list(type) >= 1")
.Attr("output_shapes: list(shape) >= 1")
.SetShapeFn(shape_inference::ScalarShape);
.SetShapeFn([](shape_inference::InferenceContext* c) {
shape_inference::ShapeHandle unused;
// batch_size should be a scalar.
TF_RETURN_IF_ERROR(c->WithRank(c->input(1), 0, &unused));
return shape_inference::ScalarShape(c);
});

// TODO(mrry): move SlideDataset to contrib in the future.
REGISTER_OP("SlideDataset")
Expand All @@ -293,7 +303,13 @@ REGISTER_OP("SlideDataset")
.Output("handle: variant")
.Attr("output_types: list(type) >= 1")
.Attr("output_shapes: list(shape) >= 1")
.SetShapeFn(shape_inference::ScalarShape);
.SetShapeFn([](shape_inference::InferenceContext* c) {
shape_inference::ShapeHandle unused;
// window_size and stride should be scalars.
TF_RETURN_IF_ERROR(c->WithRank(c->input(1), 0, &unused));
TF_RETURN_IF_ERROR(c->WithRank(c->input(2), 0, &unused));
return shape_inference::ScalarShape(c);
});

REGISTER_OP("PaddedBatchDataset")
.Input("input_dataset: variant")
Expand Down Expand Up @@ -323,7 +339,14 @@ REGISTER_OP("DenseToSparseBatchDataset")
.Output("handle: variant")
.Attr("output_types: list(type) >= 1")
.Attr("output_shapes: list(shape) >= 1")
.SetShapeFn(shape_inference::ScalarShape);
.SetShapeFn([](shape_inference::InferenceContext* c) {
shape_inference::ShapeHandle unused;
// batch_size should be a scalar.
TF_RETURN_IF_ERROR(c->WithRank(c->input(1), 0, &unused));
// row_shape should be a 1-D vector.
TF_RETURN_IF_ERROR(c->WithRank(c->input(2), 1, &unused));
return shape_inference::ScalarShape(c);
});

REGISTER_OP("RangeDataset")
.Input("start: int64")
Expand Down