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

[tf.data][cherrypick] Fix snapshot segfault when using repeat and pre… #49124

Merged
merged 2 commits into from May 12, 2021
Merged

[tf.data][cherrypick] Fix snapshot segfault when using repeat and pre… #49124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a13c0ad
[tf.data][cherrypick] Fix snapshot segfault when using repeat and pre…
mihaimaruseac May 12, 2021
16b8139
Update snapshot_dataset_op.cc
mihaimaruseac May 12, 2021
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: 6 additions & 10 deletions tensorflow/core/kernels/data/experimental/snapshot_dataset_op.cc
View file
Open in desktop
Expand Up @@ -201,8 +201,6 @@ class SnapshotDatasetV2Op::Dataset::Iterator::Reader

explicit Reader(const Params& params, int64 start_index);

~Reader() override;

Status Initialize(IteratorContext* ctx) override;

Status GetNextInternal(IteratorContext* ctx, std::vector<Tensor>* out_tensors,
Expand All @@ -222,7 +220,7 @@ class SnapshotDatasetV2Op::Dataset::Iterator::Reader

std::unique_ptr<IteratorBase> input_impl_ TF_GUARDED_BY(mu_);

DatasetBase* input_ TF_GUARDED_BY(mu_);
DatasetBase* input_ TF_GUARDED_BY(mu_) = nullptr;

std::unique_ptr<InstantiatedCapturedFunction> instantiated_reader_func_
TF_GUARDED_BY(mu_);
Expand Down Expand Up @@ -468,7 +466,11 @@ Status SnapshotDatasetV2Op::Dataset::Iterator::GetNextInternal(
bool* end_of_sequence) {
mutex_lock l(mu_);
if (iterator_ == nullptr) {
TF_RETURN_IF_ERROR(InitializeIterator(ctx, nullptr));
Status s = InitializeIterator(ctx, nullptr);
if (!s.ok()) {
iterator_.reset();
return s;
}
}
index_++;
return iterator_->GetNext(ctx, out_tensors, end_of_sequence);
Expand Down Expand Up @@ -547,8 +549,6 @@ SnapshotDatasetV2Op::Dataset::Iterator::Reader::Reader(const Params& params,
int64 start_index)
: DatasetIterator<Dataset>(params), start_index_(start_index) {}

SnapshotDatasetV2Op::Dataset::Iterator::Reader::~Reader() { input_->Unref(); }
mihaimaruseac marked this conversation as resolved.
Show resolved Hide resolved

Status SnapshotDatasetV2Op::Dataset::Iterator::Reader::Initialize(
IteratorContext* ctx) {
mutex_lock l(mu_);
Expand Down Expand Up @@ -597,10 +597,6 @@ Status SnapshotDatasetV2Op::Dataset::Iterator::Reader::Initialize(
}
TF_RETURN_IF_ERROR(GetDatasetFromVariantTensor(reader_output[0], &input_));

// We need to take a reference here as we will use the input_ and
// its iterator.
input_->Ref();

return input_->MakeIterator(ctx, this, prefix(), &input_impl_);
}

Expand Down
13 changes: 13 additions & 0 deletions tensorflow/python/data/experimental/kernel_tests/snapshot_test.py
View file
Open in desktop
Expand Up @@ -413,6 +413,19 @@ def testReadOptimizableUsingFlatMap(self):
num_runs_per_fingerprint=1,
num_snapshot_shards_per_run=multiprocessing.cpu_count())

@combinations.generate(test_base.default_test_combinations())
def testRepeatAndPrefetch(self):
"""This test reproduces github.com/tensorflow/tensorflow/issues/48903."""
dataset = dataset_ops.Dataset.from_tensor_slices(np.random.rand(16, 32))
dataset = dataset.apply(snapshot.snapshot(self._snapshot_dir))
dataset = dataset.shuffle(buffer_size=16)
dataset = dataset.batch(16)
dataset = dataset.repeat()
dataset = dataset.prefetch(1)
next_element = self.getNext(dataset)
for _ in range(30):
self.evaluate(next_element())


class LegacySnapshotTest(tf_record_test_base.TFRecordTestBase,
parameterized.TestCase):
Expand Down