p47068915
/
mindspore
forked from mindspore-Ecosystem/mindspore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!10857 Fixing Some CI issues 

From: @mahdirahmanihanzaki
Reviewed-by: @nsyca,@robingrosman
Signed-off-by: @nsyca
This commit is contained in:
mindspore-ci-bot 2021-01-05 22:06:48 +08:00 committed by Gitee
parent f9cfe565a0 c622e9cb12
commit bfca91c8ad
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mindspore/ccsrc/minddata/dataset/engine/consumers/tree_consumer.cc
View File

@ -593,6 +593,8 @@ Status DatasetSizeGetter::GetRow(const std::shared_ptr<TreeAdapter> &tree_adapte
} }
Status DatasetSizeGetter::Terminate() { Status DatasetSizeGetter::Terminate() {
for (const auto &tree : tree_adapters_) { for (const auto &tree : tree_adapters_) {
RETURN_UNEXPECTED_IF_NULL(tree);
RETURN_UNEXPECTED_IF_NULL(tree->AllTasks());
RETURN_IF_NOT_OK(tree->AllTasks()->ServiceStop()); RETURN_IF_NOT_OK(tree->AllTasks()->ServiceStop());
} }
return Status::OK(); return Status::OK();

2
mindspore/ccsrc/minddata/dataset/engine/ir/datasetops/source/minddata_node.cc
View File

@ -187,7 +187,7 @@ Status MindDataNode::GetDatasetSize(const std::shared_ptr<DatasetSizeGetter> &si
*dataset_size = dataset_size_; *dataset_size = dataset_size_;
return Status::OK(); return Status::OK();
} }
int64_t num_rows; int64_t num_rows = -1;
std::vector<std::shared_ptr<ShardOperator>> operators; std::vector<std::shared_ptr<ShardOperator>> operators;
RETURN_IF_NOT_OK(BuildMindDatasetSamplerChain(sampler_, &operators, num_padded_)); RETURN_IF_NOT_OK(BuildMindDatasetSamplerChain(sampler_, &operators, num_padded_));