Skip to content

Commit dc3bd32

Browse files
committed
Fix
1 parent ce84fee commit dc3bd32

3 files changed

Lines changed: 19 additions & 7 deletions

File tree

llm/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/ModuleSettings.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ data class ModuleSettings(
3535
val models: List<ModelConfiguration> = emptyList(),
3636
val activeModelId: String = "",
3737
val sharedDataPath: String = "",
38-
val foundationModelType: ModelType = ModelType.LLAMA_3_2
38+
val foundationModelType: ModelType = ModelType.LLAMA_3
3939
) {
4040
/**
4141
* Gets the effective model type, considering multi-model configuration.

llm/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/ui/screens/ModelSettingsScreen.kt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,7 @@ fun ModelSettingsScreen(
452452
TokenizerDialog(viewModel)
453453
DataPathDialog(viewModel)
454454
FoundationDataPathDialog(viewModel)
455+
FoundationModelTypeDialog(viewModel)
455456
ModelTypeDialog(viewModel)
456457
LoadModelDialog(viewModel, onLoadModel, onBackPressed)
457458
ResetSystemPromptDialog(viewModel)
@@ -660,6 +661,20 @@ private fun FoundationDataPathDialog(viewModel: ModelSettingsViewModel) {
660661
}
661662
}
662663

664+
@Composable
665+
private fun FoundationModelTypeDialog(viewModel: ModelSettingsViewModel) {
666+
if (viewModel.showFoundationModelTypeDialog) {
667+
SingleChoiceDialog(
668+
title = "Select Foundation Model Type",
669+
options = ModelType.values().map { it.toString() },
670+
onSelect = { selected ->
671+
viewModel.selectFoundationModelType(ModelType.valueOf(selected))
672+
},
673+
onDismiss = { viewModel.showFoundationModelTypeDialog = false }
674+
)
675+
}
676+
}
677+
663678
@Composable
664679
private fun ModelTypeDialog(viewModel: ModelSettingsViewModel) {
665680
if (viewModel.showModelTypeDialog) {

llm/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/ui/viewmodel/ModelSettingsViewModel.kt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -290,12 +290,9 @@ class ModelSettingsViewModel : ViewModel() {
290290
*/
291291
fun selectTempTokenizer(tokenizerPath: String) {
292292
tempTokenizerPath = tokenizerPath
293-
// Auto-detect model type from PTE filename
294-
val detectedType = ModelType.fromFilePath(tempModelPath)
295-
if (detectedType != null) {
296-
tempModelType = detectedType
297-
}
298-
addModelStep = 3 // Skip model type, go to adapters
293+
// Use foundation model type for LoRA mode
294+
tempModelType = moduleSettings.foundationModelType
295+
addModelStep = 3 // Go to adapters
299296
}
300297

301298
/**

0 commit comments

Comments
 (0)