Commit Graph

206 Commits

Author SHA1 Message Date
Concedo 3cfc4dc581 avoid euler a for flux (+4 squashed commit)
Squashed commit:

[5a4b72385] fix cuda build

[5f969a645] add vulkan information

[6849e7398] fixed flux

[740e80419] update readme
2024-11-05 22:50:14 +08:00
Concedo 5b90eeaf17 fixed sd to work on larger images by adding tiling, also limit res for sd1.5 2024-11-04 23:26:15 +08:00
Concedo 847689e74c fixed incorrect makefile flags 2024-11-04 20:39:10 +08:00
Concedo bb13925f39 Merge branch 'upstream' into concedo_experimental
# Conflicts:
#	CMakePresets.json
#	Makefile
#	Package.swift
#	ci/run.sh
#	common/CMakeLists.txt
#	examples/CMakeLists.txt
#	flake.lock
#	ggml/src/CMakeLists.txt
#	ggml/src/ggml-backend.cpp
#	ggml/src/ggml.c
#	pocs/vdot/q8dot.cpp
#	pocs/vdot/vdot.cpp
#	tests/test-backend-ops.cpp
#	tests/test-grad0.cpp
#	tests/test-quantize-fns.cpp
#	tests/test-quantize-perf.cpp
#	tests/test-rope.cpp
2024-11-04 16:54:53 +08:00
Concedo 5233e8ed1d sd 3.5 medium 2024-11-03 23:27:06 +08:00
Concedo f32a874966 resync and updated sdcpp for flux and sd3 support 2024-11-03 22:03:16 +08:00
Concedo e692a79aab Merge branch 'upstream' into concedo_experimental
# Conflicts:
#	.github/workflows/docker.yml
#	CMakeLists.txt
#	CONTRIBUTING.md
#	docs/android.md
#	docs/docker.md
#	examples/embedding/embedding.cpp
#	examples/imatrix/imatrix.cpp
#	examples/infill/infill.cpp
#	examples/llama-bench/llama-bench.cpp
#	examples/main/README.md
#	examples/parallel/parallel.cpp
#	examples/perplexity/perplexity.cpp
#	examples/quantize-stats/quantize-stats.cpp
#	examples/save-load-state/save-load-state.cpp
#	examples/server/README.md
#	examples/simple/CMakeLists.txt
#	examples/speculative/speculative.cpp
#	flake.lock
#	ggml/src/CMakeLists.txt
#	ggml/src/ggml-blas.cpp
#	pocs/vdot/q8dot.cpp
#	pocs/vdot/vdot.cpp
#	scripts/debug-test.sh
#	scripts/sync-ggml.last
#	src/llama.cpp
#	tests/test-backend-ops.cpp
#	tests/test-chat-template.cpp
#	tests/test-quantize-fns.cpp
#	tests/test-quantize-perf.cpp
#	tests/test-tokenizer-0.cpp
#	tests/test-tokenizer-1-bpe.cpp
#	tests/test-tokenizer-1-spm.cpp
2024-10-11 11:59:59 +08:00
bebopkim 7dac9982f9 Metal: remove ggml_backend_metal_log_set_callback due to backend logging mechanism unificification d6fe7ab (#1144) 2024-10-06 14:54:33 +08:00
Concedo 2d57f80af9 Fix compilation on macos 2024-10-03 15:10:30 +08:00
Concedo e44ddf26ef Merge branch 'upstream' into concedo_experimental
# Conflicts:
#	.github/workflows/build.yml
#	.github/workflows/server.yml
#	CMakeLists.txt
#	Makefile
#	examples/embedding/embedding.cpp
#	examples/imatrix/imatrix.cpp
#	examples/llama-bench/llama-bench.cpp
#	examples/llava/MobileVLM-README.md
#	examples/parallel/parallel.cpp
#	examples/perplexity/perplexity.cpp
#	examples/quantize/CMakeLists.txt
#	examples/server/README.md
#	examples/speculative/speculative.cpp
#	tests/test-backend-ops.cpp
2024-09-13 16:17:24 +08:00
Concedo 12fd16bfd4 Merge commit 'df270ef74596da8f1178f08991f4c51f18c9ee82' into concedo_experimental
# Conflicts:
#	Makefile
#	common/CMakeLists.txt
#	common/common.h
#	common/sampling.cpp
#	common/sampling.h
#	examples/infill/infill.cpp
#	examples/llama-bench/llama-bench.cpp
#	examples/quantize-stats/quantize-stats.cpp
#	examples/server/server.cpp
#	include/llama.h
#	src/llama-sampling.cpp
#	src/llama-sampling.h
#	src/llama.cpp
#	tests/test-grammar-integration.cpp
#	tests/test-grammar-parser.cpp
#	tests/test-json-schema-to-grammar.cpp
#	tests/test-llama-grammar.cpp
#	tests/test-sampling.cpp
2024-09-09 17:10:08 +08:00
Concedo c61fa9155d handle oversized images by downscaling 2024-08-26 13:58:18 +08:00
Concedo e1f97f7fb5 Merge branch 'upstream' into concedo_experimental
# Conflicts:
#	.devops/llama-server.Dockerfile
#	README.md
#	flake.lock
#	ggml/src/ggml-vulkan.cpp
#	ggml/src/vulkan-shaders/concat.comp
#	ggml/src/vulkan-shaders/pad.comp
#	ggml/src/vulkan-shaders/vulkan-shaders-gen.cpp
#	scripts/sync-ggml-am.sh
#	scripts/sync-ggml.last
#	src/llama.cpp
#	tests/test-backend-ops.cpp
2024-08-06 16:33:26 +08:00
Concedo 3a72410804 Added vulkan support for SD (+1 squashed commits)
Squashed commits:

[13f42f83] Added vulkan support for SD
2024-08-01 17:12:33 +08:00
Concedo 813cf829b5 allow selecting multigpu on vulkan 2024-06-06 18:36:56 +08:00
Concedo 9c7340bfac downgrade stb image resize 2024-06-02 18:02:22 +08:00
Concedo 4ed9ba7352 Merge branch 'upstream' into concedo_experimental
# Conflicts:
#	.github/workflows/docker.yml
#	CMakeLists.txt
#	Makefile
#	README.md
#	flake.lock
#	tests/test-backend-ops.cpp
2024-05-28 21:57:19 +08:00
Concedo 7a5983399b try to fix lora naming issues 2024-05-15 23:49:01 +08:00
Concedo 08993696c3 try apply lora on load 2024-05-15 22:53:23 +08:00
Concedo e1e6833a7a try to fix loras 2024-05-15 16:05:51 +08:00
Concedo ebbb969526 update lite 2024-05-15 15:00:22 +08:00
Concedo 5ce2fdad24 taesd for sdxl, add lora loading done 2024-05-14 23:02:56 +08:00
Concedo 5d15f8f76a vae test 2024-05-14 19:17:01 +08:00
Concedo 4807b66907 wip sd 2024-05-13 23:23:16 +08:00
Concedo a681cdd9ef Merge branch 'upstream' into concedo_experimental
# Conflicts:
#	common/sampling.h
#	llama.h
#	tests/test-chat-template.cpp
2024-04-24 21:29:07 +08:00
Concedo 5c323a0661 fixed img2img for different sizes 2024-04-08 23:29:46 +08:00
Concedo 125f84aa02 fixed compiler warnings 2024-04-08 16:40:55 +08:00
Concedo 79c8e87922 remove constraint for img dimension 2024-04-06 19:58:58 +08:00
Concedo 743687020d fixed img2img 2024-04-06 17:29:44 +08:00
Concedo 7968bdebbb added more stats in perf 2024-03-16 16:53:48 +08:00
Concedo 88705cb89a improve quiet mode for SD 2024-03-12 20:50:39 +08:00
Concedo 6a32c14e86 Merge branch 'master' into concedo_experimental
# Conflicts:
#	.github/workflows/build.yml
#	CMakeLists.txt
#	Makefile
#	README-sycl.md
#	README.md
#	flake.lock
#	scripts/sync-ggml-am.sh
#	scripts/sync-ggml.last
#	scripts/sync-ggml.sh
#	tests/.gitignore
#	tests/test-backend-ops.cpp
2024-03-11 23:00:47 +08:00
Concedo 6990d07a26 tweak sd logging, show progress normally 2024-03-10 11:45:11 +08:00
Concedo c08d7e5042 wip integration of llava 2024-03-10 11:18:47 +08:00
Concedo ca19199bc8 prevent sd logging when in quiet mode (+1 squashed commits)
Squashed commits:

[a4a1cdd5] fixed type conversion
2024-03-09 16:37:51 +08:00
Concedo 3f475970fa quiet mode for sd 2024-03-08 19:35:29 +08:00
Concedo 2132bf9ca0 added img sampler aliases 2024-03-08 18:53:34 +08:00
Concedo d910f2354c bugfixes 2024-03-05 19:16:54 +08:00
Concedo 4eb3a95cbb reenable LCM sampler 2024-03-05 17:39:21 +08:00
Concedo ac43e0115c Merge branch 'master' into concedo_experimental
# Conflicts:
#	.devops/nix/package.nix
#	README.md
#	ggml-metal.m
#	llama.cpp
#	scripts/sync-ggml.last
#	tests/test-backend-ops.cpp
2024-03-05 15:54:05 +08:00
Concedo c952b4f192 Revert "merge missing functions from sdcpp"
This reverts commit 19e1c518f1.
2024-03-05 15:38:51 +08:00
Concedo 0c59c1ed90 allow specifying width and height 2024-03-03 15:44:15 +08:00
Concedo e53d21d748 sanitize SD prompt to avoid segfault 2024-03-02 12:05:59 +08:00
Concedo 2d9a90b652 try to fix ci compile errors (+1 squashed commits)
Squashed commits:

[d0d49663] fixed log multiline (+1 squashed commits)

Squashed commits:

[81a8befe] try to fix linux build error (+1 squashed commits)

Squashed commits:

[22850dda] try to fix build (+1 squashed commits)

Squashed commits:

[b8294611] missing type
2024-03-01 23:38:15 +08:00
Concedo 80011ed8aa KCPP SD: add warn and step restriction., updated lite, handle quant mode 2024-03-01 16:41:19 +08:00
Concedo 3463688a0e image generation is fully working over api (+1 squashed commits)
Squashed commits:

[c98ab0b4] single image generation is working now
2024-03-01 14:43:44 +08:00
Concedo e8f4d7b3da added model and config endpoints for sdcpp, added more samplers. speed is still not good 2024-02-29 22:56:09 +08:00
bebopkim 257015bb94 Resolve Metal compilation errors for sdcpp (#720) 2024-02-29 20:15:45 +08:00
Concedo 5a44d4de2b refactor and clean identifiers for sd, fix cmake 2024-02-29 18:28:45 +08:00
Concedo 66134bb36e ui for loading SD models done 2024-02-29 17:08:22 +08:00