Merge branch 'concedo_experimental' of https://github.com/LostRuins/koboldcpp into concedo_experimental

This commit is contained in:
Concedo 2026-03-29 01:25:07 +08:00
commit df6b7b5fdb
3 changed files with 2 additions and 9 deletions

View file

@ -1023,7 +1023,7 @@ sd_generation_outputs sdtype_generate(const sd_generation_inputs inputs)
sd_params->sample_method = sd_get_default_sample_method(sd_ctx);
}
SetCircularAxesAll(sd_ctx, inputs.circular_x, inputs.circular_y);
sd_ctx->sd->SetCircularAxesAll(inputs.circular_x, inputs.circular_y);
sd_params->cache_mode = inputs.cache_mode ? inputs.cache_mode : "";
sd_params->cache_options = inputs.cache_options ? inputs.cache_options : "";

View file

@ -4655,9 +4655,4 @@ SD_API sd_image_t* generate_video(sd_ctx_t* sd_ctx, const sd_vid_gen_params_t* s
return result_images;
}
//added for kcpp
void SetCircularAxesAll(sd_ctx_t* sd_ctx, bool circular_x, bool circular_y)
{
sd_ctx->sd->SetCircularAxesAll(circular_x, circular_y);
}
//end added for kcpp

View file

@ -384,8 +384,6 @@ SD_API sd_image_t* generate_image(sd_ctx_t* sd_ctx, const sd_img_gen_params_t* s
SD_API void sd_vid_gen_params_init(sd_vid_gen_params_t* sd_vid_gen_params);
SD_API sd_image_t* generate_video(sd_ctx_t* sd_ctx, const sd_vid_gen_params_t* sd_vid_gen_params, int* num_frames_out);
void SetCircularAxesAll(sd_ctx_t* sd_ctx, bool circular_x, bool circular_y);
typedef struct upscaler_ctx_t upscaler_ctx_t;
SD_API upscaler_ctx_t* new_upscaler_ctx(const char* esrgan_path,