Better error msg for wrong type.

dmlc · Oct 13, 2019 · e585e70 · e585e70
1 parent 0cc512e
commit e585e70
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 18 deletions.
diff --git a/src/data/columnar.h b/src/data/columnar.h
@@ -60,22 +60,6 @@ struct ColumnarErrors {
     str += " type.";
     return str.c_str();
   }
-  static std::string UnknownTypeStr(std::string const& typestr) {
-    return "typestr from array interface: " + typestr + " is not supported.";
-  }
-};
-
-// TODO(trivialfis): Abstract this into a class that accept a json
-// object and turn it into an array (for cupy and numba).
-class ArrayInterfaceHandler {
- public:
-  template <typename T>
-  static constexpr char TypeChar() {
-    return
-        (std::is_floating_point<T>::value ? 'f' :
-         (std::is_integral<T>::value ?
-          (std::is_signed<T>::value ? 'i' : 'u') : '\0'));
-  }
 
   static std::string TypeStr(char c) {
     switch (c) {
@@ -89,12 +73,46 @@ class ArrayInterfaceHandler {
         return "Unsigned integer";
       case 'f':
         return "Floating point";
+      case 'c':
+        return "Complex floating point";
+      case 'm':
+        return "Timedelta";
+      case 'M':
+        return "Datetime";
+      case 'O':
+        return "Object";
+      case 'S':
+        return "String";
+      case 'U':
+        return "Unicode";
+      case 'V':
+        return "Other";
       default:
-        LOG(FATAL) << "Invalid type code: " << c << " in typestr of input array interface.";
+        LOG(FATAL) << "Invalid type code: " << c << " in `typestr' of input array."
+                   << "\nPlease verify the `__cuda_array_interface__' of your input data complies to: "
+                   << "https://docs.scipy.org/doc/numpy/reference/arrays.interface.html"
+                   << "\nOr open an issue.";
         return "";
     }
   }
 
+  static std::string UnSupportedType(std::string const& typestr) {
+    return TypeStr(typestr.at(1)) + " is not supported.";
+  }
+};
+
+// TODO(trivialfis): Abstract this into a class that accept a json
+// object and turn it into an array (for cupy and numba).
+class ArrayInterfaceHandler {
+ public:
+  template <typename T>
+  static constexpr char TypeChar() {
+    return
+        (std::is_floating_point<T>::value ? 'f' :
+         (std::is_integral<T>::value ?
+          (std::is_signed<T>::value ? 'i' : 'u') : '\0'));
+  }
+
   template <typename PtrType>
   static PtrType GetPtrFromArrayData(std::map<std::string, Json> const& obj) {
     if (obj.find("data") == obj.cend()) {
@@ -230,6 +248,7 @@ class ArrayInterfaceHandler {
 };
 
 #define DISPATCH_TYPE(__dispatched_func, __typestr, ...) {              \
+    CHECK_EQ(__typestr.size(), 3) << ColumnarErrors::TypestrFormat();   \
     if (__typestr.at(1) == 'f' && __typestr.at(2) == '4') {             \
       __dispatched_func<float>(__VA_ARGS__);                            \
     } else if (__typestr.at(1) == 'f' && __typestr.at(2) == '8') {      \
@@ -251,7 +270,7 @@ class ArrayInterfaceHandler {
     } else if (__typestr.at(1) == 'u' && __typestr.at(2) == '8') {      \
       __dispatched_func<uint64_t>(__VA_ARGS__);                         \
     } else {                                                            \
-      LOG(FATAL) << ColumnarErrors::UnknownTypeStr(__typestr);          \
+      LOG(FATAL) << ColumnarErrors::UnSupportedType(__typestr);         \
     }                                                                   \
   }
 

diff --git a/tests/python-gpu/test_from_columnar.py b/tests/python-gpu/test_from_columnar.py
@@ -76,3 +76,13 @@ def test_from_cudf(self):
         dtrain = xgb.DMatrix(X)
         assert dtrain.num_col() == 1
         assert dtrain.num_row() == 5
+
+        # Boolean is not supported.
+        X_boolean = cudf.DataFrame({'x': cudf.Series([True, False])})
+        with pytest.raises(Exception):
+            dtrain = xgb.DMatrix(X_boolean)
+
+        y_boolean = cudf.DataFrame({
+            'x': cudf.Series([True, False, True, True, True])})
+        with pytest.raises(Exception):
+            dtrain = xgb.DMatrix(X_boolean, label=y_boolean)