-
Notifications
You must be signed in to change notification settings - Fork 705
Comparing changes
Open a pull request
base repository: leejet/stable-diffusion.cpp
base: master
head repository: Aatricks/stable-diffusion.cpp
compare: master
- 7 commits
- 5 files changed
- 2 contributors
Commits on Jun 3, 2026
-
feat: precomputed-condition API for sequential FLUX.2 generation (llm…
…edge Lever 1) Enable running the text encoder and the diffusion transformer in separate contexts so they are never resident at the same time (peak RAM = max instead of sum) on memory-constrained devices. - include/stable-diffusion.h: sd_tensor_raw_t / sd_condition_raw_t + sd_precompute_condition / sd_free_condition / sd_generate_image_with_precomputed_condition. - FLUX.2 conditioner-skip: when no text_encoders.llm.* tensors are present (DiT-only context) skip building the LLMEmbedder instead of failing the tensor load; null-guard the conditioner derefs in setup. - generate_image refactored to generate_image_impl(..., cond_raw, uncond_raw): reconstructs the conditioning into its work_ctx and forwards to generate_image_internal, which gained precomputed_cond/uncond params + branch (skips get_learned_condition when a precomputed cond is supplied). - sd_precompute_condition / sd_generate_image_with_precomputed_condition impls. Verified on host (CPU): encoder-only precompute -> free -> DiT-only generate produces a coherent image; peak ~2.6GB vs ~4.0GB for a combined context. Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for c785f5f - Browse repository at this point
Copy the full SHA c785f5fView commit details
Commits on Jul 8, 2026
-
fix: honor GGML_DISABLE_VULKAN/GGML_DISABLE_OPENCL in init_backend
SD_USE_VULKAN builds always picked the Vulkan backend whenever a device was enumerable, leaving hosts no runtime path to the CPU backend. On devices whose Vulkan driver initializes fine but deadlocks at the first compute dispatch (PowerVR DXT-48 / Pixel 10, driver v1.602.x) the only escape is to skip Vulkan entirely. Check the same env vars the llmedge JNI already sets (and ggml-backend-reg already honors) before touching each GPU backend.
Configuration menu - View commit details
-
Copy full SHA for 6d976d9 - Browse repository at this point
Copy the full SHA 6d976d9View commit details -
Merge llmedge branches: FLUX.2 precomputed-condition API + runtime GG…
…ML_DISABLE_VULKAN/GGML_DISABLE_OPENCL backend opt-out # Conflicts: # src/stable-diffusion.cpp
Configuration menu - View commit details
-
Copy full SHA for 3c2c668 - Browse repository at this point
Copy the full SHA 3c2c668View commit details -
Pin nested ggml back to a8db410 (keep other nested deps at merged)
The master merge advanced ggml a8db410 -> 0ce7ad3, whose ggml-vulkan.cpp requires SPIRV-Headers (<spirv/unified1/spirv.hpp>) that are not wired into llmedge's Android NDK include path or the Linux CI toolchain, breaking the Vulkan build with 'spv has not been declared'. a8db410 is the ggml the merged sd.cpp source was built and device-verified against (S22: standard, sequential, FLUX) and is fetchable from the leejet/ggml remote. Only ggml is reverted; the frontend/libwebm/libwebp pointers stay at the merged commits (they do not affect the native build and their old commits are no longer on their remotes). Upstream ggml alignment + SPIRV-Headers wiring is deferred to the upstream pass.
Configuration menu - View commit details
-
Copy full SHA for ead8fcf - Browse repository at this point
Copy the full SHA ead8fcfView commit details
Commits on Jul 9, 2026
-
Re-align nested ggml to upstream 0ce7ad3
Reverts the temporary CI pin to a8db410. llmedge now wires SPIRV-Headers into both the Android and desktop/CI Vulkan builds (llmedge-spirv-headers.cmake), so ggml-vulkan.cpp's runtime SPIR-V patching (namespace spv) compiles. This brings the nested ggml back in line with the upstream leejet/master merge.
Configuration menu - View commit details
-
Copy full SHA for 36ca7a2 - Browse repository at this point
Copy the full SHA 36ca7a2View commit details
Commits on Jul 13, 2026
-
Configuration menu - View commit details
-
Copy full SHA for a049d14 - Browse repository at this point
Copy the full SHA a049d14View commit details
Commits on Jul 15, 2026
-
Record nested ggml 0ce7ad34 and server frontend 797ccf8 gitlinks
Aligns the recorded nested submodule pointers with the checkouts the Android build and device testing have been running against.
Configuration menu - View commit details
-
Copy full SHA for bbcef27 - Browse repository at this point
Copy the full SHA bbcef27View commit details
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff master...master