Skip to content

Commit 4184254

Browse files
committed
Fix edge case when tile is bigger than latent
1 parent b06ecf0 commit 4184254

File tree

1 file changed

+20
-13
lines changed

1 file changed

+20
-13
lines changed

ggml_extend.hpp

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -679,18 +679,25 @@ __STATIC_INLINE__ void sd_tiling(ggml_tensor* input, ggml_tensor* output, const
679679
int tile_overlap_y = (int32_t)(tile_size * tile_overlap_factor_y);
680680
int non_tile_overlap_y = tile_size - tile_overlap_y;
681681

682-
int input_tile_size = tile_size;
683-
int output_tile_size = tile_size;
682+
int tile_size_x = tile_size < small_width ? tile_size : small_width;
683+
int tile_size_y = tile_size < small_height ? tile_size : small_height;
684+
685+
int input_tile_size_x = tile_size_x;
686+
int input_tile_size_y = tile_size_y;
687+
int output_tile_size_x = tile_size_x;
688+
int output_tile_size_y = tile_size_y;
684689

685690
if (big_out) {
686-
output_tile_size *= scale;
691+
output_tile_size_x *= scale;
692+
output_tile_size_y *= scale;
687693
} else {
688-
input_tile_size *= scale;
694+
input_tile_size_x *= scale;
695+
input_tile_size_y *= scale;
689696
}
690697

691698
struct ggml_init_params params = {};
692-
params.mem_size += input_tile_size * input_tile_size * input->ne[2] * sizeof(float); // input chunk
693-
params.mem_size += output_tile_size * output_tile_size * output->ne[2] * sizeof(float); // output chunk
699+
params.mem_size += input_tile_size_x * input_tile_size_y * input->ne[2] * sizeof(float); // input chunk
700+
params.mem_size += output_tile_size_x * output_tile_size_y * output->ne[2] * sizeof(float); // output chunk
694701
params.mem_size += 3 * ggml_tensor_overhead();
695702
params.mem_buffer = NULL;
696703
params.no_alloc = false;
@@ -705,19 +712,19 @@ __STATIC_INLINE__ void sd_tiling(ggml_tensor* input, ggml_tensor* output, const
705712
}
706713

707714
// tiling
708-
ggml_tensor* input_tile = ggml_new_tensor_4d(tiles_ctx, GGML_TYPE_F32, input_tile_size, input_tile_size, input->ne[2], 1);
709-
ggml_tensor* output_tile = ggml_new_tensor_4d(tiles_ctx, GGML_TYPE_F32, output_tile_size, output_tile_size, output->ne[2], 1);
710-
int num_tiles = num_tiles_x * num_tiles_y;
715+
ggml_tensor* input_tile = ggml_new_tensor_4d(tiles_ctx, GGML_TYPE_F32, input_tile_size_x, input_tile_size_y, input->ne[2], 1);
716+
ggml_tensor* output_tile = ggml_new_tensor_4d(tiles_ctx, GGML_TYPE_F32, output_tile_size_x, output_tile_size_y, output->ne[2], 1);
717+
int num_tiles = num_tiles_x * num_tiles_y;
711718
LOG_INFO("processing %i tiles", num_tiles);
712719
pretty_progress(0, num_tiles, 0.0f);
713720
int tile_count = 1;
714721
bool last_y = false, last_x = false;
715722
float last_time = 0.0f;
716723
for (int y = 0; y < small_height && !last_y; y += non_tile_overlap_y) {
717724
int dy = 0;
718-
if (y + tile_size >= small_height) {
725+
if (y + tile_size_y >= small_height) {
719726
int _y = y;
720-
y = small_height - tile_size;
727+
y = small_height - tile_size_y;
721728
dy = _y - y;
722729
if (big_out) {
723730
dy *= scale;
@@ -726,9 +733,9 @@ __STATIC_INLINE__ void sd_tiling(ggml_tensor* input, ggml_tensor* output, const
726733
}
727734
for (int x = 0; x < small_width && !last_x; x += non_tile_overlap_x) {
728735
int dx = 0;
729-
if (x + tile_size >= small_width) {
736+
if (x + tile_size_x >= small_width) {
730737
int _x = x;
731-
x = small_width - tile_size;
738+
x = small_width - tile_size_x;
732739
dx = _x - x;
733740
if (big_out) {
734741
dx *= scale;

0 commit comments

Comments
 (0)