Move datatype parsing to its own function

include/tvm/runtime/packed_func.h

@@ -63,8 +63,8 @@ namespace runtime {
 
 // Datatype utilities needed at runtime. See src/runtime/custom_datatype_util.cc.
 TVM_DLL std::string GetCustomTypeName(uint8_t type_code);
-TVM_DLL uint8_t GetCustomTypeCode(const std::string& type_name);
 TVM_DLL bool GetCustomTypeRegistered(uint8_t type_code);
+TVM_DLL uint8_t ParseCustomDatatype(std::string s);
 
 // forward declarations
 class TVMArgs;
@@ -1009,21 +1009,7 @@ inline TVMType String2TVMType(std::string s) {
     t.lanes = 1;
     return t;
   } else if (s.substr(0, 6) == "custom") {
-    // TODO(gus): too much hardcoding here.
-    scan = s.c_str() + 6;
-    if (*scan != '[')
-      LOG(FATAL) << "expected opening brace after 'custom' type in" << s;
-    ++scan;
-    size_t custom_name_len = 0;
-    while (scan + custom_name_len <= s.c_str() + s.length() &&
-           *(scan + custom_name_len) != ']')
-      ++custom_name_len;
-    if (*(scan + custom_name_len) != ']')
-      LOG(FATAL) << "expected closing brace after 'custom' type in" << s;
-    scan += custom_name_len + 1;
-
-    auto type_name = s.substr(7, custom_name_len);
-    t.code = GetCustomTypeCode(type_name);
+    t.code = ParseCustomDatatype(s);
   } else {
     scan = s.c_str();
     LOG(FATAL) << "unknown type " << s;

src/runtime/c_runtime_api.cc

@@ -64,6 +64,23 @@ TVM_DLL bool GetCustomTypeRegistered(uint8_t type_code) {
   return (*f)(type_code).operator bool();
 }
 
+TVM_DLL uint8_t ParseCustomDatatype(std::string s) {
+  // TODO(gus): too much hardcoding here.
+  // TODO(gus) possibly replace with a regex.
+  auto scan = s.c_str() + 6;
+  if (*scan != '[') LOG(FATAL) << "expected opening brace after 'custom' type in" << s;
+  ++scan;
+  size_t custom_name_len = 0;
+  while (scan + custom_name_len <= s.c_str() + s.length() && *(scan + custom_name_len) != ']')
+    ++custom_name_len;
+  if (*(scan + custom_name_len) != ']')
+    LOG(FATAL) << "expected closing brace after 'custom' type in" << s;
+  scan += custom_name_len + 1;
+
+  auto type_name = s.substr(7, custom_name_len);
+  return GetCustomTypeCode(type_name);
+}
+
 class DeviceAPIManager {
  public:
   static const int kMaxDeviceAPI = 32;