Upstream merge jan09

.gitignore

@@ -1,6 +1,7 @@
 tmp/
 dist/
 params/
+debug/
 *.bak
 # Byte-compiled / optimized / DLL files
 __pycache__/

CMakeLists.txt

@@ -83,6 +83,8 @@ set(
 )
 
 set(MLC_LLM_COMPILE_DEFS ${MLC_LLM_COMPILE_DEFS} DMLC_USE_LOGGING_LIBRARY=<tvm/runtime/logging.h>)
+set(MLC_LLM_COMPILE_DEFS ${MLC_LLM_COMPILE_DEFS} __STDC_FORMAT_MACROS=1)
+set(MLC_LLM_COMPILE_DEFS ${MLC_LLM_COMPILE_DEFS} PICOJSON_USE_INT64)
 
 target_include_directories(mlc_llm_objs PRIVATE ${MLC_LLM_INCLUDES})
 target_compile_definitions(mlc_llm_objs PRIVATE ${MLC_LLM_COMPILE_DEFS})
@@ -125,6 +127,7 @@ target_compile_definitions(mlc_cli_objs PRIVATE ${MLC_LLM_COMPILE_DEFS})
 if (CMAKE_SYSTEM_NAME STREQUAL "Android")
   target_link_libraries(mlc_llm PRIVATE log)
   target_link_libraries(mlc_chat_cli PRIVATE log)
+  target_link_libraries(tokenizers_cpp PRIVATE log)
 endif()
 
 if (MLC_LLM_INSTALL_STATIC_LIB)

README.md

