Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ pub use diffusion_rs_sys::lora_apply_mode_t as LoraModeType;
/// Hires mode
pub use diffusion_rs_sys::sd_hires_upscaler_t as Upscaler;

/// VAE latent format
pub use diffusion_rs_sys::sd_vae_format_t as VaeFormat;

static VALID_EXT: [&str; 3] = ["gguf", "safetensors", "pt"];

#[allow(unused)]
Expand Down Expand Up @@ -386,6 +389,10 @@ pub struct ModelConfig {
#[builder(default = "Default::default()")]
vae: CLibPath,

/// should match the VAE latent layout used by the PiD checkpoint. This is important when using standalone VAE files because the PiD diffusion checkpoint alone does not identify the VAE format.
#[builder(default = "VaeFormat::SD_VAE_FORMAT_AUTO")]
vae_format: VaeFormat,

/// Path to taesd. Using Tiny AutoEncoder for fast decoding (low quality)
#[builder(default = "Default::default()")]
taesd: CLibPath,
Expand Down Expand Up @@ -568,6 +575,10 @@ pub struct ModelConfig {
#[builder(default = "(None, CLibString::default())", setter(custom))]
extra_tiling_args: (Option<HashMap<String, String>>, CLibString),

/// Enable residency+prefetch streaming on top of [ModelConfig::max_vram] (no effect without [ModelConfig::max_vram]; defaults to false)
#[builder(default = "false")]
stream_layers: bool,

#[builder(default = "None", private)]
upscaler_ctx: Option<*mut upscaler_ctx_t>,

Expand Down Expand Up @@ -819,6 +830,8 @@ impl ModelConfig {
params_backend: self.params_backend.1.as_ptr(),
embeddings_connectors_path: self.embeddings_connectors.as_ptr(),
audio_vae_path: self.audio_vae.as_ptr(),
vae_format: self.vae_format,
stream_layers: self.stream_layers,
};
let ctx = new_sd_ctx(&sd_ctx_params);
self.diffusion_ctx = Some((ctx, sd_ctx_params))
Expand Down
2 changes: 1 addition & 1 deletion sys/stable-diffusion.cpp
Submodule stable-diffusion.cpp updated 59 files
+6 −0 CMakeLists.txt
+13 −2 Dockerfile
+12 −1 Dockerfile.cuda
+13 −2 Dockerfile.musa
+12 −1 Dockerfile.sycl
+12 −1 Dockerfile.vulkan
+2 −0 README.md
+ assets/pid/example.png
+39 −0 docs/pid.md
+9 −8 examples/cli/README.md
+2 −1 examples/cli/main.cpp
+41 −5 examples/common/common.cpp
+34 −1 examples/common/common.h
+9 −8 examples/server/README.md
+2 −1 examples/server/runtime.cpp
+10 −0 include/stable-diffusion.h
+157 −23 src/conditioner.hpp
+5 −1 src/control.hpp
+2 −2 src/convert.cpp
+17 −15 src/denoiser.hpp
+5 −1 src/esrgan.hpp
+6 −2 src/flux.hpp
+414 −45 src/ggml_extend.hpp
+61 −5 src/ggml_extend_backend.cpp
+3 −1 src/ggml_extend_backend.h
+53 −3 src/ggml_graph_cut.cpp
+11 −0 src/ggml_graph_cut.h
+180 −10 src/guidance.cpp
+31 −5 src/guidance.h
+5 −2 src/hidream_o1.hpp
+132 −0 src/layer_registry.cpp
+50 −0 src/layer_registry.h
+71 −11 src/llm.hpp
+6 −3 src/lora.hpp
+6 −2 src/ltx_audio_vae.h
+6 −2 src/ltx_vae.hpp
+5 −2 src/ltxv.hpp
+6 −2 src/mmdit.hpp
+15 −1 src/model.cpp
+10 −1 src/model.h
+842 −0 src/pid.hpp
+4 −1 src/pmid.hpp
+6 −2 src/qwen_image.hpp
+53 −0 src/rope.hpp
+301 −88 src/stable-diffusion.cpp
+10 −4 src/t5.hpp
+19 −0 src/tensor.hpp
+4 −4 src/tokenizers/bpe_tokenizer.cpp
+161 −0 src/tokenizers/gemma_tokenizer.cpp
+9 −0 src/tokenizers/gemma_tokenizer.h
+3 −0 src/tokenizers/vocab/gemma2_merges.hpp
+3 −0 src/tokenizers/vocab/gemma2_vocab.hpp
+12 −0 src/tokenizers/vocab/vocab.cpp
+2 −0 src/tokenizers/vocab/vocab.h
+8 −0 src/upscaler.cpp
+2 −0 src/upscaler.h
+0 −29 src/util.cpp
+11 −4 src/wan.hpp
+5 −2 src/z_image.hpp
Loading