@@ -8863,13 +8863,13 @@ static void ggml_compute_forward_win_part_f32(
88638863 const int64_t i01 = px*w + i1;
88648864 const int64_t i00 = i0;
88658865
8866- void * sp = ((void *) src0->data ) + i03*nb03 + i02*nb02 + i01*nb01 + i00*nb00;
8867- void * dp = ((void *) dst->data ) + i3*nb3 + i2*nb2 + i1*nb1 + i0*nb0;
8866+ const char * sp = ((const char *) src0->data ) + i03*nb03 + i02*nb02 + i01*nb01 + i00*nb00;
8867+ char * dp = ((char *) dst->data ) + i3*nb3 + i2*nb2 + i1*nb1 + i0*nb0;
88688868
88698869 if (py*w + i2 >= ne02 || px*w + i1 >= ne01) {
88708870 *((float *) dp) = 0 ;
88718871 } else {
8872- *((float *) dp) = *((float *) sp);
8872+ *((float *) dp) = *((const float *) sp);
88738873 }
88748874 }
88758875 }
@@ -8907,13 +8907,13 @@ static void ggml_compute_forward_win_part_f16(
89078907 const int64_t i01 = px*w + i1;
89088908 const int64_t i00 = i0;
89098909
8910- void * sp = ((void *) src0->data ) + i03*nb03 + i02*nb02 + i01*nb01 + i00*nb00;
8911- void * dp = ((void *) dst->data ) + i3*nb3 + i2*nb2 + i1*nb1 + i0*nb0;
8910+ const char * sp = ((const char *) src0->data ) + i03*nb03 + i02*nb02 + i01*nb01 + i00*nb00;
8911+ char * dp = ((char *) dst->data ) + i3*nb3 + i2*nb2 + i1*nb1 + i0*nb0;
89128912
89138913 if (py*w + i2 >= ne02 || px*w + i1 >= ne01) {
89148914 *((ggml_fp16_t *) dp) = 0 ;
89158915 } else {
8916- *((ggml_fp16_t *) dp) = *((ggml_fp16_t *) sp);
8916+ *((ggml_fp16_t *) dp) = *((const ggml_fp16_t *) sp);
89178917 }
89188918 }
89198919 }
@@ -8981,10 +8981,10 @@ static void ggml_compute_forward_win_unpart_f32(
89818981 const int64_t i01 = i1%w;
89828982 const int64_t i00 = i0;
89838983
8984- void * sp = ((void *) src0->data ) + i03*nb03 + i02*nb02 + i01*nb01 + i00*nb00;
8985- void * dp = ((void *) dst->data ) + i3*nb3 + i2*nb2 + i1*nb1 + i0*nb0;
8984+ const char * sp = ((const char *) src0->data ) + i03*nb03 + i02*nb02 + i01*nb01 + i00*nb00;
8985+ char * dp = ((char *) dst->data ) + i3*nb3 + i2*nb2 + i1*nb1 + i0*nb0;
89868986
8987- *((float *) dp) = *((float *) sp);
8987+ *((float *) dp) = *((const float *) sp);
89888988 }
89898989 }
89908990 }
@@ -9025,10 +9025,10 @@ static void ggml_compute_forward_win_unpart_f16(
90259025 const int64_t i01 = i1%w;
90269026 const int64_t i00 = i0;
90279027
9028- void * sp = ((void *) src0->data ) + i03*nb03 + i02*nb02 + i01*nb01 + i00*nb00;
9029- void * dp = ((void *) dst->data ) + i3*nb3 + i2*nb2 + i1*nb1 + i0*nb0;
9028+ const char * sp = ((const char *) src0->data ) + i03*nb03 + i02*nb02 + i01*nb01 + i00*nb00;
9029+ char * dp = ((char *) dst->data ) + i3*nb3 + i2*nb2 + i1*nb1 + i0*nb0;
90309030
9031- *((ggml_fp16_t *) dp) = *((ggml_fp16_t *) sp);
9031+ *((ggml_fp16_t *) dp) = *((const ggml_fp16_t *) sp);
90329032 }
90339033 }
90349034 }
@@ -9216,14 +9216,14 @@ static void ggml_compute_forward_get_rel_pos_f32(
92169216
92179217 GGML_TENSOR_UNARY_OP_LOCALS
92189218
9219- const int64_t w = ne1;
9219+ const int64_t kh = ne1;
92209220
92219221 float * src0_data = (float *) src0->data ;
92229222 float * dst_data = (float *) dst->data ;
92239223
92249224 for (int64_t i2 = 0 ; i2 < ne2; ++i2) {
92259225 for (int64_t i1 = 0 ; i1 < ne1; ++i1) {
9226- const int64_t pos = (w - i1 - 1 ) + i2;
9226+ const int64_t pos = (kh - i1 - 1 ) + i2;
92279227 for (int64_t i0 = 0 ; i0 < ne0; ++i0) {
92289228 dst_data[i2*ne1*ne0 + i1*ne0 + i0] = src0_data[pos*ne00 + i0];
92299229 }
@@ -9242,14 +9242,14 @@ static void ggml_compute_forward_get_rel_pos_f16(
92429242
92439243 GGML_TENSOR_UNARY_OP_LOCALS
92449244
9245- const int64_t w = ne1;
9245+ const int64_t kh = ne1;
92469246
92479247 ggml_fp16_t * src0_data = (ggml_fp16_t *) src0->data ;
92489248 ggml_fp16_t * dst_data = (ggml_fp16_t *) dst->data ;
92499249
92509250 for (int64_t i2 = 0 ; i2 < ne2; ++i2) {
92519251 for (int64_t i1 = 0 ; i1 < ne1; ++i1) {
9252- const int64_t pos = (w - i1 - 1 ) + i2;
9252+ const int64_t pos = (kh - i1 - 1 ) + i2;
92539253 for (int64_t i0 = 0 ; i0 < ne0; ++i0) {
92549254 dst_data[i2*ne1*ne0 + i1*ne0 + i0] = src0_data[pos*ne00 + i0];
92559255 }
0 commit comments