Skip to content

Commit 916c83b

Browse files
authored
musa: fix compilation warnings in mp_22/31 (#12780)
Signed-off-by: Xiaodong Ye <xiaodong.ye@mthreads.com>
1 parent 0c74b04 commit 916c83b

File tree

4 files changed

+35
-8
lines changed

4 files changed

+35
-8
lines changed

ggml/src/ggml-cuda/cpy.cu

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,9 @@ void ggml_cuda_cpy_dest_ptrs_copy(ggml_cuda_graph * cuda_graph, char ** host_des
360360
// copy destination pointers to GPU
361361
CUDA_CHECK(cudaMemcpyAsync(cuda_graph->dest_ptrs_d, host_dest_ptrs, host_dest_ptrs_size*sizeof(char *), cudaMemcpyHostToDevice, stream));
362362
cuda_graph->graph_cpynode_index = 0; // reset index
363+
#else
364+
GGML_UNUSED(cuda_graph); GGML_UNUSED(host_dest_ptrs);
365+
GGML_UNUSED(host_dest_ptrs_size); GGML_UNUSED(stream);
363366
#endif
364367
}
365368

ggml/src/ggml-cuda/fattn-common.cuh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ static __device__ __forceinline__ T vec_dot_fattn_vec_KQ_q4_0(
6262
T sum = 0.0f;
6363

6464
#pragma unroll
65-
for (int k_KQ_0 = 0; k_KQ_0 < D/sizeof(int); k_KQ_0 += warp_size) {
65+
for (int k_KQ_0 = 0; k_KQ_0 < int(D/sizeof(int)); k_KQ_0 += warp_size) {
6666
const int k_KQ = k_KQ_0 + threadIdx.x;
6767

6868
const int ib = k_KQ / QI8_1;
@@ -102,7 +102,7 @@ static __device__ __forceinline__ T vec_dot_fattn_vec_KQ_q4_1(
102102
T sum = 0.0f;
103103

104104
#pragma unroll
105-
for (int k_KQ_0 = 0; k_KQ_0 < D/sizeof(int); k_KQ_0 += warp_size) {
105+
for (int k_KQ_0 = 0; k_KQ_0 < int(D/sizeof(int)); k_KQ_0 += warp_size) {
106106
const int k_KQ = k_KQ_0 + threadIdx.x;
107107

108108
const int ib = k_KQ / QI8_1;
@@ -146,7 +146,7 @@ static __device__ __forceinline__ T vec_dot_fattn_vec_KQ_q5_0(
146146
T sum = 0.0f;
147147

148148
#pragma unroll
149-
for (int k_KQ_0 = 0; k_KQ_0 < D/sizeof(int); k_KQ_0 += warp_size) {
149+
for (int k_KQ_0 = 0; k_KQ_0 < int(D/sizeof(int)); k_KQ_0 += warp_size) {
150150
const int k_KQ = k_KQ_0 + threadIdx.x;
151151

152152
const int ib = k_KQ / QI8_1;
@@ -193,7 +193,7 @@ static __device__ __forceinline__ T vec_dot_fattn_vec_KQ_q5_1(
193193
T sum = 0.0f;
194194

195195
#pragma unroll
196-
for (int k_KQ_0 = 0; k_KQ_0 < D/sizeof(int); k_KQ_0 += warp_size) {
196+
for (int k_KQ_0 = 0; k_KQ_0 < int(D/sizeof(int)); k_KQ_0 += warp_size) {
197197
const int k_KQ = k_KQ_0 + threadIdx.x;
198198

199199
const int ib = k_KQ / QI8_1;
@@ -244,7 +244,7 @@ static __device__ __forceinline__ T vec_dot_fattn_vec_KQ_q8_0(
244244
T sum = 0.0f;
245245

246246
#pragma unroll
247-
for (int k_KQ_0 = 0; k_KQ_0 < D/sizeof(int); k_KQ_0 += warp_size) {
247+
for (int k_KQ_0 = 0; k_KQ_0 < int(D/sizeof(int)); k_KQ_0 += warp_size) {
248248
const int k_KQ = k_KQ_0 + threadIdx.x;
249249

250250
const int ib = k_KQ / QI8_0;

ggml/src/ggml-cuda/fattn-tile-f32.cu

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,18 @@ static __global__ void flash_attn_tile_ext_f32(
5252
return;
5353
#endif // FP16_MMA_AVAILABLE
5454
if (use_logit_softcap && !(D == 128 || D == 256)) {
55+
GGML_UNUSED(Q); GGML_UNUSED(K); GGML_UNUSED(V); GGML_UNUSED(mask);
56+
GGML_UNUSED(dst); GGML_UNUSED(dst_meta); GGML_UNUSED(scale);
57+
GGML_UNUSED(max_bias); GGML_UNUSED(m0); GGML_UNUSED(m1);
58+
GGML_UNUSED(n_head_log2); GGML_UNUSED(logit_softcap);
59+
GGML_UNUSED(ne00); GGML_UNUSED(ne01); GGML_UNUSED(ne02);
60+
GGML_UNUSED(ne03); GGML_UNUSED(ne10); GGML_UNUSED(ne11);
61+
GGML_UNUSED(ne12); GGML_UNUSED(ne13); GGML_UNUSED(ne31);
62+
GGML_UNUSED(nb31); GGML_UNUSED(nb01); GGML_UNUSED(nb02);
63+
GGML_UNUSED(nb03); GGML_UNUSED(nb11); GGML_UNUSED(nb12);
64+
GGML_UNUSED(nb13); GGML_UNUSED(nb21); GGML_UNUSED(nb22);
65+
GGML_UNUSED(nb23); GGML_UNUSED(ne0); GGML_UNUSED(ne1);
66+
GGML_UNUSED(ne2); GGML_UNUSED(ne3);
5567
NO_DEVICE_CODE;
5668
return;
5769
}

ggml/src/ggml-cuda/fattn-vec-f32.cuh

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,18 @@ static __global__ void flash_attn_vec_ext_f32(
4545

4646
// Skip unused kernel variants for faster compilation:
4747
if (use_logit_softcap && !(D == 128 || D == 256)) {
48+
GGML_UNUSED(Q); GGML_UNUSED(K); GGML_UNUSED(V); GGML_UNUSED(mask);
49+
GGML_UNUSED(dst); GGML_UNUSED(dst_meta); GGML_UNUSED(scale);
50+
GGML_UNUSED(max_bias); GGML_UNUSED(m0); GGML_UNUSED(m1);
51+
GGML_UNUSED(n_head_log2); GGML_UNUSED(logit_softcap);
52+
GGML_UNUSED(ne00); GGML_UNUSED(ne01); GGML_UNUSED(ne02);
53+
GGML_UNUSED(ne03); GGML_UNUSED(ne10); GGML_UNUSED(ne11);
54+
GGML_UNUSED(ne12); GGML_UNUSED(ne13); GGML_UNUSED(ne31);
55+
GGML_UNUSED(nb31); GGML_UNUSED(nb01); GGML_UNUSED(nb02);
56+
GGML_UNUSED(nb03); GGML_UNUSED(nb11); GGML_UNUSED(nb12);
57+
GGML_UNUSED(nb13); GGML_UNUSED(nb21); GGML_UNUSED(nb22);
58+
GGML_UNUSED(nb23); GGML_UNUSED(ne0); GGML_UNUSED(ne1);
59+
GGML_UNUSED(ne2); GGML_UNUSED(ne3);
4860
NO_DEVICE_CODE;
4961
return;
5062
}
@@ -114,7 +126,7 @@ static __global__ void flash_attn_vec_ext_f32(
114126
// Set memory to zero if out of bounds:
115127
if (ncols > 2 && ic0 + j >= ne01) {
116128
#pragma unroll
117-
for (int i0 = 0; i0 < D/sizeof(int); i0 += WARP_SIZE) {
129+
for (int i0 = 0; i0 < int(D/sizeof(int)); i0 += WARP_SIZE) {
118130
const int i = i0 + threadIdx.x;
119131

120132
tmp_q_i32[i] = 0;
@@ -127,7 +139,7 @@ static __global__ void flash_attn_vec_ext_f32(
127139

128140
const float * Q_f = (const float *) (Q + j*nb01);
129141
#pragma unroll
130-
for (int i0 = 0; i0 < D/sizeof(int); i0 += WARP_SIZE) {
142+
for (int i0 = 0; i0 < int(D/sizeof(int)); i0 += WARP_SIZE) {
131143
quantize_q8_1_to_shared<float2>(Q_f + 4*i0, scale, tmp_q_i32, tmp_q_ds);
132144
}
133145
}
@@ -140,7 +152,7 @@ static __global__ void flash_attn_vec_ext_f32(
140152
float2 * tmp_q_ds = (float2 *) (tmp_q_i32 + D/sizeof(int));
141153

142154
#pragma unroll
143-
for (int i0 = 0; i0 < D/sizeof(int); i0 += WARP_SIZE) {
155+
for (int i0 = 0; i0 < int(D/sizeof(int)); i0 += WARP_SIZE) {
144156
const int i = i0 + threadIdx.x;
145157

146158
Q_i32[j][i0/WARP_SIZE] = tmp_q_i32[i];

0 commit comments

Comments
 (0)