@@ -8969,13 +8969,13 @@ static void ggml_compute_forward_win_part_f32(
89698969 const int64_t i01 = px*w + i1;
89708970 const int64_t i00 = i0;
89718971
8972- void * sp = ((void *) src0->data ) + i03*nb03 + i02*nb02 + i01*nb01 + i00*nb00;
8973- void * dp = ((void *) dst->data ) + i3*nb3 + i2*nb2 + i1*nb1 + i0*nb0;
8972+ const char * sp = ((const char *) src0->data ) + i03*nb03 + i02*nb02 + i01*nb01 + i00*nb00;
8973+ char * dp = ((char *) dst->data ) + i3*nb3 + i2*nb2 + i1*nb1 + i0*nb0;
89748974
89758975 if (py*w + i2 >= ne02 || px*w + i1 >= ne01) {
89768976 *((float *) dp) = 0 ;
89778977 } else {
8978- *((float *) dp) = *((float *) sp);
8978+ *((float *) dp) = *((const float *) sp);
89798979 }
89808980 }
89818981 }
@@ -9013,13 +9013,13 @@ static void ggml_compute_forward_win_part_f16(
90139013 const int64_t i01 = px*w + i1;
90149014 const int64_t i00 = i0;
90159015
9016- void * sp = ((void *) src0->data ) + i03*nb03 + i02*nb02 + i01*nb01 + i00*nb00;
9017- void * dp = ((void *) dst->data ) + i3*nb3 + i2*nb2 + i1*nb1 + i0*nb0;
9016+ const char * sp = ((const char *) src0->data ) + i03*nb03 + i02*nb02 + i01*nb01 + i00*nb00;
9017+ char * dp = ((char *) dst->data ) + i3*nb3 + i2*nb2 + i1*nb1 + i0*nb0;
90189018
90199019 if (py*w + i2 >= ne02 || px*w + i1 >= ne01) {
90209020 *((ggml_fp16_t *) dp) = 0 ;
90219021 } else {
9022- *((ggml_fp16_t *) dp) = *((ggml_fp16_t *) sp);
9022+ *((ggml_fp16_t *) dp) = *((const ggml_fp16_t *) sp);
90239023 }
90249024 }
90259025 }
@@ -9087,10 +9087,10 @@ static void ggml_compute_forward_win_unpart_f32(
90879087 const int64_t i01 = i1%w;
90889088 const int64_t i00 = i0;
90899089
9090- void * sp = ((void *) src0->data ) + i03*nb03 + i02*nb02 + i01*nb01 + i00*nb00;
9091- void * dp = ((void *) dst->data ) + i3*nb3 + i2*nb2 + i1*nb1 + i0*nb0;
9090+ const char * sp = ((const char *) src0->data ) + i03*nb03 + i02*nb02 + i01*nb01 + i00*nb00;
9091+ char * dp = ((char *) dst->data ) + i3*nb3 + i2*nb2 + i1*nb1 + i0*nb0;
90929092
9093- *((float *) dp) = *((float *) sp);
9093+ *((float *) dp) = *((const float *) sp);
90949094 }
90959095 }
90969096 }
@@ -9131,10 +9131,10 @@ static void ggml_compute_forward_win_unpart_f16(
91319131 const int64_t i01 = i1%w;
91329132 const int64_t i00 = i0;
91339133
9134- void * sp = ((void *) src0->data ) + i03*nb03 + i02*nb02 + i01*nb01 + i00*nb00;
9135- void * dp = ((void *) dst->data ) + i3*nb3 + i2*nb2 + i1*nb1 + i0*nb0;
9134+ const char * sp = ((const char *) src0->data ) + i03*nb03 + i02*nb02 + i01*nb01 + i00*nb00;
9135+ char * dp = ((char *) dst->data ) + i3*nb3 + i2*nb2 + i1*nb1 + i0*nb0;
91369136
9137- *((ggml_fp16_t *) dp) = *((ggml_fp16_t *) sp);
9137+ *((ggml_fp16_t *) dp) = *((const ggml_fp16_t *) sp);
91389138 }
91399139 }
91409140 }
@@ -9314,14 +9314,14 @@ static void ggml_compute_forward_get_rel_pos_f32(
93149314
93159315 GGML_TENSOR_UNARY_OP_LOCALS
93169316
9317- const int64_t w = ne1;
9317+ const int64_t kh = ne1;
93189318
93199319 float * src0_data = (float *) src0->data ;
93209320 float * dst_data = (float *) dst->data ;
93219321
93229322 for (int64_t i2 = 0 ; i2 < ne2; ++i2) {
93239323 for (int64_t i1 = 0 ; i1 < ne1; ++i1) {
9324- const int64_t pos = (w - i1 - 1 ) + i2;
9324+ const int64_t pos = (kh - i1 - 1 ) + i2;
93259325 for (int64_t i0 = 0 ; i0 < ne0; ++i0) {
93269326 dst_data[i2*ne1*ne0 + i1*ne0 + i0] = src0_data[pos*ne00 + i0];
93279327 }
@@ -9340,14 +9340,14 @@ static void ggml_compute_forward_get_rel_pos_f16(
93409340
93419341 GGML_TENSOR_UNARY_OP_LOCALS
93429342
9343- const int64_t w = ne1;
9343+ const int64_t kh = ne1;
93449344
93459345 ggml_fp16_t * src0_data = (ggml_fp16_t *) src0->data ;
93469346 ggml_fp16_t * dst_data = (ggml_fp16_t *) dst->data ;
93479347
93489348 for (int64_t i2 = 0 ; i2 < ne2; ++i2) {
93499349 for (int64_t i1 = 0 ; i1 < ne1; ++i1) {
9350- const int64_t pos = (w - i1 - 1 ) + i2;
9350+ const int64_t pos = (kh - i1 - 1 ) + i2;
93519351 for (int64_t i0 = 0 ; i0 < ne0; ++i0) {
93529352 dst_data[i2*ne1*ne0 + i1*ne0 + i0] = src0_data[pos*ne00 + i0];
93539353 }
0 commit comments