Skip to content

No longer need generateFromPos API #14101

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 6 commits into from
Sep 10, 2025
Merged

No longer need generateFromPos API #14101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
efe81ee
LlmModule prefill refactor
kirklandsign Sep 9, 2025
015a6ab
Doing some rename
kirklandsign Sep 9, 2025
16b6d1c
Java layer no longer need a separate generateFromPos
kirklandsign Sep 9, 2025
039d831
Lint
kirklandsign Sep 9, 2025
ef4138d
Merge remote-tracking branch 'origin/main' into start-pos-api-llava-6
kirklandsign Sep 10, 2025
f6f69b4
Fix
kirklandsign Sep 10, 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
6 changes: 4 additions & 2 deletions ...roid/executorch_android/src/main/java/org/pytorch/executorch/extension/llm/LlmModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,10 @@ public long prefillPrompt(String prompt, long startPos, int bos, int eos) {
* @return The error code.
*/
@Deprecated
public native int generateFromPos(
String prompt, int seqLen, long startPos, LlmCallback callback, boolean echo);
public int generateFromPos(
String prompt, int seqLen, long startPos, LlmCallback callback, boolean echo) {
return generate(prompt, seqLen, callback, echo);
}

/**
* Reset the context of the LLM. This will clear the KV cache and reset the state of the LLM.
Expand Down
33 changes: 0 additions & 33 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 @@ -290,37 +290,6 @@ class ExecuTorchLlmJni : public facebook::jni::HybridClass<ExecuTorchLlmJni> {
return 0;
}

jint generate_from_pos(
facebook::jni::alias_ref<jstring> prompt,
jint seq_len,
jlong start_pos,
facebook::jni::alias_ref<ExecuTorchLlmCallbackJni> callback,
jboolean echo) {
if (model_type_category_ == MODEL_TYPE_CATEGORY_MULTIMODAL) {
std::vector<llm::MultimodalInput> inputs = prefill_inputs_;
prefill_inputs_.clear();
inputs.emplace_back(llm::MultimodalInput{prompt->toStdString()});
return static_cast<jint>(multi_modal_runner_->generate(
inputs,
llm::GenerationConfig{
.echo = static_cast<bool>(echo), .seq_len = seq_len},
[callback](const std::string& result) { callback->onResult(result); },
[callback](const llm::Stats& stats) { callback->onStats(stats); }));
} else if (model_type_category_ == MODEL_TYPE_CATEGORY_LLM) {
executorch::extension::llm::GenerationConfig config{
.echo = static_cast<bool>(echo),
.seq_len = seq_len,
.temperature = temperature_,
};
return static_cast<jint>(runner_->generate(
prompt->toStdString(),
config,
[callback](std::string result) { callback->onResult(result); },
[callback](const llm::Stats& stats) { callback->onStats(stats); }));
}
return static_cast<jint>(executorch::runtime::Error::InvalidArgument);
}

void stop() {
if (model_type_category_ == MODEL_TYPE_CATEGORY_MULTIMODAL) {
multi_modal_runner_->stop();
Expand Down Expand Up @@ -357,8 +326,6 @@ class ExecuTorchLlmJni : public facebook::jni::HybridClass<ExecuTorchLlmJni> {
"appendImagesInput", ExecuTorchLlmJni::append_images_input),
makeNativeMethod(
"appendTextInput", ExecuTorchLlmJni::append_text_input),
makeNativeMethod(
"generateFromPos", ExecuTorchLlmJni::generate_from_pos),
makeNativeMethod("resetContext", ExecuTorchLlmJni::reset_context),
});
}
Expand Down
Loading