Skip to content

Android use new llm runner deps #14361

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 3 commits into from
Sep 17, 2025
Merged

Android use new llm runner deps #14361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fea397a
Android use new llm runner deps
kirklandsign Sep 16, 2025
6d328e3
Merge remote-tracking branch 'origin/main' into android-deps-removal
kirklandsign Sep 17, 2025
d4608d2
Fix QNN part
kirklandsign Sep 17, 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
3 changes: 1 addition & 2 deletions examples/qualcomm/oss_scripts/llama/runner/runner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,7 @@ Error Runner<T>::load() {
eos_ids->insert(tokenizer_->encode("<|eot|>", 0, 0).get()[0]);
eos_ids->insert(tokenizer_->encode("<|end_of_text|>", 0, 0).get()[0]);
} else {
tokenizer_ =
example::load_llama_tokenizer(tokenizer_path_, Version::Default);
tokenizer_ = llm::load_tokenizer(tokenizer_path_);
if (tokenizer_ == nullptr) {
ET_LOG(
Error, "Failed to load tokenizer with %s", tokenizer_path_.c_str());
Expand Down
15 changes: 1 addition & 14 deletions extension/android/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,21 +168,8 @@ endif()

if(EXECUTORCH_BUILD_LLAMA_JNI)
target_sources(executorch_jni PRIVATE jni/jni_layer_llama.cpp jni/log.cpp)
list(APPEND link_libraries llama_runner)
list(APPEND link_libraries extension_llm_runner)
target_compile_definitions(executorch_jni PUBLIC EXECUTORCH_BUILD_LLAMA_JNI=1)
add_subdirectory(
${EXECUTORCH_ROOT}/examples/models/llama/runner
${CMAKE_CURRENT_BINARY_DIR}/../../examples/models/llama/runner
)

target_sources(
executorch_jni
PRIVATE ${EXECUTORCH_ROOT}/extension/llm/runner/llm_runner_helper.cpp
)

target_include_directories(
executorch_jni PRIVATE ${EXECUTORCH_ROOT}/extension/llm/runner
)

if(QNN_SDK_ROOT)
target_sources(
Expand Down
Loading