Skip to content

tests: Harmonize header use - #25616

Merged
ggerganov merged 2 commits into
ggml-org:masterfrom
ckastner:tests-harmonize-includes
Jul 13, 2026
Merged

ggerganov merged 2 commits into
ggml-org:masterfrom
ckastner:tests-harmonize-includes

Conversation

@ckastner

@ckastner ckastner commented Jul 13, 2026 •

Copy link
Copy Markdown
Collaborator

Overview

This switches two outliers in tests/ to use quoted-includes (as all the other tests do), rather than bracketed-includes, to ensure the tests are always built against the embedded ggml even in the presence of a system ggml.

The two tests that need private headers are guarded by NOT LLAMA_USE_SYSTEM_GGML, which lacks them.

target_include_directories is dropped for test-export-graph-ops because it only uses public headers after all.

Additional information

This supersedes #25179.

Requirements

ckastner added 2 commits July 13, 2026 10:03
As with all other tests. This is to ensure that the build uses shipped
headers over possibly system-installed ones.
@ckastner

Copy link
Copy Markdown
Collaborator Author

@ggerganov, I thought a fresh approach might be simpler/clearer than #25179, where I took a few wrong detours.

@ggerganov ggerganov added the merge ready A maintainer can use this label to indicate that they consider the changes final and ready to merge. label Jul 13, 2026
@ggerganov
ggerganov marked this pull request as ready for review July 13, 2026 09:51
@ggerganov
ggerganov merged commit f4253ef into ggml-org:master Jul 13, 2026
22 of 25 checks passed
RehanQasim-dev pushed a commit to aifoundry-org/llama.cpp that referenced this pull request Jul 23, 2026
* tests: Harmonize the use of private ggml includes

* tests: In test-backend-ops, use quoted includes

As with all other tests. This is to ensure that the build uses shipped
headers over possibly system-installed ones.
RehanQasim-dev pushed a commit to aifoundry-org/llama.cpp that referenced this pull request Jul 23, 2026
* tests: Harmonize the use of private ggml includes

* tests: In test-backend-ops, use quoted includes

As with all other tests. This is to ensure that the build uses shipped
headers over possibly system-installed ones.
satindergrewal pushed a commit to satindergrewal/llama.cpp that referenced this pull request Aug 12, 2026
* tests: Harmonize the use of private ggml includes

* tests: In test-backend-ops, use quoted includes

As with all other tests. This is to ensure that the build uses shipped
headers over possibly system-installed ones.
zbrad pushed a commit to zbrad/llama.cpp that referenced this pull request Sep 10, 2026
* tests: Harmonize the use of private ggml includes

* tests: In test-backend-ops, use quoted includes

As with all other tests. This is to ensure that the build uses shipped
headers over possibly system-installed ones.
pl752 pushed a commit to pl752/llama.cpp that referenced this pull request Sep 15, 2026
* tests: Harmonize the use of private ggml includes

* tests: In test-backend-ops, use quoted includes

As with all other tests. This is to ensure that the build uses shipped
headers over possibly system-installed ones.
frostyautumnleaf pushed a commit to frostyautumnleaf/llama.cpp that referenced this pull request Oct 5, 2026
* tests: Harmonize the use of private ggml includes

* tests: In test-backend-ops, use quoted includes

As with all other tests. This is to ensure that the build uses shipped
headers over possibly system-installed ones.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merge ready A maintainer can use this label to indicate that they consider the changes final and ready to merge. testing Everything test related

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants