@@ -3205,8 +3205,8 @@ static void ggml_vk_buffer_write_nc_async(ggml_backend_vk_context * ctx, vk_cont
3205
3205
GGML_ABORT (" fatal error" );
3206
3206
}
3207
3207
// Check if src is pinned memory
3208
- vk_buffer buf;
3209
- size_t buf_offset;
3208
+ vk_buffer buf = nullptr ;
3209
+ size_t buf_offset = 0 ;
3210
3210
ggml_vk_host_get (ctx->device , tensor->data , buf, buf_offset);
3211
3211
3212
3212
const uint64_t ne0 = tensor->ne [0 ];
@@ -3269,7 +3269,7 @@ static void ggml_vk_buffer_write_nc_async(ggml_backend_vk_context * ctx, vk_cont
3269
3269
VkBufferCopy buf_copy{ 0 , offset, copy_size };
3270
3270
3271
3271
ggml_vk_sync_buffers (subctx);
3272
- vkCmdCopyBuffer (subctx->s ->buffer , staging->buffer , dst->buffer , 1 , &buf_copy);
3272
+ vkCmdCopyBuffer (subctx->s ->buffer , (VkBuffer) staging->buffer , (VkBuffer) dst->buffer , 1 , &buf_copy);
3273
3273
3274
3274
for (uint64_t i3 = 0 ; i3 < ne3; i3++) {
3275
3275
for (uint64_t i2 = 0 ; i2 < ne2; i2++) {
@@ -3302,7 +3302,7 @@ static void ggml_vk_buffer_write_2d_async(vk_context subctx, vk_buffer& dst, siz
3302
3302
}
3303
3303
// Check if src is pinned memory
3304
3304
vk_buffer buf = nullptr ;
3305
- size_t buf_offset;
3305
+ size_t buf_offset = 0 ;
3306
3306
ggml_vk_host_get (dst->device , src, buf, buf_offset);
3307
3307
3308
3308
if (buf != nullptr ) {
@@ -3344,7 +3344,7 @@ static void ggml_vk_buffer_write_2d_async(vk_context subctx, vk_buffer& dst, siz
3344
3344
copy_size};
3345
3345
3346
3346
ggml_vk_sync_buffers (subctx);
3347
- vkCmdCopyBuffer (subctx->s ->buffer , staging_buffer->buffer , dst->buffer , 1 , &buf_copy);
3347
+ vkCmdCopyBuffer (subctx->s ->buffer , (VkBuffer) staging_buffer->buffer , (VkBuffer) dst->buffer , 1 , &buf_copy);
3348
3348
3349
3349
if (width == spitch) {
3350
3350
deferred_memcpy ((uint8_t *)staging_buffer->ptr , src, width * height, &subctx->in_memcpys );
@@ -3400,7 +3400,7 @@ static void ggml_vk_buffer_read_2d_async(vk_context subctx, vk_buffer& src, size
3400
3400
3401
3401
// Check if dst is pinned memory
3402
3402
vk_buffer buf = nullptr ;
3403
- size_t buf_offset;
3403
+ size_t buf_offset = 0 ;
3404
3404
ggml_vk_host_get (src->device , dst, buf, buf_offset);
3405
3405
3406
3406
std::vector<vk::BufferCopy> slices (1 );
@@ -3480,7 +3480,7 @@ static void ggml_vk_buffer_copy_async(vk_context& ctx, vk_buffer& dst, size_t ds
3480
3480
3481
3481
VkBufferCopy bc{ src_offset, dst_offset, size };
3482
3482
3483
- vkCmdCopyBuffer (ctx->s ->buffer , src->buffer , dst->buffer , 1 , &bc);
3483
+ vkCmdCopyBuffer (ctx->s ->buffer , (VkBuffer) src->buffer , (VkBuffer) dst->buffer , 1 , &bc);
3484
3484
}
3485
3485
3486
3486
static void ggml_vk_buffer_copy (vk_buffer& dst, size_t dst_offset, vk_buffer& src, size_t src_offset, size_t size) {
@@ -3732,9 +3732,9 @@ static void ggml_vk_mul_mat_q_f16(ggml_backend_vk_context * ctx, vk_context& sub
3732
3732
ggml_backend_vk_buffer_context * src0_buf_ctx = (ggml_backend_vk_buffer_context *)src0->buffer ->context ;
3733
3733
ggml_backend_vk_buffer_context * src1_buf_ctx = (ggml_backend_vk_buffer_context *)src1->buffer ->context ;
3734
3734
3735
- vk_buffer d_Qx;
3735
+ vk_buffer d_Qx = nullptr ;
3736
3736
size_t qx_buf_offset = 0 ;
3737
- vk_buffer d_Qy;
3737
+ vk_buffer d_Qy = nullptr ;
3738
3738
size_t qy_buf_offset = 0 ;
3739
3739
3740
3740
bool src0_uma = false ;
@@ -3934,9 +3934,9 @@ static void ggml_vk_mul_mat_vec_q_f16(ggml_backend_vk_context * ctx, vk_context&
3934
3934
ggml_backend_vk_buffer_context * src0_buf_ctx = (ggml_backend_vk_buffer_context *)src0->buffer ->context ;
3935
3935
ggml_backend_vk_buffer_context * src1_buf_ctx = (ggml_backend_vk_buffer_context *)src1->buffer ->context ;
3936
3936
3937
- vk_buffer d_Qx;
3937
+ vk_buffer d_Qx = nullptr ;
3938
3938
size_t qx_buf_offset = 0 ;
3939
- vk_buffer d_Qy;
3939
+ vk_buffer d_Qy = nullptr ;
3940
3940
size_t qy_buf_offset = 0 ;
3941
3941
3942
3942
bool src0_uma = false ;
@@ -4112,7 +4112,7 @@ static void ggml_vk_mul_mat_vec_p021_f16_f32(ggml_backend_vk_context * ctx, vk_c
4112
4112
ggml_backend_vk_buffer_context * src0_buf_ctx = (ggml_backend_vk_buffer_context *)src0->buffer ->context ;
4113
4113
ggml_backend_vk_buffer_context * src1_buf_ctx = (ggml_backend_vk_buffer_context *)src1->buffer ->context ;
4114
4114
4115
- vk_buffer d_Qy;
4115
+ vk_buffer d_Qy = nullptr ;
4116
4116
size_t qy_buf_offset = 0 ;
4117
4117
4118
4118
bool src1_uma = false ;
@@ -4300,11 +4300,11 @@ static void ggml_vk_mul_mat_id_q_f16(ggml_backend_vk_context * ctx, vk_context&
4300
4300
ggml_backend_vk_buffer_context * src1_buf_ctx = (ggml_backend_vk_buffer_context *)src1->buffer ->context ;
4301
4301
ggml_backend_vk_buffer_context * ids_buf_ctx = (ggml_backend_vk_buffer_context *)ids->buffer ->context ;
4302
4302
4303
- vk_buffer d_Qx;
4303
+ vk_buffer d_Qx = nullptr ;
4304
4304
size_t qx_buf_offset = 0 ;
4305
- vk_buffer d_Qy;
4305
+ vk_buffer d_Qy = nullptr ;
4306
4306
size_t qy_buf_offset = 0 ;
4307
- vk_buffer d_ids;
4307
+ vk_buffer d_ids = nullptr ;
4308
4308
size_t ids_buf_offset = 0 ;
4309
4309
4310
4310
bool src0_uma = false ;
@@ -4505,11 +4505,11 @@ static void ggml_vk_mul_mat_vec_id_q_f16(ggml_backend_vk_context * ctx, vk_conte
4505
4505
ggml_backend_vk_buffer_context * src1_buf_ctx = (ggml_backend_vk_buffer_context *)src1->buffer ->context ;
4506
4506
ggml_backend_vk_buffer_context * ids_buf_ctx = (ggml_backend_vk_buffer_context *)ids->buffer ->context ;
4507
4507
4508
- vk_buffer d_Qx;
4508
+ vk_buffer d_Qx = nullptr ;
4509
4509
size_t qx_buf_offset = 0 ;
4510
- vk_buffer d_Qy;
4510
+ vk_buffer d_Qy = nullptr ;
4511
4511
size_t qy_buf_offset = 0 ;
4512
- vk_buffer d_ids;
4512
+ vk_buffer d_ids = nullptr ;
4513
4513
size_t ids_buf_offset = 0 ;
4514
4514
4515
4515
bool src0_uma = false ;
@@ -4768,8 +4768,8 @@ static void ggml_vk_flash_attn(ggml_backend_vk_context * ctx, vk_context& subctx
4768
4768
4769
4769
ggml_vk_sync_buffers (subctx);
4770
4770
4771
- vk_buffer d_Q, d_K, d_V, d_D, d_M;
4772
- uint64_t q_buf_offset, k_buf_offset, v_buf_offset, d_buf_offset, m_buf_offset;
4771
+ vk_buffer d_Q = nullptr , d_K = nullptr , d_V = nullptr , d_D = nullptr , d_M = nullptr ;
4772
+ size_t q_buf_offset = 0 , k_buf_offset = 0 , v_buf_offset = 0 , d_buf_offset = 0 , m_buf_offset = 0 ;
4773
4773
4774
4774
bool Q_uma = false , K_uma = false , V_uma = false , D_uma = false , M_uma = false ;
4775
4775
@@ -5474,8 +5474,8 @@ static void ggml_vk_op_f32_rwkv6(ggml_backend_vk_context * ctx, vk_context& subc
5474
5474
5475
5475
ggml_vk_sync_buffers (subctx);
5476
5476
5477
- vk_buffer d_D, d_K, d_V, d_R, d_TF, d_TD, d_State;
5478
- uint64_t k_offset, v_offset, r_offset, tf_offset, td_offset, state_offset, dst_offset;
5477
+ vk_buffer d_D = nullptr , d_K = nullptr , d_V = nullptr , d_R = nullptr , d_TF = nullptr , d_TD = nullptr , d_State = nullptr ;
5478
+ size_t k_offset = 0 , v_offset = 0 , r_offset = 0 , tf_offset = 0 , td_offset = 0 , state_offset = 0 , dst_offset = 0 ;
5479
5479
bool K_uma = false , V_uma = false , R_uma = false , TF_uma = false , TD_uma = false , STATE_uma = false , DST_uma = false ;
5480
5480
5481
5481
if (ctx->device ->uma ) {
0 commit comments