Skip to content

Commit 405f22b

Browse files
committed
Minor changes to test Madlad models variants
1 parent be1efda commit 405f22b

2 files changed

Lines changed: 15 additions & 14 deletions

File tree

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ dependencies {
129129
//gallery image selector
130130
//implementation 'com.github.niedev:GalleryImageSelector:1.0.7'
131131
//ONNX Runtime
132-
implementation 'com.microsoft.onnxruntime:onnxruntime-android:1.19.0' //latest.release
133-
implementation 'com.microsoft.onnxruntime:onnxruntime-extensions-android:0.12.4' //latest.release
132+
implementation 'com.microsoft.onnxruntime:onnxruntime-android:1.23.2' //latest.release
133+
implementation 'com.microsoft.onnxruntime:onnxruntime-extensions-android:0.13.0' //latest.release
134134
//Ml-Kit
135135
implementation 'com.google.mlkit:language-id:17.0.5'
136136
//JWS parser

app/src/main/java/nie/translator/rtranslator/voice_translation/neural_networks/translation/Translator.java

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,11 @@ private void initialize(@NonNull Global global, int mode, GeneralListener initLi
145145
embedAndLmHeadPath = Environment.getExternalStorageDirectory().getPath() + "/models/Translation/NLLB" + "/nllb_embed_and_lm_head_4bit.onnx";
146146
cacheInitializerPath = Environment.getExternalStorageDirectory().getPath() + "/models/Translation/NLLB" + "/nllb_cache_initializer_4bit.onnx";
147147
}else { //madlad
148-
encoderPath = Environment.getExternalStorageDirectory().getPath() + "/models/Translation/Madlad" + "/madlad_encoder_4bit.onnx";
149-
decoderPath = Environment.getExternalStorageDirectory().getPath() + "/models/Translation/Madlad" + "/madlad_decoder_4bit.onnx";
148+
encoderPath = Environment.getExternalStorageDirectory().getPath() + "/models/Translation/Madlad" + "/Int4Acc4/madlad_encoder_4bit.onnx";
149+
decoderPath = Environment.getExternalStorageDirectory().getPath() + "/models/Translation/Madlad" + "/Int4Acc4/madlad_decoder_4bit.onnx";
150150
vocabPath = Environment.getExternalStorageDirectory().getPath() + "/models/Translation/Madlad" + "/spiece.model";
151-
embedAndLmHeadPath = Environment.getExternalStorageDirectory().getPath() + "/models/Translation/Madlad" + "/madlad_embed_4bit.onnx";
152-
cacheInitializerPath = Environment.getExternalStorageDirectory().getPath() + "/models/Translation/Madlad" + "/madlad_cache_initializer_4bit.onnx";
151+
embedAndLmHeadPath = Environment.getExternalStorageDirectory().getPath() + "/models/Translation/Madlad" + "/madlad_embed_8bit.onnx";
152+
cacheInitializerPath = Environment.getExternalStorageDirectory().getPath() + "/models/Translation/Madlad" + "/Int4Acc4/madlad_cache_initializer_4bit.onnx";
153153
}
154154

155155
String finalDecoderPath = decoderPath;
@@ -198,28 +198,29 @@ public void onFailure(int[] reasons, long value) {
198198
});
199199
} else {
200200
final OrtSession.SessionOptions.OptLevel optDefaultLevel = OrtSession.SessionOptions.OptLevel.BASIC_OPT;
201+
boolean arena = true;
201202

202203
OrtSession.SessionOptions decoderOptions = new OrtSession.SessionOptions();
203-
decoderOptions.setMemoryPatternOptimization(false);
204-
decoderOptions.setCPUArenaAllocator(false);
204+
decoderOptions.setMemoryPatternOptimization(arena);
205+
decoderOptions.setCPUArenaAllocator(arena);
205206
decoderOptions.setOptimizationLevel(optDefaultLevel);
206207
decoderSession = onnxEnv.createSession(finalDecoderPath, decoderOptions);
207208

208209
OrtSession.SessionOptions encoderOptions = new OrtSession.SessionOptions();
209-
encoderOptions.setMemoryPatternOptimization(false);
210-
encoderOptions.setCPUArenaAllocator(false);
210+
encoderOptions.setMemoryPatternOptimization(arena);
211+
encoderOptions.setCPUArenaAllocator(arena);
211212
encoderOptions.setOptimizationLevel(optDefaultLevel);
212213
encoderSession = onnxEnv.createSession(finalEncoderPath, encoderOptions);
213214

214215
OrtSession.SessionOptions cacheInitOptions = new OrtSession.SessionOptions();
215-
cacheInitOptions.setMemoryPatternOptimization(false);
216-
cacheInitOptions.setCPUArenaAllocator(false);
216+
cacheInitOptions.setMemoryPatternOptimization(arena);
217+
cacheInitOptions.setCPUArenaAllocator(arena);
217218
cacheInitOptions.setOptimizationLevel(optDefaultLevel);
218219
cacheInitSession = onnxEnv.createSession(finalCacheInitializerPath, cacheInitOptions);
219220

220221
OrtSession.SessionOptions embedAndLmHeadOptions = new OrtSession.SessionOptions();
221-
embedAndLmHeadOptions.setMemoryPatternOptimization(false);
222-
embedAndLmHeadOptions.setCPUArenaAllocator(false);
222+
embedAndLmHeadOptions.setMemoryPatternOptimization(arena);
223+
embedAndLmHeadOptions.setCPUArenaAllocator(arena);
223224
embedAndLmHeadOptions.setOptimizationLevel(optDefaultLevel);
224225
if (mode == MADLAD_CACHE) {
225226
embedSession = onnxEnv.createSession(finalEmbedAndLmHeadPath, embedAndLmHeadOptions);

0 commit comments

Comments
 (0)