thewh1teagle commited on
Commit
aec2a89
·
unverified ·
1 Parent(s): 88b342e

ggml : vulkan logs (#2547)

Browse files
Files changed (2) hide show
  1. ggml/src/ggml-vulkan.cpp +4 -4
  2. src/whisper.cpp +1 -0
ggml/src/ggml-vulkan.cpp CHANGED
@@ -2049,7 +2049,8 @@ static void ggml_vk_print_gpu_info(size_t idx) {
2049
  fp16 = fp16 && vk12_features.shaderFloat16;
2050
 
2051
  std::string device_name = props2.properties.deviceName.data();
2052
- std::cerr << GGML_VK_NAME << idx << ": " << device_name << " (" << driver_props.driverName << ") | uma: " << uma << " | fp16: " << fp16 << " | warp size: " << subgroup_size << std::endl;
 
2053
 
2054
  if (props2.properties.deviceType == vk::PhysicalDeviceType::eCpu) {
2055
  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() {
2107
  };
2108
  validation_features.setPNext(nullptr);
2109
  instance_create_info.setPNext(&validation_features);
2110
-
2111
- std::cerr << "ggml_vulkan: Validation layers enabled" << std::endl;
2112
  }
2113
  vk_instance.instance = vk::createInstance(instance_create_info);
2114
 
@@ -2222,8 +2222,8 @@ void ggml_vk_instance_init() {
2222
  vk_instance.device_indices.push_back(0);
2223
  }
2224
  }
 
2225
 
2226
- std::cerr << "ggml_vulkan: Found " << vk_instance.device_indices.size() << " Vulkan devices:" << std::endl;
2227
 
2228
  for (size_t i = 0; i < vk_instance.device_indices.size(); i++) {
2229
  ggml_vk_print_gpu_info(i);
 
2049
  fp16 = fp16 && vk12_features.shaderFloat16;
2050
 
2051
  std::string device_name = props2.properties.deviceName.data();
2052
+ GGML_LOG_DEBUG("ggml_vulkan: %d = %s (%s) | uma: %d | fp16: %d | warp size: %d\n",
2053
+ idx, device_name.c_str(), driver_props.driverName, uma, fp16, subgroup_size);
2054
 
2055
  if (props2.properties.deviceType == vk::PhysicalDeviceType::eCpu) {
2056
  std::cerr << "ggml_vulkan: Warning: Device type is CPU. This is probably not the device you want." << std::endl;
 
2108
  };
2109
  validation_features.setPNext(nullptr);
2110
  instance_create_info.setPNext(&validation_features);
2111
+ GGML_LOG_DEBUG("ggml_vulkan: Validation layers enabled\n");
 
2112
  }
2113
  vk_instance.instance = vk::createInstance(instance_create_info);
2114
 
 
2222
  vk_instance.device_indices.push_back(0);
2223
  }
2224
  }
2225
+ GGML_LOG_DEBUG("ggml_vulkan: Found %d Vulkan devices:\n", vk_instance.device_indices.size());
2226
 
 
2227
 
2228
  for (size_t i = 0; i < vk_instance.device_indices.size(); i++) {
2229
  ggml_vk_print_gpu_info(i);
src/whisper.cpp CHANGED
@@ -7391,6 +7391,7 @@ static void whisper_exp_compute_token_level_timestamps_dtw(
7391
  void whisper_log_set(ggml_log_callback log_callback, void * user_data) {
7392
  g_state.log_callback = log_callback ? log_callback : whisper_log_callback_default;
7393
  g_state.log_callback_user_data = user_data;
 
7394
  }
7395
 
7396
  GGML_ATTRIBUTE_FORMAT(2, 3)
 
7391
  void whisper_log_set(ggml_log_callback log_callback, void * user_data) {
7392
  g_state.log_callback = log_callback ? log_callback : whisper_log_callback_default;
7393
  g_state.log_callback_user_data = user_data;
7394
+ ggml_log_set(g_state.log_callback, g_state.log_callback_user_data);
7395
  }
7396
 
7397
  GGML_ATTRIBUTE_FORMAT(2, 3)