sd: sync to master-355-694f0d9#1841
Closed
wbruna wants to merge 3 commits into
Closed
Conversation
wbruna
force-pushed
the
kcpp_sd_355-694f0d9
branch
from
70f2e51 to
220e06f
Compare
Author
|
Rebased to current |
Author
|
Hold on, LoRAs aren't being applied correctly. |
Owner
|
just when leejet/stable-diffusion.cpp#969 appeared 😆 im still waiting for my laptop to be fixed, but i'll test this hopefully next week |
Author
|
My thoughts exactly 🙂 I can include it in this PR once it's merged. |
wbruna
force-pushed
the
kcpp_sd_355-694f0d9
branch
from
6660fbe to
d973bcd
Compare
Author
|
See #1844 . |
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
2 participants
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.
This merge actually didn't result in a lot of conflicts: mostly from added or removed functions near Koboldcpp changes. I also needed to add the new
name_conversion.cppto theMakefileand tosdtype_adapter.cpp.Didn't test extensively yet, but basic generation seems OK.
As before, updated changes against upstream can be reviewed at:
wbruna/stable-diffusion.cpp@koboldcpp_sd_base...koboldcpp_sd_changes