Skip to content

Commit af64f39

Browse files
committed
fix compile errors
1 parent 3fcd16e commit af64f39

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

paddle/fluid/framework/reader.cc

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,13 @@ void DoubleBufferReader::ReadNext(std::vector<LoDTensor>* out) {
120120
}
121121

122122
out->clear();
123-
out->resize(buffer_[read_pos_].size());
123+
out->reserve(buffer_[read_pos_].size());
124124
// TODO(fengjiayi): This copy shall be reduced.
125125
for (size_t i = 0; i < buffer_[read_pos_].size(); ++i) {
126-
TensorCopy(buffer_[read_pos_][i], platform::CPUPlace(), &out[i]);
127-
out[i].set_lod(buffer_[read_pos_][i].lod());
126+
LoDTensor dst;
127+
TensorCopy(buffer_[read_pos_][i], platform::CPUPlace(), &dst);
128+
dst.set_lod(buffer_[read_pos_][i].lod());
129+
out->push_back(dst);
128130
}
129131

130132
++read_pos_;
@@ -134,13 +136,13 @@ void DoubleBufferReader::ReadNext(std::vector<LoDTensor>* out) {
134136
buffer_not_full_.notify_all();
135137
}
136138

137-
bool DoubleBufferReader::HasNext() {
139+
bool DoubleBufferReader::HasNext() const {
138140
return reader_->HasNext() || !buffer_.empty();
139141
}
140142

141143
void DoubleBufferReader::ProducerThreadFunc() {
142144
while (reader_->HasNext()) {
143-
std::unique_lock<std::mutex> lck(mtx);
145+
std::unique_lock<std::mutex> lck(mtx_);
144146
while (((write_pos_ + 1) % kDoubleBufferSize) == read_pos_) {
145147
buffer_not_full_.wait(lck);
146148
}

paddle/fluid/framework/reader.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ class BatchReader : public DecoratedReader {
140140

141141
class DoubleBufferReader : public DecoratedReader {
142142
public:
143-
DoubleBufferReader(ReaderBase* reader)
143+
explicit DoubleBufferReader(ReaderBase* reader)
144144
: DecoratedReader(reader), buffer_(kDoubleBufferSize) {
145145
framework::Async(std::bind(&DoubleBufferReader::ProducerThreadFunc, this));
146146
}

0 commit comments

Comments
 (0)