diff --git a/CMakeLists.txt b/CMakeLists.txt index c53252bac77..f0ff5932c05 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,10 @@ include(CheckIncludeFileCXX) set(SOVERSION 1) +if (MSVC) + add_compile_options(/utf-8) +endif() + #set(CMAKE_WARN_DEPRECATED YES) set(CMAKE_WARN_UNUSED_CLI YES) diff --git a/ggml/src/ggml-vulkan/vulkan-shaders/soft_max.comp b/ggml/src/ggml-vulkan/vulkan-shaders/soft_max.comp index f9727679ec5..d372025b9f8 100644 --- a/ggml/src/ggml-vulkan/vulkan-shaders/soft_max.comp +++ b/ggml/src/ggml-vulkan/vulkan-shaders/soft_max.comp @@ -32,7 +32,7 @@ shared FLOAT_TYPE vals[BLOCK_SIZE]; void soft_max(uint num_iters) { const uint tid = gl_LocalInvocationID.x; const uint rowx = gl_WorkGroupID.z * 262144 + gl_WorkGroupID.y * 512 + gl_WorkGroupID.x; - const uint rowy = rowx % p.KY; + const uint rowy = (p.KY > 0) ? (rowx % p.KY) : 0; if (rowx >= p.nrows_x) { return; diff --git a/src/openvino/whisper-openvino-encoder.cpp b/src/openvino/whisper-openvino-encoder.cpp index 4d9ce122858..0e8c0c9146d 100644 --- a/src/openvino/whisper-openvino-encoder.cpp +++ b/src/openvino/whisper-openvino-encoder.cpp @@ -2,6 +2,7 @@ #include "ggml.h" #include #include +#include struct whisper_openvino_context { ov::InferRequest inferRequest; @@ -28,7 +29,15 @@ struct whisper_openvino_context * whisper_openvino_init(const char* path_model, // routine. This speeds up calls to compile_model for successive runs. core.set_property(ov::cache_dir(cache_dir)); } + // OpenVINOのバージョン情報を出力 + std::cout << "OpenVINO version: " << ov::get_openvino_version() << std::endl; + // 利用可能なデバイスを出力 + std::cout << "Available devices: "; + for (const auto& device : core.get_available_devices()) { + std::cout << device << " "; + } + std::cout << std::endl; //Read the OpenVINO encoder IR (.xml/.bin) from disk, producing an ov::Model object. std::shared_ptr model = core.read_model(path_model);