Skip to content

sd: sync to master-646-0baf721#2217

Open
wbruna wants to merge 5 commits into
LostRuins:concedo_experimentalfrom
wbruna:kcpp_sd_update_202605_5
Open

sd: sync to master-646-0baf721#2217
wbruna wants to merge 5 commits into
LostRuins:concedo_experimentalfrom
wbruna:kcpp_sd_update_202605_5

Conversation

@wbruna
Copy link
Copy Markdown

@wbruna wbruna commented May 17, 2026

On top of #2213 . LTX 2.3 support, some sampler changes, and a vocab file refactor.

Several added files:

otherarch/sdcpp/guidance.cpp
otherarch/sdcpp/guidance.h
otherarch/sdcpp/ltx_audio_vae.h
otherarch/sdcpp/ltx_vae.hpp
otherarch/sdcpp/tokenizers/gemma_tokenizer.cpp
otherarch/sdcpp/tokenizers/gemma_tokenizer.h
otherarch/sdcpp/tokenizers/vocab/clip_merges.hpp
otherarch/sdcpp/tokenizers/vocab/gemma_merges.hpp
otherarch/sdcpp/tokenizers/vocab/gemma_vocab.hpp
otherarch/sdcpp/tokenizers/vocab/mistral_merges.hpp
otherarch/sdcpp/tokenizers/vocab/mistral_vocab.hpp
otherarch/sdcpp/tokenizers/vocab/qwen_merges.hpp
otherarch/sdcpp/tokenizers/vocab/t5.hpp

and a few removed:

otherarch/sdcpp/tokenizers/vocab/clip_t5.hpp
otherarch/sdcpp/tokenizers/vocab/mistral.hpp
otherarch/sdcpp/tokenizers/vocab/qwen.hpp

so I ended up sorting and rebuilding the source file list.

To fix the linking errors, I've added load_gemma_merges and load_gemma_vocab_json functions with search+replace from the mistral ones.

Edit: updated to master-633-5b0267e to get a few new fixes.

Edit 2: updated to master-637-ef92a00 for more LTX stuff, and a LoRA offloading performance fix.

Edit 3: updated to master-642-3a8788c, with more LTX stuff, and a small refactor.

Edit 4: updated to master-646-0baf721 for more LTX changes.

@wbruna wbruna force-pushed the kcpp_sd_update_202605_5 branch from cb8bbfb to 31260dd Compare May 18, 2026 14:38
@LostRuins
Copy link
Copy Markdown
Owner

Alright now that the other PR is merged, this is next on the list after I test out the gemma vocab extraction and minifications

@wbruna wbruna force-pushed the kcpp_sd_update_202605_5 branch from 31260dd to d2accdc Compare May 20, 2026 02:35
@wbruna wbruna changed the title sd: sync to master-621-baf7eda sd: sync to master-633-5b0267e May 20, 2026
@wbruna wbruna force-pushed the kcpp_sd_update_202605_5 branch from a9ba41b to 45fb52e Compare May 21, 2026 01:53
@wbruna wbruna changed the title sd: sync to master-633-5b0267e sd: sync to master-637-ef92a00 May 21, 2026
@henk717
Copy link
Copy Markdown
Collaborator

henk717 commented May 21, 2026

Does this already enable LTX or will that require additionals?

@wbruna
Copy link
Copy Markdown
Author

wbruna commented May 21, 2026

It's just the sync for now. It'll still need at least the gemma external merges and embed files, support for two additional models (embeddings connectors and audio VAE), and likely a file remapping for the llm.

@wbruna wbruna force-pushed the kcpp_sd_update_202605_5 branch from 45fb52e to e7f386c Compare May 22, 2026 00:36
@wbruna wbruna changed the title sd: sync to master-637-ef92a00 sd: sync to master-642-3a8788c May 22, 2026
@wbruna
Copy link
Copy Markdown
Author

wbruna commented May 22, 2026

@LostRuins , I'm hitting a crash bug on the current concedo_experimental version related to offloading with LoRAs; I believe the LoRA caching code is interacting badly with the recent backend changes. But apparently the "LoRA offloading performance fix" from this PR fixes it, too.

Do you intend to merge this soon? I can make a separate PR for the fix if you don't.

@LostRuins
Copy link
Copy Markdown
Owner

I was planning to defer this PR until I could look at LTX 2.3, but I can merge it early if you prefer. Would that be easier?

@wbruna wbruna force-pushed the kcpp_sd_update_202605_5 branch from e7f386c to b1c28c8 Compare May 23, 2026 02:17
@wbruna wbruna changed the title sd: sync to master-642-3a8788c sd: sync to master-646-0baf721 May 23, 2026
@wbruna
Copy link
Copy Markdown
Author

wbruna commented May 23, 2026

I was planning to defer this PR until I could look at LTX 2.3, but I can merge it early if you prefer. Would that be easier?

It would be a bit easier to test, since we'd be in sync with upstream. There is a risk of regressions, but I believe it would be better for us to find them sooner anyway.

@wbruna wbruna force-pushed the kcpp_sd_update_202605_5 branch from b1c28c8 to 3ec404b Compare May 23, 2026 14:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants