fix: correct Gemma3 rope settings and vram limit propagation#1583
Merged
Conversation
wbruna
pushed a commit
to wbruna/stable-diffusion.cpp
that referenced
this pull request
May 30, 2026
dbrain
added a commit
to dbrain/hbd-longcat-avatar.cpp
that referenced
this pull request
Jun 9, 2026
Brings the upstream src-layout reorg (leejet#1615 model/, core/, conditioning/, runtime/, extensions/), the new offload path (leejet#1601 pinned host buffer, leejet#1576 --stream-layers), vram-limit propagation (leejet#1583), APG/PiD/ideogram4, and the photomaker->generation-extension move (leejet#1618). Conflict resolution (4 files): - model.h / stable-diffusion.cpp: union the fork's LONGCAT_AVATAR version with upstream's PiD/Ideogram4; keep the avatar deferred-DiT-load + per-frame timestep zeroing, adopt upstream's alloc error-checks + generation-extensions alloc loop (pmid is now an extension); keep whisper-encoder alloc. - conditioner.hpp: keep both set_keep_params_resident + set_stream_layers_enabled. - ggml_extend.hpp: keep the fork's coherent offload system (lap-32 pinned alloc, lap-32.2 H2D pipelining, partial/all-param restore, umT5 free-then-reload null fix, lap-28 F16-KV/mask attention) and fold upstream's persistent_externals snapshot + observed_max_effective_budget reset alongside; flash_skip_kv_pad opt-out coexists with upstream leejet#1453's unconditional kv-pad removal. - Repointed fork-only headers (longcat_avatar/audio, nava, nava example) at the new nested include paths.
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
1 participant
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
Related Issue / Discussion
N/A
Additional Information
N/A
Checklist