Fix C API to support kiwi::ModelType

Author: bab2min

include/kiwi/capi.h

@@ -98,8 +98,11 @@ enum
 	KIWI_BUILD_LOAD_TYPO_DICT = 4,
 	KIWI_BUILD_LOAD_MULTI_DICT = 8,
 	KIWI_BUILD_DEFAULT = 15,
-	KIWI_BUILD_MODEL_TYPE_KNLM = 0x0000,
-	KIWI_BUILD_MODEL_TYPE_SBG = 0x0100,
+	KIWI_BUILD_MODEL_TYPE_DEFAULT = 0x0000,
+	KIWI_BUILD_MODEL_TYPE_KNLM = 0x0100,
+	KIWI_BUILD_MODEL_TYPE_SBG = 0x0200,
+	KIWI_BUILD_MODEL_TYPE_CONG = 0x0300,
+	KIWI_BUILD_MODEL_TYPE_CONG_GLOBAL = 0x0400,
 };
 
 enum

src/capi/kiwi_c.cpp

@@ -110,8 +110,13 @@ kiwi_builder_h kiwi_builder_init(const char* model_path, int num_threads, int op
 	try
 	{
 		BuildOption buildOption = (BuildOption)(options & 0xFF);
-		bool useSBG = !!(options & KIWI_BUILD_MODEL_TYPE_SBG);
-		return (kiwi_builder_h)new KiwiBuilder{ model_path, (size_t)num_threads, buildOption, useSBG ? ModelType::sbg : ModelType::knlm };
+		const auto mtMask = options & (KIWI_BUILD_MODEL_TYPE_KNLM | KIWI_BUILD_MODEL_TYPE_SBG | KIWI_BUILD_MODEL_TYPE_CONG | KIWI_BUILD_MODEL_TYPE_CONG_GLOBAL);
+		const ModelType modelType = mtMask == KIWI_BUILD_MODEL_TYPE_KNLM ? ModelType::knlm
+			: mtMask == KIWI_BUILD_MODEL_TYPE_SBG ? ModelType::sbg
+			: mtMask == KIWI_BUILD_MODEL_TYPE_CONG ? ModelType::cong
+			: mtMask == KIWI_BUILD_MODEL_TYPE_CONG_GLOBAL ? ModelType::congGlobal
+			: ModelType::none;
+		return (kiwi_builder_h)new KiwiBuilder{ model_path, (size_t)num_threads, buildOption, modelType };
 	}
 	catch (...)
 	{