Skip to content

Commit 52d9ccc

Browse files
try CI fix
1 parent e70fa55 commit 52d9ccc

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

ggml/src/ggml-cuda/mmf.cu

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ static __global__ void mul_mat_f(
1414
const int ncols, const int nchannels_y, const int stride_row, const int stride_col_y, const int stride_col_dst,
1515
const int channel_ratio, const int stride_channel_x, const int stride_channel_y, const int stride_channel_dst,
1616
const int sample_ratio, const int stride_sample_x, const int stride_sample_y, const int stride_sample_dst) {
17+
#if !defined(GGML_USE_HIP) && !defined(GGML_USE_MUSA)
1718
typedef tile<16, 8, T> tile_A;
1819
typedef tile< 8, 8, T> tile_B;
1920
typedef tile<16, 8, float> tile_C;
@@ -130,6 +131,13 @@ static __global__ void mul_mat_f(
130131
}
131132
dst[j*stride_col_dst + row0 + threadIdx.x] = sum;
132133
}
134+
#else
135+
NO_DEVICE_CODE;
136+
GGML_UNUSED(x); GGML_UNUSED(y); GGML_UNUSED(ids); GGML_UNUSED(dst);
137+
GGML_UNUSED(ncols); GGML_UNUSED(nchannels_y); GGML_UNUSED(stride_row); GGML_UNUSED(stride_col_y); GGML_UNUSED(stride_col_dst);
138+
GGML_UNUSED(channel_ratio); GGML_UNUSED(stride_channel_x); GGML_UNUSED(stride_channel_y); GGML_UNUSED(stride_channel_dst);
139+
GGML_UNUSED(sample_ratio); GGML_UNUSED(stride_sample_x); GGML_UNUSED(stride_sample_y); GGML_UNUSED(stride_sample_dst);
140+
#endif // !defined(GGML_USE_HIP) && !defined(GGML_USE_MUSA)
133141
}
134142

135143
template <typename T, int cols_per_block>

ggml/src/ggml-cuda/vendors/hip.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@
200200
#endif
201201

202202
typedef hip_bfloat16 nv_bfloat16;
203+
typedef short2 nv_bfloat162; // FIXME there is no 2x BF16 type being defined in bfloat16.h, ad-hoc compilation fix
203204

204205
typedef int8_t int8x4_t __attribute__((ext_vector_type(4)));
205206
typedef uint8_t uint8x4_t __attribute__((ext_vector_type(4)));

ggml/src/ggml-cuda/vendors/musa.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,4 +137,5 @@
137137
#define cudaStreamEndCapture musaStreamEndCapture
138138
#define cudaOccupancyMaxActiveBlocksPerMultiprocessor musaOccupancyMaxActiveBlocksPerMultiprocessor
139139

140-
typedef mt_bfloat16 nv_bfloat16;
140+
typedef __mt_bfloat16 nv_bfloat16;
141+
typedef __mt_bfloat162 nv_bfloat162;

0 commit comments

Comments
 (0)