Skip to content

JNI replace llama runner with llm text runner #13784

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

Merged
merged 4 commits into from
Aug 29, 2025
Merged

JNI replace llama runner with llm text runner #13784

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
463c4b5
Remove unused line
kirklandsign Aug 29, 2025
63e407e
test
kirklandsign Aug 29, 2025
9ee0714
Start from small
kirklandsign Aug 29, 2025
49c037f
Start from small
kirklandsign Aug 29, 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
12 changes: 6 additions & 6 deletions extension/android/jni/jni_layer_llama.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,13 @@
#include <unordered_map>
#include <vector>

#include <executorch/examples/models/llama/runner/runner.h>
#include <executorch/examples/models/llava/runner/llava_runner.h>
#include <executorch/examples/qualcomm/oss_scripts/llama/runner/runner.h>
#include <executorch/extension/llm/runner/image.h>
#include <executorch/extension/llm/runner/irunner.h>
#include <executorch/extension/llm/runner/llm_runner_helper.h>
#include <executorch/extension/llm/runner/multimodal_input.h>
#include <executorch/extension/llm/runner/multimodal_runner.h>
#include <executorch/extension/llm/runner/text_llm_runner.h>
#include <executorch/runtime/platform/log.h>
#include <executorch/runtime/platform/platform.h>
#include <executorch/runtime/platform/runtime.h>
Expand Down Expand Up @@ -174,11 +176,9 @@ class ExecuTorchLlmJni : public facebook::jni::HybridClass<ExecuTorchLlmJni> {
std::optional<const std::string> data_path_str = data_path
? std::optional<const std::string>{data_path->toStdString()}
: std::nullopt;
// TODO(larryliu0820): Use the API in text_llm_runner.h to create the
// runner.
runner_ = example::create_llama_runner(
runner_ = executorch::extension::llm::create_text_llm_runner(
model_path->toStdString(),
tokenizer_path->toStdString(),
llm::load_tokenizer(tokenizer_path->toStdString()),
data_path_str);
#if defined(EXECUTORCH_BUILD_QNN)
} else if (model_type_category == MODEL_TYPE_QNN_LLAMA) {
Expand Down
Loading