Skip to content

Commit 5af118e

Browse files
CUDA: fix --split-mode row race condition (ggml-org#9413)
1 parent d2b496b commit 5af118e

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

ggml/src/ggml-cuda/mmq.cu

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@ void ggml_cuda_op_mul_mat_q(
2626
// nrows_dst == nrows of the matrix that the kernel writes into
2727
const int64_t nrows_dst = id == ctx.device ? ne0 : row_diff;
2828

29-
const mmq_args args = {src0_dd_i, src1_ddq_i, dst_dd_i, ne00, row_diff, stride00, src1_padded_row_size, src1_ncols, ne11, nrows_dst};
29+
// The stream-k decomposition is only faster for recent NVIDIA GPUs.
30+
// Also its fixup needs to allocate a temporary buffer in the memory pool.
31+
// There are multiple parallel CUDA streams for src1_ncols != ne11 which would introduce a race condition for this buffer.
32+
const bool use_stream_k = compute_capability >= CC_VOLTA && compute_capability < CC_OFFSET_AMD && src1_ncols == ne11;
33+
const mmq_args args = {src0_dd_i, src1_ddq_i, dst_dd_i, ne00, row_diff, stride00, src1_padded_row_size, src1_ncols, ne11, nrows_dst, use_stream_k};
3034

3135
switch (src0->type) {
3236
case GGML_TYPE_Q4_0:

ggml/src/ggml-cuda/mmq.cuh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2742,6 +2742,7 @@ struct mmq_args {
27422742
int64_t ne00; int64_t ne01; int64_t stride01;
27432743
int64_t ne10; int64_t ne11; int64_t stride11;
27442744
int64_t ne0;
2745+
bool use_stream_k;
27452746
};
27462747

27472748
template<ggml_type type>
@@ -2777,8 +2778,7 @@ static void launch_mul_mat_q(ggml_backend_cuda_context & ctx, const mmq_args & a
27772778
const int ntx = (args.ne11 + mmq_x - 1) / mmq_x;
27782779
const dim3 block_nums_xy_tiling(nty, ntx, 1);
27792780

2780-
const bool use_stream_k = cc >= CC_VOLTA && cc < CC_OFFSET_AMD;
2781-
if (!use_stream_k) {
2781+
if (!args.use_stream_k) {
27822782
if (args.ne01 % mmq_y == 0) {
27832783
constexpr bool need_check = false;
27842784
mul_mat_q<type, mmq_x, MMQ_NWARPS, need_check><<<block_nums_xy_tiling, block_dims, shmem, stream>>>

0 commit comments

Comments
 (0)