C++ API: Change datasets.cc ValidateParams support to return Status instead of bool

4 years ago · f91ecaaf6d
parent 0a645c64e0
commit f91ecaaf6d
4 changed files with 491 additions and 285 deletions
--- a/mindspore/ccsrc/minddata/dataset/api/datasets.cc
+++ b/mindspore/ccsrc/minddata/dataset/api/datasets.cc
--- a/mindspore/ccsrc/minddata/dataset/include/datasets.h
+++ b/mindspore/ccsrc/minddata/dataset/include/datasets.h
--- a/mindspore/ccsrc/minddata/dataset/include/status.h
+++ b/mindspore/ccsrc/minddata/dataset/include/status.h
@ -66,6 +66,11 @@ namespace dataset {
    }                                 \
  } while (false)

+#define RETURN_STATUS_SYNTAX_ERROR(_e)                               \
+  do {                                                               \
+    return Status(StatusCode::kSyntaxError, __LINE__, __FILE__, _e); \
+  } while (false)
+
 enum class StatusCode : char {
  kOK = 0,
  kOutOfMemory = 1,
--- a/mindspore/ccsrc/minddata/dataset/util/status.h
+++ b/mindspore/ccsrc/minddata/dataset/util/status.h
@ -66,6 +66,11 @@ namespace dataset {
    }                                 \
  } while (false)

+#define RETURN_STATUS_SYNTAX_ERROR(_e)                               \
+  do {                                                               \
+    return Status(StatusCode::kSyntaxError, __LINE__, __FILE__, _e); \
+  } while (false)
+
 enum class StatusCode : char {
  kOK = 0,
  kOutOfMemory = 1,