From 1125c717766ca51e969b3884db9097ba11b57a8d Mon Sep 17 00:00:00 2001 From: jiangzhiwen Date: Thu, 6 Aug 2020 09:17:07 +0800 Subject: [PATCH] count rows function adapt euler eof --- .../ccsrc/minddata/dataset/engine/datasetops/source/csv_op.cc | 4 ++-- .../ccsrc/minddata/dataset/engine/datasetops/source/csv_op.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/csv_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/csv_op.cc index 1bf887458f..229fae59bd 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/csv_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/csv_op.cc @@ -168,7 +168,7 @@ int CsvOp::CsvParser::end_file(char c) { return 0; } -int CsvOp::CsvParser::countRows(char c) { +int CsvOp::CsvParser::countRows(int c) { Message m; if (c == '"') { m = Message::MS_QUOTE; @@ -703,7 +703,7 @@ int64_t CsvOp::CountTotalRows(const std::string &file) { } csv_parser.Reset(); while (ifs.good()) { - char chr = ifs.get(); + int chr = ifs.get(); if (csv_parser.countRows(chr) != 0) { break; } diff --git a/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/csv_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/csv_op.h index 3201d1df4f..1921b61bdc 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/csv_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/csv_op.h @@ -105,7 +105,7 @@ class CsvOp : public ParallelOp { return it->second.second(*this, c); } - int countRows(char c); + int countRows(int c); Status initCsvParser();