fix(omnivoice): drop -Wshadow to unblock LLAMA_FATAL_WARNINGS (CI 3rd-party)#21
Merged
Conversation
omnivoice_lib sources include llama's private headers
(src/llama-arch.h, src/llama-adapter.h, ...) and the public
ggml-backend.h. None of those are shadow-clean upstream:
ggml-backend.h:427: 'ggml_backend_graph_copy' hides constructor
for 'struct ggml_backend_graph_copy'
llama-arch.h:623: declaration of 'arch' shadows a member of
'LLM_TN'
llama-adapter.h:60: declaration of 'a'/'b' shadows a member of
'llama_adapter_lora_weight'
Under `-DLLAMA_FATAL_WARNINGS=ON` (CI 3rd-party / ubuntu-24-llguidance)
these become -Werror and break the build through no fault of
omnivoice's own sources.
Drop -Wshadow from omnivoice_lib's compile options. Keep -Wall
-Wextra -Wconversion so omnivoice's own code is still warning-checked.
omnivoice (shared) and omnivoice-test-abi-c already don't enable
-Wshadow.
|
Important Review skippedAuto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
PR #18 unblocked the multi-line-comment failure in
CI (3rd-party). The next layer of failure exposed under-DLLAMA_FATAL_WARNINGS=ON:All three are in upstream llama.cpp headers, but
omnivoice_libenabled-Wshadowon its own translation units which pulled in those headers, and-DLLAMA_FATAL_WARNINGS=ONescalated them to-Werror.Drop
-Wshadowfromomnivoice_lib. Keep-Wall -Wextra -Wconversion(and the-Wno-*suppressions) so omnivoice's own code is still warning-checked. The omnivoice shared library andomnivoice-test-abi-calready don't enable-Wshadow.Test plan