Skip to content

Commit 6a1dffa

Browse files
committed
Fix shadow warnings
1 parent 2ee4281 commit 6a1dffa

File tree

1 file changed

+21
-16
lines changed

1 file changed

+21
-16
lines changed

ggml-quants.c

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3854,7 +3854,7 @@ static inline __m128i get_scale_shuffle(int i) {
38543854
}
38553855
#endif
38563856

3857-
void ggml_vec_dot_q4_0_q8_0(int n, float * restrict s, size_t bs, const void * restrict vx, size_t bx, const void * restrict vy, size_t by, int nrc) {
3857+
void ggml_vec_dot_q4_0_q8_0(int n, float * restrict s, size_t bs, const void * restrict vx, size_t bbx, const void * restrict vy, size_t bby, int nrc) {
38583858
const int qk = QK8_0;
38593859
const int nb = n / qk;
38603860

@@ -3865,8 +3865,8 @@ void ggml_vec_dot_q4_0_q8_0(int n, float * restrict s, size_t bs, const void * r
38653865
assert(nrc == 1);
38663866
#endif
38673867
UNUSED(nrc);
3868-
UNUSED(bx);
3869-
UNUSED(by);
3868+
UNUSED(bbx);
3869+
UNUSED(bby);
38703870
UNUSED(bs);
38713871

38723872
const block_q4_0 * restrict x = vx;
@@ -4221,7 +4221,7 @@ void ggml_vec_dot_q4_0_q8_0(int n, float * restrict s, size_t bs, const void * r
42214221
#endif
42224222
}
42234223

4224-
void ggml_vec_dot_q4_1_q8_1(int n, float * restrict s, size_t bs, const void * restrict vx, size_t bx, const void * restrict vy, size_t by, int nrc) {
4224+
void ggml_vec_dot_q4_1_q8_1(int n, float * restrict s, size_t bs, const void * restrict vx, size_t bbx, const void * restrict vy, size_t bby, int nrc) {
42254225
const int qk = QK8_1;
42264226
const int nb = n / qk;
42274227

@@ -4232,8 +4232,8 @@ void ggml_vec_dot_q4_1_q8_1(int n, float * restrict s, size_t bs, const void * r
42324232
assert(nrc == 1);
42334233
#endif
42344234
UNUSED(nrc);
4235-
UNUSED(bx);
4236-
UNUSED(by);
4235+
UNUSED(bbx);
4236+
UNUSED(bby);
42374237
UNUSED(bs);
42384238

42394239
const block_q4_1 * restrict x = vx;
@@ -4439,16 +4439,16 @@ void ggml_vec_dot_q4_1_q8_1(int n, float * restrict s, size_t bs, const void * r
44394439
#endif
44404440
}
44414441

4442-
void ggml_vec_dot_q5_0_q8_0(int n, float * restrict s, size_t bs, const void * restrict vx, size_t bx, const void * restrict vy, size_t by, int nrc) {
4442+
void ggml_vec_dot_q5_0_q8_0(int n, float * restrict s, size_t bs, const void * restrict vx, size_t bbx, const void * restrict vy, size_t bby, int nrc) {
44434443
const int qk = QK8_0;
44444444
const int nb = n / qk;
44454445

44464446
assert(n % qk == 0);
44474447
assert(qk == QK5_0);
44484448
assert(nrc == 1);
44494449
UNUSED(nrc);
4450-
UNUSED(bx);
4451-
UNUSED(by);
4450+
UNUSED(bbx);
4451+
UNUSED(bby);
44524452
UNUSED(bs);
44534453

44544454
const block_q5_0 * restrict x = vx;
@@ -4730,16 +4730,16 @@ void ggml_vec_dot_q5_0_q8_0(int n, float * restrict s, size_t bs, const void * r
47304730
#endif
47314731
}
47324732

4733-
void ggml_vec_dot_q5_1_q8_1(int n, float * restrict s, size_t bs, const void * restrict vx, size_t bx, const void * restrict vy, size_t by, int nrc) {
4733+
void ggml_vec_dot_q5_1_q8_1(int n, float * restrict s, size_t bs, const void * restrict vx, size_t bbx, const void * restrict vy, size_t bby, int nrc) {
47344734
const int qk = QK8_1;
47354735
const int nb = n / qk;
47364736

47374737
assert(n % qk == 0);
47384738
assert(qk == QK5_1);
47394739
assert(nrc == 1);
47404740
UNUSED(nrc);
4741-
UNUSED(bx);
4742-
UNUSED(by);
4741+
UNUSED(bbx);
4742+
UNUSED(bby);
47434743
UNUSED(bs);
47444744

47454745
const block_q5_1 * restrict x = vx;
@@ -5034,7 +5034,7 @@ void ggml_vec_dot_q5_1_q8_1(int n, float * restrict s, size_t bs, const void * r
50345034
#endif
50355035
}
50365036

5037-
void ggml_vec_dot_q8_0_q8_0(int n, float * restrict s, size_t bs, const void * restrict vx, size_t bx, const void * restrict vy, size_t by, int nrc) {
5037+
void ggml_vec_dot_q8_0_q8_0(int n, float * restrict s, size_t bs, const void * restrict vx, size_t bbx, const void * restrict vy, size_t bby, int nrc) {
50385038
const int qk = QK8_0;
50395039
const int nb = n / qk;
50405040

@@ -5045,8 +5045,8 @@ void ggml_vec_dot_q8_0_q8_0(int n, float * restrict s, size_t bs, const void * r
50455045
assert(nrc == 1);
50465046
#endif
50475047
UNUSED(nrc);
5048-
UNUSED(bx);
5049-
UNUSED(by);
5048+
UNUSED(bbx);
5049+
UNUSED(bby);
50505050
UNUSED(bs);
50515051

50525052
const block_q8_0 * restrict x = vx;
@@ -9290,8 +9290,13 @@ static inline __m256i mul_add_epi8(const __m256i x, const __m256i y) {
92909290
}
92919291
#endif
92929292

9293-
void ggml_vec_dot_iq1_s_q8_K(const int n, float * restrict s, const void * restrict vx, const void * restrict vy) {
9293+
void ggml_vec_dot_iq1_s_q8_K (int n, float * GGML_RESTRICT s, size_t bs, const void * GGML_RESTRICT vx, size_t bx, const void * GGML_RESTRICT vy, size_t by, int nrc) {
92949294
assert(n % QK_K == 0);
9295+
assert(nrc == 1);
9296+
UNUSED(nrc);
9297+
UNUSED(bx);
9298+
UNUSED(by);
9299+
UNUSED(bs);
92959300

92969301
const block_iq1_s * restrict x = vx;
92979302
const block_q8_K * restrict y = vy;

0 commit comments

Comments
 (0)