Skip to content

Delete examples/llama.android/llama/CMakeLists.txt #8165

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

Jump to bottom
Merged
merged 2 commits into from
Jun 27, 2024
Merged

Delete examples/llama.android/llama/CMakeLists.txt #8165

merged 2 commits into from
Jun 27, 2024

Conversation

criminact
Copy link
Contributor

#8145 (comment)

This file is not being used for building on Android. llama.cpp/examples/llama.android/llama/src/main/cpp/CMakeLists.txt is being used instead.

  • Self-reported review complexity:
    • Low

@criminact
Delete examples/llama.android/llama/CMakeLists.txt
8a3c5e2 
ggml-org#8145 (comment)

This file is not being used for building on Android. `llama.cpp/examples/llama.android/llama/src/main/cpp/CMakeLists.txt` is being used instead.
@criminact
Copy link
Contributor Author

@slaren Here you go ^

@slaren
Copy link
Member

slaren commented Jun 27, 2024

Thanks for looking into this. There is still one problem, the remaining llama.cpp/examples/llama.android/llama/src/main/cpp/CMakeLists.txt still uses FetchContent to load llama.cpp from master instead of using the local version, which means that problems are not detected until after the PRs are merged. Could it be changed to add_subdirectory as in the other CMakeLists.txt?

@github-actions github-actions bot added android Issues specific to Android examples labels Jun 27, 2024
@mofosyne mofosyne added the Review Complexity : Low Trivial changes to code that most beginner devs (or those who want a break) can tackle. e.g. UI fix label Jun 27, 2024
@criminact
Update CMakeLists.txt
dc0cf9a 
Pick local llama.cpp files instead of fetching content from git
@slaren slaren merged commit 3879526 into ggml-org:master Jun 27, 2024
52 checks passed
@criminact criminact deleted the patch-4 branch June 28, 2024 06:22
arthw pushed a commit to arthw/llama.cpp that referenced this pull request Jun 30, 2024
@criminact @NeoZhangJianyu
Delete examples/llama.android/llama/CMakeLists.txt (ggml-org#8165)
772ca47 
* Delete examples/llama.android/llama/CMakeLists.txt

ggml-org#8145 (comment)

This file is not being used for building on Android. `llama.cpp/examples/llama.android/llama/src/main/cpp/CMakeLists.txt` is being used instead.

* Update CMakeLists.txt

Pick local llama.cpp files instead of fetching content from git
MagnusS0 pushed a commit to MagnusS0/llama.cpp-normistral-tokenizer that referenced this pull request Jul 1, 2024
@criminact @MagnusS0
Delete examples/llama.android/llama/CMakeLists.txt (ggml-org#8165)
8f0162a 
* Delete examples/llama.android/llama/CMakeLists.txt

ggml-org#8145 (comment)

This file is not being used for building on Android. `llama.cpp/examples/llama.android/llama/src/main/cpp/CMakeLists.txt` is being used instead.

* Update CMakeLists.txt

Pick local llama.cpp files instead of fetching content from git
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@slaren slaren slaren approved these changes

Assignees
No one assigned
Labels
android Issues specific to Android examples Review Complexity : Low Trivial changes to code that most beginner devs (or those who want a break) can tackle. e.g. UI fix
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@criminact @slaren @mofosyne