Skip to content

Commit 2e5629b

Browse files
authored
Handle data path empty case (#88)
1 parent 3d08f34 commit 2e5629b

File tree

1 file changed

+26
-10
lines changed
  • llm/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo

1 file changed

+26
-10
lines changed

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

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,14 @@ public void onStats(String stats) {
135135
private void setLocalModel(
136136
String modelPath, String tokenizerPath, String dataPath, float temperature) {
137137
Message modelLoadingMessage = new Message("Loading model...", false, MessageType.SYSTEM, 0);
138-
ETLogging.getInstance().log("Loading model " + modelPath + " with tokenizer " + tokenizerPath);
138+
ETLogging.getInstance()
139+
.log(
140+
"Loading model "
141+
+ modelPath
142+
+ " with tokenizer "
143+
+ tokenizerPath
144+
+ " data path "
145+
+ dataPath);
139146
runOnUiThread(
140147
() -> {
141148
mSendButton.setEnabled(false);
@@ -145,15 +152,24 @@ private void setLocalModel(
145152

146153
long runStartTime = System.currentTimeMillis();
147154
// Create LlmModule with dataPath
148-
mModule =
149-
new LlmModule(
150-
ModelUtils.getModelCategory(
151-
mCurrentSettingsFields.getModelType(), mCurrentSettingsFields.getBackendType()),
152-
modelPath,
153-
tokenizerPath,
154-
temperature,
155-
dataPath);
156-
155+
if (dataPath.isEmpty()) {
156+
mModule =
157+
new LlmModule(
158+
ModelUtils.getModelCategory(
159+
mCurrentSettingsFields.getModelType(), mCurrentSettingsFields.getBackendType()),
160+
modelPath,
161+
tokenizerPath,
162+
temperature);
163+
} else {
164+
mModule =
165+
new LlmModule(
166+
ModelUtils.getModelCategory(
167+
mCurrentSettingsFields.getModelType(), mCurrentSettingsFields.getBackendType()),
168+
modelPath,
169+
tokenizerPath,
170+
temperature,
171+
dataPath);
172+
}
157173
int loadResult = mModule.load();
158174
long loadDuration = System.currentTimeMillis() - runStartTime;
159175
String modelLoadError = "";

0 commit comments

Comments
 (0)