Skip to content

Commit d55919c

Browse files
committed
Impl ResetAll and fix errors
1 parent 6d6f49c commit d55919c

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

paddle/fluid/framework/reader.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ void ReaderBase::ReadNext(std::vector<LoDTensor> *out) {
2626

2727
void ReaderBase::InsertDecoratedReader(
2828
const std::shared_ptr<ReaderBase> &decorated_reader) {
29-
std::lock_guard<std::mutex> guard(mu_));
29+
std::lock_guard<std::mutex> guard(mu_);
3030
decorated_readers_.emplace_back(decorated_reader);
3131
}
3232

paddle/fluid/framework/reader.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,13 @@ class ReaderHolder {
104104
}
105105

106106
void ResetAll() {
107-
// TODO(fengjiayi): The interface of reseting all.
107+
auto end_readers = reader_->GetEndPoints();
108+
for (auto* reader : end_readers) {
109+
reader->Shutdown();
110+
}
111+
for (auto* reader : end_readers) {
112+
reader->Start();
113+
}
108114
}
109115

110116
void Shutdown() {

paddle/fluid/framework/reader_test.cc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@ class StubDecoratedReader : public paddle::framework::DecoratedReader {
2121
explicit StubDecoratedReader(const std::shared_ptr<ReaderBase> &reader)
2222
: DecoratedReader(reader) {}
2323

24-
void ReadNext(std::vector<paddle::framework::LoDTensor> *out) override {}
24+
void ReadNextImpl(std::vector<paddle::framework::LoDTensor> *out) override {}
2525
};
2626

2727
class StubRootReader : public paddle::framework::ReaderBase {
2828
public:
29-
void ReadNext(std::vector<paddle::framework::LoDTensor> *out) override {}
30-
void ReInit() override {}
29+
void ReadNextImpl(std::vector<paddle::framework::LoDTensor> *out) override {}
3130
};
3231

3332
TEST(READER, decorate_chain) {

python/paddle/fluid/layers/io.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -375,9 +375,6 @@ def open_recordio_file(filename,
375375
if pass_num > 1:
376376
main_prog_var = multi_pass(reader=main_prog_var, pass_num=pass_num)
377377

378-
if for_parallel:
379-
main_prog_var = parallel(reader=main_prog_var)
380-
381378
return monkey_patch_reader_methods(main_prog_var)
382379

383380

0 commit comments

Comments
 (0)