Skip to content

Commit 29d77dc

Browse files
committed
add assert about size
1 parent 966aa76 commit 29d77dc

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

ggml/src/ggml-cpu/ops.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6645,7 +6645,7 @@ static void ggml_compute_forward_conv_2d_impl(const ggml_compute_params * params
66456645

66466646
const int64_t patch_per_thread = (patch_n + params->nth - 1) / params->nth;
66476647
const int64_t patch_start = patch_start_batch + params->ith * patch_per_thread;
6648-
const int64_t patch_end = std::min(patch_start + patch_per_thread,patch_end_batch);
6648+
const int64_t patch_end = std::min(patch_start + patch_per_thread, patch_end_batch);
66496649

66506650
//im2col for a patch
66516651
for (int64_t p = patch_start; p < patch_end; ++p) {
@@ -6687,6 +6687,8 @@ static void ggml_compute_forward_conv_2d_impl(const ggml_compute_params * params
66876687

66886688
float * gemm_output = (float *) ((char *) tmp + patches_per_batch * knl_n * traits->type_size);
66896689

6690+
GGML_ASSERT(gemm_output + patch_n * c_out <= (float*)tmp + params->wsize);
6691+
66906692
// GEMM: patches[patch_n, knl_n] × kernel[knl_n, c_out] = output[patch_n, c_out]
66916693
ggml_call_mul_mat(kernel_type, params, patch_n, c_out, knl_n, tmp, knl_data, gemm_output);
66926694

0 commit comments

Comments
 (0)