@@ -127,6 +127,14 @@ use off-the-shelf. Visit [Prebuilt Models](https://llm.mlc.ai/docs/prebuilt_mode
       <td>StableLM</td>
       <td></td>
     </tr>
+    <tr>
+      <td>Mistral</td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>Phi</td>
+      <td></td>
+    </tr>
   </tbody>
 </table>
 

android/.gitignore

@@ -1,3 +1,19 @@
-MLCChat/app/src/main/jni/*.h
-MLCChat/app/src/main/jni/*.cc
-MLCChat/app/src/main/obj
+app/src/main/jni/*.h
+app/src/main/jni/*.cc
+app/src/main/obj
+
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+local.properties

android/MLCChat/app/build.gradle → android/app/build.gradle

@@ -5,7 +5,7 @@ plugins {
 
 android {
     namespace 'ai.mlc.mlcchat'
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "ai.mlc.mlcchat"
@@ -26,12 +26,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    sourceSets {
-        main {
-            jni.srcDirs = []
-            jniLibs.srcDirs = ['src/main/libs']
-        }
-    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -53,7 +47,7 @@ android {
 }
 
 dependencies {
-
+    implementation project(":library")
     implementation 'androidx.core:core-ktx:1.10.1'
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
     implementation 'androidx.activity:activity-compose:1.7.1'

android/MLCChat/app/src/main/AndroidManifest.xml → android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="ai.mlc.mlcchat">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission

android/MLCChat/app/src/main/java/ai/mlc/mlcchat/AppViewModel.kt → android/app/src/main/java/ai/mlc/mlcchat/AppViewModel.kt

@@ -30,7 +30,6 @@ class AppViewModel(application: Application) : AndroidViewModel(application) {
     private var alertMessage = mutableStateOf("")
     private var appConfig = AppConfig(
         emptyList(),
-        emptyList<ModelRecord>().toMutableList(),
         emptyList<ModelRecord>().toMutableList()
     )
     private val application = getApplication<Application>()
@@ -49,10 +48,6 @@ class AppViewModel(application: Application) : AndroidViewModel(application) {
         loadAppConfig()
     }
 
-    fun supportedModelLibs(): List<String> {
-        return appConfig.modelLibs
-    }
-
     fun isShowingAlert(): Boolean {
         return showAlert.value
     }
@@ -78,14 +73,6 @@ class AppViewModel(application: Application) : AndroidViewModel(application) {
         alertMessage.value = error
     }
 
-    fun requestAddModel(url: String, localId: String?) {
-        if (localId != null && localIdSet.contains(localId)) {
-            issueAlert("localId: $localId has been occupied")
-        } else {
-            downloadModelConfig(if (url.endsWith("/")) url else "$url/", localId, false)
-        }
-    }
-
     fun requestDeleteModel(localId: String) {
         deleteModel(localId)
         issueAlert("Model: $localId has been deleted")
@@ -109,16 +96,17 @@ class AppViewModel(application: Application) : AndroidViewModel(application) {
             if (modelConfigFile.exists()) {
                 val modelConfigString = modelConfigFile.readText()
                 val modelConfig = gson.fromJson(modelConfigString, ModelConfig::class.java)
+                modelConfig.localId = modelRecord.localId
+                modelConfig.modelLib = modelRecord.modelLib
                 addModelConfig(modelConfig, modelRecord.modelUrl, true)
             } else {
                 downloadModelConfig(
-                    if (modelRecord.modelUrl.endsWith("/")) modelRecord.modelUrl else "$modelRecord.modelUrl/",
-                    modelRecord.localId,
+                    if (modelRecord.modelUrl.endsWith("/")) modelRecord.modelUrl else "${modelRecord.modelUrl}/",
+                    modelRecord,
                     true
                 )
             }
         }
-        modelSampleList += appConfig.modelSamples
     }
 
     private fun updateAppConfig(action: () -> Unit) {
@@ -140,7 +128,7 @@ class AppViewModel(application: Application) : AndroidViewModel(application) {
         )
         if (!isBuiltin) {
             updateAppConfig {
-                appConfig.modelList.add(ModelRecord(modelUrl, modelConfig.localId))
+                appConfig.modelList.add(ModelRecord(modelUrl, modelConfig.localId, modelConfig.modelLib))
             }
         }
     }
@@ -157,15 +145,15 @@ class AppViewModel(application: Application) : AndroidViewModel(application) {
     }
 
     private fun isModelConfigAllowed(modelConfig: ModelConfig): Boolean {
-        if (appConfig.modelLibs.contains(modelConfig.modelLib)) return true;
+        if (appConfig.modelLibs.contains(modelConfig.modelLib)) return true
         viewModelScope.launch {
             issueAlert("Model lib ${modelConfig.modelLib} is not supported.")
         }
         return false
     }
 
 
-    private fun downloadModelConfig(modelUrl: String, localId: String?, isBuiltin: Boolean) {
+    private fun downloadModelConfig(modelUrl: String, modelRecord: ModelRecord, isBuiltin: Boolean) {
         thread(start = true) {
             try {
                 val url = URL("${modelUrl}${ModelUrlSuffix}${ModelConfigFilename}")
@@ -186,9 +174,8 @@ class AppViewModel(application: Application) : AndroidViewModel(application) {
                     try {
                         val modelConfigString = tempFile.readText()
                         val modelConfig = gson.fromJson(modelConfigString, ModelConfig::class.java)
-                        if (localId != null) {
-                            require(modelConfig.localId == localId)
-                        }
+                        modelConfig.localId = modelRecord.localId
+                        modelConfig.modelLib = modelRecord.modelLib
                         if (localIdSet.contains(modelConfig.localId)) {
                             tempFile.delete()
                             issueAlert("${modelConfig.localId} has been used, please consider another local ID")
@@ -728,17 +715,17 @@ data class MessageData(val role: MessageRole, val text: String, val id: UUID = U
 data class AppConfig(
     @SerializedName("model_libs") val modelLibs: List<String>,
     @SerializedName("model_list") val modelList: MutableList<ModelRecord>,
-    @SerializedName("add_model_samples") val modelSamples: MutableList<ModelRecord>
 )
 
 data class ModelRecord(
     @SerializedName("model_url") val modelUrl: String,
-    @SerializedName("local_id") val localId: String
+    @SerializedName("local_id") val localId: String,
+    @SerializedName("model_lib") val modelLib: String
 )
 
 data class ModelConfig(
-    @SerializedName("model_lib") val modelLib: String,
-    @SerializedName("local_id") val localId: String,
+    @SerializedName("model_lib") var modelLib: String,
+    @SerializedName("local_id") var localId: String,
     @SerializedName("tokenizer_files") val tokenizerFiles: List<String>
 )
 

android/MLCChat/app/src/main/java/ai/mlc/mlcchat/StartView.kt → android/app/src/main/java/ai/mlc/mlcchat/StartView.kt

@@ -54,7 +54,6 @@ fun StartView(
     appViewModel: AppViewModel
 ) {
     val localFocusManager = LocalFocusManager.current
-    var isAddingModel by rememberSaveable { mutableStateOf(false) }
     Scaffold(
         topBar = {
             TopAppBar(
@@ -86,72 +85,6 @@ fun StartView(
                         appViewModel = appViewModel
                     )
                 }
-                if (!isAddingModel) {
-                    item {
-                        TextButton(onClick = { isAddingModel = true }) {
-                            Text(text = "Add Model Variant")
-                        }
-                    }
-                }
-            }
-            if (isAddingModel) {
-                Text(text = "Supported Base Model Libs", modifier = Modifier.padding(top = 10.dp))
-                for (lib in appViewModel.supportedModelLibs()) {
-                    Text(
-                        text = lib,
-                        style = MaterialTheme.typography.bodyMedium
-                    )
-                }
-                Text(text = "Add Model Variant", modifier = Modifier.padding(top = 10.dp))
-                LazyColumn() {
-                    items(
-                        items = appViewModel.modelSampleList
-                    ) { modelRecord ->
-                        TextButton(onClick = {
-                            appViewModel.requestAddModel(
-                                modelRecord.modelUrl,
-                                modelRecord.localId
-                            )
-                        }) {
-                            Text(text = modelRecord.localId)
-                        }
-                    }
-                }
-                Text(text = "Add Model by URL")
-                SelectionContainer {
-                    Text(
-                        text = "Sample URL: https://huggingface.co/mlc-ai/demo-vicuna-v1-7b-int4/",
-                        style = MaterialTheme.typography.bodyMedium
-                    )
-                }
-                var url by rememberSaveable { mutableStateOf("") }
-                OutlinedTextField(
-                    value = url,
-                    onValueChange = { url = it },
-                    label = { Text(text = "Model URL") },
-                    maxLines = 3,
-                    modifier = Modifier.fillMaxWidth()
-                )
-                Row(
-                    horizontalArrangement = Arrangement.End,
-                    verticalAlignment = Alignment.CenterVertically,
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .wrapContentHeight()
-                ) {
-                    TextButton(onClick = { url = "" }) {
-                        Text(text = "Clear")
-                    }
-                    TextButton(onClick = { isAddingModel = false }) {
-                        Text(text = "Cancel")
-                    }
-                    TextButton(onClick = {
-                        appViewModel.requestAddModel(url, null)
-                        url = ""
-                    }) {
-                        Text(text = "Add")
-                    }
-                }
             }
         }
         if (appViewModel.isShowingAlert()) {

android/MLCChat/build.gradle → android/build.gradle

@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.0.1' apply false
-    id 'com.android.library' version '8.0.1' apply false
+    id 'com.android.application' version '8.1.2' apply false
+    id 'com.android.library' version '8.1.2' apply false
     id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
 }

android/library/.gitignore

@@ -0,0 +1 @@
+/build

android/CMakeLists.txt → android/library/CMakeLists.txt

@@ -5,7 +5,7 @@ project(mlc-chat C CXX)
 set(ANDROID_DIR ${CMAKE_CURRENT_LIST_DIR})
 set(ANDROID_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR})
 
-set(MLC_LLM_DIR ${ANDROID_DIR}/..)
+set(MLC_LLM_DIR ${ANDROID_DIR}/../..)
 set(MLC_LLM_BINARY_DIR mlc_llm)
 set(MLC_LLM_COMPILE_DEFS TVM_LOG_CUSTOMIZE=1)
 add_subdirectory(${MLC_LLM_DIR} ${MLC_LLM_BINARY_DIR} EXCLUDE_FROM_ALL)

android/library/build.gradle

@@ -0,0 +1,38 @@
+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+}
+
+android {
+    namespace 'ai.mlc.mlcllm'
+    compileSdk 34
+
+    defaultConfig {
+        minSdk 22
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+    sourceSets {
+        main {
+            jniLibs.srcDirs = ['build/output']
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'build/output', include: ['*.jar'])
+    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.10.0'
+}
+
+
+
+
+
+