MTK Android app changes

cmodi-meta · cmodi-meta · commit c56dd53752b9 · 2024-10-17T17:18:26.000-07:00
diff --git a/examples/demo-apps/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/MainActivity.java b/examples/demo-apps/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/MainActivity.java
@@ -285,6 +285,7 @@ protected void onResume() {
       }
       boolean isUpdated = !mCurrentSettingsFields.equals(updatedSettingsFields);
       boolean isLoadModel = updatedSettingsFields.getIsLoadModel();
+      setBackendMode(updatedSettingsFields.getBackendType());
       if (isUpdated) {
         if (isLoadModel) {
           // If users change the model file, but not pressing loadModelButton, we won't load the new
@@ -293,6 +294,7 @@ protected void onResume() {
         } else {
           askUserToSelectModel();
         }
+
         checkForClearChatHistory(updatedSettingsFields);
         // Update current to point to the latest
         mCurrentSettingsFields = new SettingsFields(updatedSettingsFields);
@@ -302,6 +304,22 @@ protected void onResume() {
     }
   }
 
+  private void setBackendMode(BackendType backendType) {
+    if(backendType.equals(BackendType.XNNPACK)) {
+      setXNNPACKMode();
+    } else if(backendType.equals(BackendType.MEDIATEK)) {
+      setMediaTekMode();
+    }
+  }
+
+  private void setXNNPACKMode() {
+    requireViewById(R.id.addMediaButton).setVisibility(View.VISIBLE);
+  }
+
+  private void setMediaTekMode() {
+    requireViewById(R.id.addMediaButton).setVisibility(View.GONE);
+  }
+
   private void checkForClearChatHistory(SettingsFields updatedSettingsFields) {
     if (updatedSettingsFields.getIsClearChatHistory()) {
       mMessageAdapter.clear();
diff --git a/examples/demo-apps/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/SettingsActivity.java b/examples/demo-apps/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/SettingsActivity.java
@@ -14,11 +14,13 @@
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
+import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.TextView;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.compose.foundation.BackgroundKt;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.Insets;
 import androidx.core.view.ViewCompat;
@@ -32,6 +34,7 @@ public class SettingsActivity extends AppCompatActivity {
 
   private String mModelFilePath = "";
   private String mTokenizerFilePath = "";
+  private TextView mBackendTextView;
   private TextView mModelTextView;
   private TextView mTokenizerTextView;
   private TextView mModelTypeTextView;
@@ -41,6 +44,7 @@ public class SettingsActivity extends AppCompatActivity {
   private double mSetTemperature;
   private String mSystemPrompt;
   private String mUserPrompt;
+  private BackendType mBackendType;
   private ModelType mModelType;
   public SettingsFields mSettingsFields;
 
@@ -68,9 +72,11 @@ protected void onCreate(Bundle savedInstanceState) {
   }
 
   private void setupSettings() {
+    mBackendTextView = requireViewById(R.id.backendTextView);
     mModelTextView = requireViewById(R.id.modelTextView);
     mTokenizerTextView = requireViewById(R.id.tokenizerTextView);
     mModelTypeTextView = requireViewById(R.id.modelTypeTextView);
+    ImageButton backendImageButton = requireViewById(R.id.backendImageButton);
     ImageButton modelImageButton = requireViewById(R.id.modelImageButton);
     ImageButton tokenizerImageButton = requireViewById(R.id.tokenizerImageButton);
     ImageButton modelTypeImageButton = requireViewById(R.id.modelTypeImageButton);
@@ -79,6 +85,10 @@ private void setupSettings() {
     loadSettings();
 
     // TODO: The two setOnClickListeners will be removed after file path issue is resolved
+    backendImageButton.setOnClickListener(
+        view -> {
+          setupBackendSelectorDialog();
+        });
     modelImageButton.setOnClickListener(
         view -> {
           setupModelSelectorDialog();
@@ -104,6 +114,12 @@ private void setupSettings() {
     if (mModelType != null) {
       mModelTypeTextView.setText(mModelType.toString());
     }
+    mBackendType = mSettingsFields.getBackendType();
+    ETLogging.getInstance().log("mBackendType from settings " + mBackendType);
+    if (mBackendType != null) {
+      mBackendTextView.setText(mBackendType.toString());
+      setBackendSettingMode();
+    }
 
     setupParameterSettings();
     setupPromptSettings();
@@ -285,6 +301,29 @@ private void showInvalidPromptDialog() {
         .show();
   }
 
+  private void setupBackendSelectorDialog() {
+    // Convert enum to list
+    List<String> backendTypesList = new ArrayList<>();
+    for (BackendType backendType : BackendType.values()) {
+      backendTypesList.add(backendType.toString());
+    }
+    // Alert dialog builder takes in arr of string instead of list
+    String[] backendTypes = backendTypesList.toArray(new String[0]);
+    AlertDialog.Builder backendTypeBuilder = new AlertDialog.Builder(this);
+    backendTypeBuilder.setTitle("Select backend type");
+    backendTypeBuilder.setSingleChoiceItems(
+            backendTypes,
+            -1,
+            (dialog, item) -> {
+              mBackendTextView.setText(backendTypes[item]);
+              mBackendType = BackendType.valueOf(backendTypes[item]);
+              setBackendSettingMode();
+              dialog.dismiss();
+            });
+
+    backendTypeBuilder.create().show();
+  }
+
   private void setupModelSelectorDialog() {
     String[] pteFiles = listLocalFile("/data/local/tmp/llama/", ".pte");
     AlertDialog.Builder modelPathBuilder = new AlertDialog.Builder(this);
@@ -370,6 +409,28 @@ private String getFilenameFromPath(String uriFilePath) {
     return "";
   }
 
+  private void setBackendSettingMode() {
+    if(mBackendType.equals(BackendType.XNNPACK)) {
+      setXNNPACKSettingMode();
+    } else if(mBackendType.equals(BackendType.MEDIATEK)) {
+      setMediaTekSettingMode();
+    }
+  }
+
+  private void setXNNPACKSettingMode() {
+    requireViewById(R.id.modelLayout).setVisibility(View.VISIBLE);
+    requireViewById(R.id.tokenizerLayout).setVisibility(View.VISIBLE);
+    requireViewById(R.id.parametersView).setVisibility(View.VISIBLE);
+    requireViewById(R.id.temperatureLayout).setVisibility(View.VISIBLE);
+  }
+
+  private void setMediaTekSettingMode() {
+    requireViewById(R.id.modelLayout).setVisibility(View.GONE);
+    requireViewById(R.id.tokenizerLayout).setVisibility(View.GONE);
+    requireViewById(R.id.parametersView).setVisibility(View.GONE);
+    requireViewById(R.id.temperatureLayout).setVisibility(View.GONE);
+  }
+
   private void loadSettings() {
     Gson gson = new Gson();
     String settingsFieldsJSON = mDemoSharedPreferences.getSettings();
@@ -384,6 +445,7 @@ private void saveSettings() {
     mSettingsFields.saveParameters(mSetTemperature);
     mSettingsFields.savePrompts(mSystemPrompt, mUserPrompt);
     mSettingsFields.saveModelType(mModelType);
+    mSettingsFields.saveBackendType(mBackendType);
     mDemoSharedPreferences.addSettings(mSettingsFields);
   }
 
diff --git a/examples/demo-apps/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/SettingsFields.java b/examples/demo-apps/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/SettingsFields.java
@@ -30,6 +30,8 @@ public ModelType getModelType() {
     return modelType;
   }
 
+  public BackendType getBackendType(){ return backendType; }
+
   public String getUserPrompt() {
     return userPrompt;
   }
@@ -63,9 +65,11 @@ public boolean getIsLoadModel() {
   private boolean isClearChatHistory;
   private boolean isLoadModel;
   private ModelType modelType;
+  private BackendType backendType;
 
   public SettingsFields() {
     ModelType DEFAULT_MODEL = ModelType.LLAMA_3;
+    BackendType DEFAULT_BACKEND= BackendType.XNNPACK;
 
     modelFilePath = "";
     tokenizerFilePath = "";
@@ -75,6 +79,7 @@ public SettingsFields() {
     isClearChatHistory = false;
     isLoadModel = false;
     modelType = DEFAULT_MODEL;
+    backendType = DEFAULT_BACKEND;
   }
 
   public SettingsFields(SettingsFields settingsFields) {
@@ -86,6 +91,7 @@ public SettingsFields(SettingsFields settingsFields) {
     this.isClearChatHistory = settingsFields.getIsClearChatHistory();
     this.isLoadModel = settingsFields.getIsLoadModel();
     this.modelType = settingsFields.modelType;
+    this.backendType = settingsFields.backendType;
   }
 
   public void saveModelPath(String modelFilePath) {
@@ -100,6 +106,8 @@ public void saveModelType(ModelType modelType) {
     this.modelType = modelType;
   }
 
+  public void saveBackendType(BackendType backendType) { this.backendType = backendType;}
+
   public void saveParameters(Double temperature) {
     this.temperature = temperature;
   }
@@ -126,6 +134,7 @@ public boolean equals(SettingsFields anotherSettingsFields) {
         && userPrompt.equals(anotherSettingsFields.userPrompt)
         && isClearChatHistory == anotherSettingsFields.isClearChatHistory
         && isLoadModel == anotherSettingsFields.isLoadModel
-        && modelType == anotherSettingsFields.modelType;
+        && modelType == anotherSettingsFields.modelType
+        && backendType == anotherSettingsFields.backendType;
   }
 }
diff --git a/examples/demo-apps/android/LlamaDemo/app/src/main/res/layout/activity_settings.xml b/examples/demo-apps/android/LlamaDemo/app/src/main/res/layout/activity_settings.xml
@@ -28,11 +28,51 @@
             android:translationY="5dp" />
 
         <LinearLayout
+            android:id="@+id/backendLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="40dp"
             android:orientation="horizontal">
 
+            <TextView
+                android:id="@+id/backendLabel"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:text="Backend"
+                android:textColor="#FFFFFF"
+                android:textSize="16sp"
+                android:translationX="5dp" />
+
+            <TextView
+                android:id="@+id/backendTextView"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:gravity="center_vertical|end"
+                android:text="no backend selected"
+                android:textColor="#FFFFFF" />
+
+            <ImageButton
+                android:id="@+id/backendImageButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="5dp"
+                android:background="#00FFFFFF"
+                android:scaleType="center"
+                android:scaleX="0.7"
+                android:scaleY="0.7"
+                android:src="@drawable/expand_circle_down" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/modelLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:orientation="horizontal">
+
             <TextView
                 android:id="@+id/modelLabel"
                 android:layout_width="wrap_content"
@@ -66,6 +106,7 @@
         </LinearLayout>
 
         <LinearLayout
+            android:id="@+id/tokenizerLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
@@ -103,6 +144,7 @@
         </LinearLayout>
 
         <LinearLayout
+            android:id="@+id/modelTypeLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
@@ -152,7 +194,7 @@
             android:theme="@style/DefaultButton" />
 
         <TextView
-            android:id="@+id/textView4"
+            android:id="@+id/parametersView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
@@ -164,6 +206,7 @@
             android:translationX="5dp" />
 
         <LinearLayout
+            android:id="@+id/temperatureLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="10dp"

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,8 @@ public ModelType getModelType() {`
`30`	`30`	`return modelType;`
`31`	`31`	`}`
`32`	`32`
	`33`	`+ public BackendType getBackendType(){ return backendType; }`
	`34`	`+`
`33`	`35`	`public String getUserPrompt() {`
`34`	`36`	`return userPrompt;`
`35`	`37`	`}`
`@@ -63,9 +65,11 @@ public boolean getIsLoadModel() {`
`63`	`65`	`private boolean isClearChatHistory;`
`64`	`66`	`private boolean isLoadModel;`
`65`	`67`	`private ModelType modelType;`
	`68`	`+ private BackendType backendType;`
`66`	`69`
`67`	`70`	`public SettingsFields() {`
`68`	`71`	`ModelType DEFAULT_MODEL = ModelType.LLAMA_3;`
	`72`	`+ BackendType DEFAULT_BACKEND= BackendType.XNNPACK;`
`69`	`73`
`70`	`74`	`modelFilePath = "";`
`71`	`75`	`tokenizerFilePath = "";`
`@@ -75,6 +79,7 @@ public SettingsFields() {`
`75`	`79`	`isClearChatHistory = false;`
`76`	`80`	`isLoadModel = false;`
`77`	`81`	`modelType = DEFAULT_MODEL;`
	`82`	`+ backendType = DEFAULT_BACKEND;`
`78`	`83`	`}`
`79`	`84`
`80`	`85`	`public SettingsFields(SettingsFields settingsFields) {`
`@@ -86,6 +91,7 @@ public SettingsFields(SettingsFields settingsFields) {`
`86`	`91`	`this.isClearChatHistory = settingsFields.getIsClearChatHistory();`
`87`	`92`	`this.isLoadModel = settingsFields.getIsLoadModel();`
`88`	`93`	`this.modelType = settingsFields.modelType;`
	`94`	`+ this.backendType = settingsFields.backendType;`
`89`	`95`	`}`
`90`	`96`
`91`	`97`	`public void saveModelPath(String modelFilePath) {`
`@@ -100,6 +106,8 @@ public void saveModelType(ModelType modelType) {`
`100`	`106`	`this.modelType = modelType;`
`101`	`107`	`}`
`102`	`108`
	`109`	`+ public void saveBackendType(BackendType backendType) { this.backendType = backendType;}`
	`110`	`+`
`103`	`111`	`public void saveParameters(Double temperature) {`
`104`	`112`	`this.temperature = temperature;`
`105`	`113`	`}`
`@@ -126,6 +134,7 @@ public boolean equals(SettingsFields anotherSettingsFields) {`
`126`	`134`	`&& userPrompt.equals(anotherSettingsFields.userPrompt)`
`127`	`135`	`&& isClearChatHistory == anotherSettingsFields.isClearChatHistory`
`128`	`136`	`&& isLoadModel == anotherSettingsFields.isLoadModel`
`129`		`- && modelType == anotherSettingsFields.modelType;`
	`137`	`+ && modelType == anotherSettingsFields.modelType`
	`138`	`+ && backendType == anotherSettingsFields.backendType;`
`130`	`139`	`}`
`131`	`140`	`}`