Skip to content

WIP Android demo use a list of loaded modules #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

WIP Android demo use a list of loaded modules #84

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
475e14b
Remove unused model type
kirklandsign Oct 8, 2025
a84c4d3
Small refactor
kirklandsign Oct 8, 2025
6035329
Merge remote-tracking branch 'origin/main' into small-refactor
kirklandsign Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions llm/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ public class MainActivity extends AppCompatActivity implements Runnable, LlmCall
private ImageButton mCameraButton;
private ListView mMessagesView;
private MessageAdapter mMessageAdapter;
private LlmModule mModule = null;
private List<LlmModule> mLoadedModules = new ArrayList<>();
private LlmModule mActiveModule = null;
private Message mResultMessage = null;
private ImageButton mSettingsButton;
private TextView mMemoryView;
Expand Down Expand Up @@ -145,16 +146,17 @@ private void setLocalModel(

long runStartTime = System.currentTimeMillis();
// Create LlmModule with dataPath
mModule =
mActiveModule =
new LlmModule(
ModelUtils.getModelCategory(
mCurrentSettingsFields.getModelType(), mCurrentSettingsFields.getBackendType()),
modelPath,
tokenizerPath,
temperature,
dataPath);
mLoadedModules.add(mActiveModule);

int loadResult = mModule.load();
int loadResult = mActiveModule.load();
long loadDuration = System.currentTimeMillis() - runStartTime;
String modelLoadError = "";
String modelInfo = "";
Expand Down Expand Up @@ -186,7 +188,7 @@ private void setLocalModel(

if (mCurrentSettingsFields.getModelType() == ModelType.LLAVA_1_5) {
ETLogging.getInstance().log("Llava start prefill prompt");
startPos = mModule.prefillPrompt(PromptFormat.getLlavaPresetPrompt());
startPos = mActiveModule.prefillPrompt(PromptFormat.getLlavaPresetPrompt());
ETLogging.getInstance().log("Llava completes prefill prompt");
}
}
Expand Down Expand Up @@ -658,7 +660,7 @@ private void showMediaPreview(List<Uri> uris) {
ETImage img = processedImageList.get(0);
ETLogging.getInstance().log("Llava start prefill image");
startPos =
mModule.prefillImages(
mActiveModule.prefillImages(
img.getInts(),
img.getWidth(),
img.getHeight(),
Expand Down Expand Up @@ -687,7 +689,7 @@ private void onModelRunStarted() {
mSendButton.setImageResource(R.drawable.baseline_stop_24);
mSendButton.setOnClickListener(
view -> {
mModule.stop();
mActiveModule.stop();
});
}

Expand Down Expand Up @@ -738,21 +740,21 @@ public void run() {
mCurrentSettingsFields.getModelType(),
mCurrentSettingsFields.getBackendType())
== ModelUtils.VISION_MODEL) {
mModule.generate(
mActiveModule.generate(
finalPrompt, ModelUtils.VISION_MODEL_SEQ_LEN, MainActivity.this, false);
} else if (mCurrentSettingsFields.getModelType() == ModelType.LLAMA_GUARD_3) {
String llamaGuardPromptForClassification =
PromptFormat.getFormattedLlamaGuardPrompt(rawPrompt);
ETLogging.getInstance()
.log("Running inference.. prompt=" + llamaGuardPromptForClassification);
mModule.generate(
mActiveModule.generate(
llamaGuardPromptForClassification,
llamaGuardPromptForClassification.length() + 64,
MainActivity.this,
false);
} else {
ETLogging.getInstance().log("Running inference.. prompt=" + finalPrompt);
mModule.generate(
mActiveModule.generate(
finalPrompt,
(int) (finalPrompt.length() * 0.75) + 64,
MainActivity.this,
Expand Down