@@ -824,18 +824,25 @@ __STATIC_INLINE__ void sd_tiling(ggml_tensor* input, ggml_tensor* output, const
824824 int tile_overlap_y = (int32_t )(tile_size * tile_overlap_factor_y);
825825 int non_tile_overlap_y = tile_size - tile_overlap_y;
826826
827- int input_tile_size = tile_size;
828- int output_tile_size = tile_size;
827+ int tile_size_x = tile_size < small_width ? tile_size : small_width;
828+ int tile_size_y = tile_size < small_height ? tile_size : small_height;
829+
830+ int input_tile_size_x = tile_size_x;
831+ int input_tile_size_y = tile_size_y;
832+ int output_tile_size_x = tile_size_x;
833+ int output_tile_size_y = tile_size_y;
829834
830835 if (big_out) {
831- output_tile_size *= scale;
836+ output_tile_size_x *= scale;
837+ output_tile_size_y *= scale;
832838 } else {
833- input_tile_size *= scale;
839+ input_tile_size_x *= scale;
840+ input_tile_size_y *= scale;
834841 }
835842
836843 struct ggml_init_params params = {};
837- params.mem_size += input_tile_size * input_tile_size * input->ne [2 ] * sizeof (float ); // input chunk
838- params.mem_size += output_tile_size * output_tile_size * output->ne [2 ] * sizeof (float ); // output chunk
844+ params.mem_size += input_tile_size_x * input_tile_size_y * input->ne [2 ] * sizeof (float ); // input chunk
845+ params.mem_size += output_tile_size_x * output_tile_size_y * output->ne [2 ] * sizeof (float ); // output chunk
839846 params.mem_size += 3 * ggml_tensor_overhead ();
840847 params.mem_buffer = NULL ;
841848 params.no_alloc = false ;
@@ -850,19 +857,19 @@ __STATIC_INLINE__ void sd_tiling(ggml_tensor* input, ggml_tensor* output, const
850857 }
851858
852859 // tiling
853- ggml_tensor* input_tile = ggml_new_tensor_4d (tiles_ctx, GGML_TYPE_F32, input_tile_size, input_tile_size , input->ne [2 ], 1 );
854- ggml_tensor* output_tile = ggml_new_tensor_4d (tiles_ctx, GGML_TYPE_F32, output_tile_size, output_tile_size , output->ne [2 ], 1 );
855- int num_tiles = num_tiles_x * num_tiles_y;
860+ 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 );
861+ 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 );
862+ int num_tiles = num_tiles_x * num_tiles_y;
856863 LOG_INFO (" processing %i tiles" , num_tiles);
857864 pretty_progress (0 , num_tiles, 0 .0f );
858865 int tile_count = 1 ;
859866 bool last_y = false , last_x = false ;
860867 float last_time = 0 .0f ;
861868 for (int y = 0 ; y < small_height && !last_y; y += non_tile_overlap_y) {
862869 int dy = 0 ;
863- if (y + tile_size >= small_height) {
870+ if (y + tile_size_y >= small_height) {
864871 int _y = y;
865- y = small_height - tile_size ;
872+ y = small_height - tile_size_y ;
866873 dy = _y - y;
867874 if (big_out) {
868875 dy *= scale;
@@ -871,9 +878,9 @@ __STATIC_INLINE__ void sd_tiling(ggml_tensor* input, ggml_tensor* output, const
871878 }
872879 for (int x = 0 ; x < small_width && !last_x; x += non_tile_overlap_x) {
873880 int dx = 0 ;
874- if (x + tile_size >= small_width) {
881+ if (x + tile_size_x >= small_width) {
875882 int _x = x;
876- x = small_width - tile_size ;
883+ x = small_width - tile_size_x ;
877884 dx = _x - x;
878885 if (big_out) {
879886 dx *= scale;
0 commit comments