Skip to content

Pass images by value to allow rvalue args. #5034

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 1 commit into from
Sep 3, 2024
Merged

Pass images by value to allow rvalue args. #5034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion examples/models/llava/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,6 @@ int32_t main(int32_t argc, char** argv) {
.width = static_cast<int32_t>(image_tensor.size(2)),
.height = static_cast<int32_t>(image_tensor.size(1))}};
// generate
runner.generate(images, prompt, seq_len);
runner.generate(std::move(images), prompt, seq_len);
return 0;
}
2 changes: 1 addition & 1 deletion examples/models/llava/runner/llava_runner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ Error LlavaRunner::load() {
}

Error LlavaRunner::generate(
std::vector<Image>& images,
std::vector<Image> images,
const std::string& prompt,
int32_t seq_len,
std::function<void(const std::string&)> token_callback,
Expand Down
2 changes: 1 addition & 1 deletion examples/models/llava/runner/llava_runner.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class LlavaRunner : public MultimodalRunner {
bool is_loaded();
Error load();
Error generate(
std::vector<Image>& images,
std::vector<Image> images,
const std::string& prompt,
int32_t seq_len = 1024,
std::function<void(const std::string&)> token_callback = {},
Expand Down
3 changes: 3 additions & 0 deletions examples/models/llava/runner/targets.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ def define_common_targets():
visibility = [
"@EXECUTORCH_CLIENTS",
],
compiler_flags = [
"-Wno-global-constructors",
],
exported_deps = [
"//executorch/backends/xnnpack:xnnpack_backend",
"//executorch/extension/llm/runner:runner_lib",
Expand Down
2 changes: 1 addition & 1 deletion extension/android/jni/jni_layer_llama.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ class ExecuTorchLlamaJni
images.push_back(image_runner);
}
multi_modal_runner_->generate(
images,
std::move(images),
prompt->toStdString(),
seq_len,
[callback](std::string result) { callback->onResult(result); },
Expand Down
2 changes: 1 addition & 1 deletion extension/llm/runner/multimodal_runner.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class MultimodalRunner {
virtual bool is_loaded() = 0;
virtual ::executorch::runtime::Error load() = 0;
virtual ::executorch::runtime::Error generate(
std::vector<Image>& images,
std::vector<Image> images,
const std::string& prompt,
int32_t seq_len = 1024,
std::function<void(const std::string&)> token_callback = {},
Expand Down
Loading