diff --git a/.github/workflows/kcpp-build-release-win.yaml b/.github/workflows/kcpp-build-release-win.yaml index 4eeabeb4f..54fa15b20 100644 --- a/.github/workflows/kcpp-build-release-win.yaml +++ b/.github/workflows/kcpp-build-release-win.yaml @@ -144,4 +144,36 @@ jobs: ggml/src/ggml-vulkan-shaders.hpp vulkan-readme.txt + - name: Build Tools + id: make_tools + run: | + make tools -j 4 + New-Item -ItemType Directory -Path legacy + Copy-Item quantize_gpt2.exe -Destination legacy + Copy-Item quantize_gptj.exe -Destination legacy + Copy-Item quantize_mpt.exe -Destination legacy + Copy-Item quantize_neox.exe -Destination legacy + Copy-Item otherarch/tools/convert_hf_gpt2.py -Destination legacy + Copy-Item otherarch/tools/convert_hf_gptj.py -Destination legacy + Copy-Item otherarch/tools/convert_hf_mpt.py -Destination legacy + Copy-Item otherarch/tools/convert_hf_neox.py -Destination legacy + Copy-Item otherarch/tools/convert_llama_ggml_to_gguf.py -Destination legacy + Copy-Item otherarch/tools/convert_pt_rwkv.py -Destination legacy + shell: pwsh + - name: Upload Tools + uses: actions/upload-artifact@v4 + with: + name: koboldcpp_tools + path: | + gguf-split.exe + quantize_clip.exe + quantize_gguf.exe + whispermain.exe + sdmain.exe + ttsmain.exe + whispermain.exe + convert_hf_to_gguf.py + convert_hf_to_gguf_update.py + gguf-py + legacy \ No newline at end of file diff --git a/otherarch/sdcpp/main.cpp b/otherarch/sdcpp/main.cpp index 98c9415a3..5fe59578d 100644 --- a/otherarch/sdcpp/main.cpp +++ b/otherarch/sdcpp/main.cpp @@ -964,7 +964,8 @@ int main(int argc, const char* argv[]) { params.skip_layers.size(), params.slg_scale, params.skip_layer_start, - params.skip_layer_end); + params.skip_layer_end, + nullptr); } else { sd_image_t input_image = {(uint32_t)params.width, (uint32_t)params.height, @@ -1033,7 +1034,8 @@ int main(int argc, const char* argv[]) { params.skip_layers.size(), params.slg_scale, params.skip_layer_start, - params.skip_layer_end); + params.skip_layer_end, + nullptr); } } diff --git a/otherarch/sdcpp/stable-diffusion.h b/otherarch/sdcpp/stable-diffusion.h index 97a4bc879..a739ebc59 100644 --- a/otherarch/sdcpp/stable-diffusion.h +++ b/otherarch/sdcpp/stable-diffusion.h @@ -180,7 +180,8 @@ SD_API sd_image_t* txt2img(sd_ctx_t* sd_ctx, size_t skip_layers_count, float slg_scale, float skip_layer_start, - float skip_layer_end); + float skip_layer_end, + const sd_image_t* photomaker_reference); SD_API sd_image_t* img2img(sd_ctx_t* sd_ctx, sd_image_t init_image, @@ -207,7 +208,8 @@ SD_API sd_image_t* img2img(sd_ctx_t* sd_ctx, size_t skip_layers_count, float slg_scale, float skip_layer_start, - float skip_layer_end); + float skip_layer_end, + const sd_image_t* photomaker_reference); SD_API sd_image_t* img2vid(sd_ctx_t* sd_ctx, sd_image_t init_image,