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 validation for tag input of StatsDataset #18462

Merged
merged 5 commits into from
Apr 14, 2018
Merged

Add shape validation for tag input of StatsDataset #18462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
04a4e27
Add shape validation for tag input of StatsDataset
yongtang Apr 11, 2018
f6faa11
Add test case for tag shape check with BytesProducedStatsDataset
yongtang Apr 11, 2018
843149d
Add tag shape check for LatencyStatsDataset
yongtang Apr 11, 2018
523ba30
Add test case for tag shape check with LatencyStatsDataset
yongtang Apr 11, 2018
d19bed1
Fix pylint issue
yongtang Apr 11, 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
16 changes: 16 additions & 0 deletions tensorflow/contrib/data/python/kernel_tests/stats_dataset_ops_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,14 @@ def _build_dataset_bytes_stats(self, num_elements):
lambda x: array_ops.tile([x], ops.convert_to_tensor([x]))).apply(
stats_ops.bytes_produced_stats("bytes_produced"))

def test_bytes_produced_stats_invalid_tag_shape(self):
with self.assertRaisesRegexp(
ValueError, 'Shape must be rank 0 but is rank 1'):
self.run_core_tests(
lambda: dataset_ops.Dataset.range(100).apply(
stats_ops.bytes_produced_stats(["bytes_produced"])),
None, 100)

def testBytesStatsDatasetSaveableCore(self):
num_outputs = 100
self.run_core_tests(
Expand All @@ -235,6 +243,14 @@ def _build_dataset_multiple_tags(self,
return dataset_ops.Dataset.range(num_elements).apply(
stats_ops.latency_stats(tag1)).apply(stats_ops.latency_stats(tag2))

def test_latency_stats_invalid_tag_shape(self):
with self.assertRaisesRegexp(
ValueError, 'Shape must be rank 0 but is rank 1'):
self.run_core_tests(
lambda: dataset_ops.Dataset.range(100).apply(
stats_ops.latency_stats(["record_latency", "record_latency_2"])),
None, 100)

def testLatencyStatsDatasetSaveableCore(self):
num_outputs = 100

Expand Down
12 changes: 10 additions & 2 deletions tensorflow/core/ops/dataset_ops.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,15 +141,23 @@ REGISTER_OP("BytesProducedStatsDataset")
.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 tag_shape;
TF_RETURN_IF_ERROR(c->WithRank(c->input(1), 0, &tag_shape));
return shape_inference::ScalarShape(c);
});

REGISTER_OP("LatencyStatsDataset")
.Input("input_dataset: variant")
.Input("tag: string")
.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 tag_shape;
TF_RETURN_IF_ERROR(c->WithRank(c->input(1), 0, &tag_shape));
return shape_inference::ScalarShape(c);
});

REGISTER_OP("MapDataset")
.Input("input_dataset: variant")
Expand Down