Repository navigation
Conversation
automodel.cpp builds engines through the backend registry, so every harness that compiles it has to compile model_backend.cpp and define register_builtin_backends; only the MiniCPM-V and rai harnesses did. The others now register the families of the engine libraries they link (none for Qwen3.5-Omni, which builds its engine itself). Whisper's Makefile drops automodel.cpp, which it never used; its CMake build already did without. Also link the harnesses from lib/xrt, where the engine libs moved with the HRX split, and give the MiniCPM-V harness the image sources its Makefile has. Co-Authored-By: Claude <[email protected]>
This branch has not been deployed
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
Most standalone test harnesses under
src/test/no longer link on main. This fixes the two causes that apply to all of them.automodel.cppbuilds engines through the backend registry, so a harness that compiles it also has to compilemodel_backend.cppand defineregister_builtin_backends, ascreate_new_model.mdsays. Only the MiniCPM-V and rai harnesses did. The other 20 now do. Each registers the families of the engine libraries it already links, taken frombuiltin_backends.cpp. For example,qwen3_npuregistersqwen3,qwen3-it,qwen3-tkanddeepseek-r1-0528. Qwen3.5-Omni builds its engine itself, so its harness registers nothing.src/lib/xrtandsrc/lib/hrx, butadd_npu_teststill linked fromsrc/lib. It now links fromsrc/lib/xrt, since the harness CMake is XRT-only.Also:
automodel.cpp. Whisper never used it, and its CMake build already did without it.Testing
Windows, MSVC, CMake path:
Not in this PR
gemma4_12bandqwen3_5_omni_npuCMake don't linkswresampleorfftw, which their audio sources need.qwen3_8mtp_npuCMake is missing its image sources.gemma4e_*andwhisper_npulinklibfftw3-3.lib, whichsrc/libships only as a.defand.dll.#790 adds the chat library to the same harnesses. The two PRs merge without conflicts in either order.
🤖 Generated with Claude Code