xxq250
/
mindspore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!5672 Fix minddata c++api schema issue 

Merge pull request !5672 from xiefangqi/xfq_fix_schema
This commit is contained in:
mindspore-ci-bot 2020-09-03 11:41:33 +08:00 committed by Gitee
parent 4bb71d54ea d30f4d5a6c
commit dc8dbeb2b8
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mindspore/ccsrc/minddata/dataset/api/datasets.cc
View File

@ -474,6 +474,10 @@ bool SchemaObj::init() {
try { try {
std::ifstream in(schema_file_); std::ifstream in(schema_file_);
in >> js; in >> js;
if (js.find("columns") == js.end()) {
MS_LOG(ERROR) << "\"columns\" node is required in the schema json file.";
return false;
}
} catch (const std::exception &err) { } catch (const std::exception &err) {
MS_LOG(ERROR) << "Schema file failed to load"; MS_LOG(ERROR) << "Schema file failed to load";
return false; return false;
@ -1399,10 +1403,11 @@ std::vector<std::shared_ptr<DatasetOp>> RandomDataset::Build() {
rand_gen_.seed(GetSeed()); // seed the random generator rand_gen_.seed(GetSeed()); // seed the random generator
// If total rows was not given, then randomly pick a number // If total rows was not given, then randomly pick a number
std::shared_ptr<SchemaObj> schema_obj; std::shared_ptr<SchemaObj> schema_obj;
if (!schema_path_.empty()) schema_obj = std::make_shared<SchemaObj>(schema_path_); if (!schema_path_.empty()) {
schema_obj = Schema(schema_path_);
if (schema_obj != nullptr && total_rows_ == 0) { if (schema_obj == nullptr) {
total_rows_ = schema_obj->get_num_rows(); return {};
}
} }
std::string schema_json_string, schema_file_path; std::string schema_json_string, schema_file_path;