Browse Source

fix tfreadDataset hang when shard_equal_rows is true

tags/v0.5.0-beta
yanghaitao 5 years ago
parent
commit
f55cda2c56
1 changed files with 8 additions and 2 deletions
  1. +8
    -2
      mindspore/ccsrc/dataset/engine/datasetops/source/tf_reader_op.cc

+ 8
- 2
mindspore/ccsrc/dataset/engine/datasetops/source/tf_reader_op.cc View File

@@ -433,11 +433,13 @@ Status TFReaderOp::FillIOBlockShuffle(const std::vector<int64_t> &i_keys) {
int64_t start_offset = 0;
int64_t end_offset = 0;
bool finish = false;
bool end_of_epoch = false;
while (!finish) {
for (auto it = i_keys.begin(); it != i_keys.end(); ++it) {
{
std::unique_lock<std::mutex> lock(load_io_block_queue_mutex_);
if (load_io_block_queue_ == false) {
end_of_epoch = true;
break;
}
}
@@ -461,7 +463,8 @@ Status TFReaderOp::FillIOBlockShuffle(const std::vector<int64_t> &i_keys) {
pre_count += filename_numrows_[file_name];
}
}
if (equal_rows_per_shard_ && pre_count < (static_cast<int64_t>(device_id_) + 1) * num_rows_per_shard_) {
if (equal_rows_per_shard_ && pre_count < (static_cast<int64_t>(device_id_) + 1) * num_rows_per_shard_ &&
!end_of_epoch) {
finish = false;
} else {
finish = true;
@@ -478,12 +481,14 @@ Status TFReaderOp::FillIOBlockNoShuffle() {
int64_t start_offset = 0;
int64_t end_offset = 0;
bool finish = false;
bool end_of_epoch = true;
while (!finish) {
// Iterate over all the keys and add one key to each block.
for (auto it = filename_index_->begin(); it != filename_index_->end(); ++it) {
{
std::unique_lock<std::mutex> lock(load_io_block_queue_mutex_);
if (load_io_block_queue_ == false) {
end_of_epoch = true;
break;
}
}
@@ -505,7 +510,8 @@ Status TFReaderOp::FillIOBlockNoShuffle() {
pre_count += filename_numrows_[file_name];
}
}
if (equal_rows_per_shard_ && pre_count < (static_cast<int64_t>(device_id_) + 1) * num_rows_per_shard_) {
if (equal_rows_per_shard_ && pre_count < (static_cast<int64_t>(device_id_) + 1) * num_rows_per_shard_ &&
!end_of_epoch) {
finish = false;
} else {
finish = true;


Loading…
Cancel
Save