Skip to content
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.

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

Fixing llama-android.cpp for error - "common/common.h not found" #8145

Merged
merged 1 commit into from
Jun 27, 2024

Conversation

criminact
Copy link
Contributor

  • Path seems to be wrong for the common.h header file in llama-android.cpp file. Fixing the path so the Android Build doesn't fail with the error "There is no file common/common.h"

  • Self-reported review complexity:

    • Low

- Path seems to be wrong for the common.h header file in llama-android.cpp file. Fixing the path so the Android Build doesn't fail with the error "There is no file common/common.h"
@slaren
Copy link
Collaborator

slaren commented Jun 27, 2024

I noticed that the android example has two almost identical CMakeLists.txt files in examples/llama.android/llama/src/main/cpp/CMakeLists.txt and examples/llama.android/llama/CMakeLists.txt. One of them uses the local copy of llama.cpp, and the other fetches from master. This doesn't seem right to me, are both copies really necessary?

@github-actions github-actions bot added android Issues specific to Android examples labels Jun 27, 2024
@slaren slaren merged commit ac14662 into ggerganov:master Jun 27, 2024
53 checks passed
@criminact
Copy link
Contributor Author

I noticed that the android example has two almost identical CMakeLists.txt files in examples/llama.android/llama/src/main/cpp/CMakeLists.txt and examples/llama.android/llama/CMakeLists.txt. One of them uses the local copy of llama.cpp, and the other fetches from master. This doesn't seem right to me, are both copies really necessary?

Let me check this

@criminact
Copy link
Contributor Author

criminact commented Jun 27, 2024

@slaren examples/llama.android/llama/CMakeLists.txt can be removed. The project seems to be using the examples/llama.android/llama/src/main/cpp/CMakeLists.txt file.

criminact added a commit to criminact/llama.cpp that referenced this pull request Jun 27, 2024
ggerganov#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.
slaren pushed a commit that referenced this pull request Jun 27, 2024
* Delete examples/llama.android/llama/CMakeLists.txt

#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
Nexesenex pushed a commit to Nexesenex/croco.cpp that referenced this pull request Jun 28, 2024
…nov#8145)

- Path seems to be wrong for the common.h header file in llama-android.cpp file. Fixing the path so the Android Build doesn't fail with the error "There is no file common/common.h"
Nexesenex pushed a commit to Nexesenex/croco.cpp that referenced this pull request Jun 28, 2024
…nov#8145)

- Path seems to be wrong for the common.h header file in llama-android.cpp file. Fixing the path so the Android Build doesn't fail with the error "There is no file common/common.h"
arthw pushed a commit to arthw/llama.cpp that referenced this pull request Jun 30, 2024
…nov#8145)

- Path seems to be wrong for the common.h header file in llama-android.cpp file. Fixing the path so the Android Build doesn't fail with the error "There is no file common/common.h"
arthw pushed a commit to arthw/llama.cpp that referenced this pull request Jun 30, 2024
* Delete examples/llama.android/llama/CMakeLists.txt

ggerganov#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
…nov#8145)

- Path seems to be wrong for the common.h header file in llama-android.cpp file. Fixing the path so the Android Build doesn't fail with the error "There is no file common/common.h"
MagnusS0 pushed a commit to MagnusS0/llama.cpp-normistral-tokenizer that referenced this pull request Jul 1, 2024
* Delete examples/llama.android/llama/CMakeLists.txt

ggerganov#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
Labels
android Issues specific to Android examples
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants