extern/whisper.cpp
1
0
Fork 1
mirror of https://github.com/ggerganov/whisper.cpp.git synced 2025-04-27 20:59:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

ggml : vulkan logs (#2547)

Browse Source
This commit is contained in:
thewh1teagle 2024-11-13 21:47:15 +02:00 committed by GitHub
parent 300c07b94d
commit 5ccca19f0c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ggml/src/ggml-vulkan.cpp
View File

@ -2049,7 +2049,8 @@ static void ggml_vk_print_gpu_info(size_t idx) {
fp16 = fp16 && vk12_features.shaderFloat16; fp16 = fp16 && vk12_features.shaderFloat16;
std::string device_name = props2.properties.deviceName.data(); std::string device_name = props2.properties.deviceName.data();
std::cerr << GGML_VK_NAME << idx << ": " << device_name << " (" << driver_props.driverName << ") | uma: " << uma << " | fp16: " << fp16 << " | warp size: " << subgroup_size << std::endl; GGML_LOG_DEBUG("ggml_vulkan: %d = %s (%s) | uma: %d | fp16: %d | warp size: %d\n",
idx, device_name.c_str(), driver_props.driverName, uma, fp16, subgroup_size);
if (props2.properties.deviceType == vk::PhysicalDeviceType::eCpu) { if (props2.properties.deviceType == vk::PhysicalDeviceType::eCpu) {
std::cerr << "ggml_vulkan: Warning: Device type is CPU. This is probably not the device you want." << std::endl; std::cerr << "ggml_vulkan: Warning: Device type is CPU. This is probably not the device you want." << std::endl;
@ -2107,8 +2108,7 @@ void ggml_vk_instance_init() {
}; };
validation_features.setPNext(nullptr); validation_features.setPNext(nullptr);
instance_create_info.setPNext(&validation_features); instance_create_info.setPNext(&validation_features);
GGML_LOG_DEBUG("ggml_vulkan: Validation layers enabled\n");
std::cerr << "ggml_vulkan: Validation layers enabled" << std::endl;
} }
vk_instance.instance = vk::createInstance(instance_create_info); vk_instance.instance = vk::createInstance(instance_create_info);
@ -2222,8 +2222,8 @@ void ggml_vk_instance_init() {
vk_instance.device_indices.push_back(0); vk_instance.device_indices.push_back(0);
} }
} }
GGML_LOG_DEBUG("ggml_vulkan: Found %d Vulkan devices:\n", vk_instance.device_indices.size());
std::cerr << "ggml_vulkan: Found " << vk_instance.device_indices.size() << " Vulkan devices:" << std::endl;
for (size_t i = 0; i < vk_instance.device_indices.size(); i++) { for (size_t i = 0; i < vk_instance.device_indices.size(); i++) {
ggml_vk_print_gpu_info(i); ggml_vk_print_gpu_info(i);

1
src/whisper.cpp
View File

@ -7391,6 +7391,7 @@ static void whisper_exp_compute_token_level_timestamps_dtw(
void whisper_log_set(ggml_log_callback log_callback, void * user_data) { void whisper_log_set(ggml_log_callback log_callback, void * user_data) {
g_state.log_callback = log_callback ? log_callback : whisper_log_callback_default; g_state.log_callback = log_callback ? log_callback : whisper_log_callback_default;
g_state.log_callback_user_data = user_data; g_state.log_callback_user_data = user_data;
ggml_log_set(g_state.log_callback, g_state.log_callback_user_data);
} }
GGML_ATTRIBUTE_FORMAT(2, 3) GGML_ATTRIBUTE_FORMAT(2, 3)