Skip to content

Commit 696f86c

Browse files
committed
Commit resolution
1 parent 24a8551 commit 696f86c

File tree

2 files changed

+30
-30
lines changed

2 files changed

+30
-30
lines changed

CMakeLists.txt

Lines changed: 27 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -218,35 +218,32 @@ if (WHISPER_BUILD_EXAMPLES)
218218
add_subdirectory(examples)
219219
endif()
220220

221-
### The following breaks GGML_CPU_ALL_VARIANTS ###
222-
if(NOT DEFINED GGML_CPU_ALL_VARIANTS)
223-
if (MSVC)
224-
set(MSVC_WARNING_FLAGS
225-
/wd4101 # Unreferenced local variable
226-
/wd4005 # Macro redefinition
227-
/wd4065 # switch statement contains 'default' but no 'case' labels
228-
/wd4267 # Conversion from 'size_t' to a smaller type, possible loss of data
229-
/wd4244 # Conversion from one type to another type, possible loss of ata
230-
/wd4805 # Unsafe mix of type
231-
/wd4305 # Truncation from 'type1' to 'type2' (often double to float)
232-
/wd4996 # Function or variable may be unsafe/deprecated
233-
)
234-
function(disable_msvc_warnings target_name)
235-
target_compile_options(${target_name} PRIVATE ${MSVC_WARNING_FLAGS})
236-
endfunction()
237-
238-
if (WHISPER_BUILD_EXAMPLES)
239-
disable_msvc_warnings(common)
240-
disable_msvc_warnings(common-sdl)
241-
disable_msvc_warnings(lsp)
242-
disable_msvc_warnings(wchess-core)
243-
disable_msvc_warnings(whisper-command)
244-
disable_msvc_warnings(whisper-cli)
245-
disable_msvc_warnings(whisper-server)
246-
disable_msvc_warnings(whisper-stream)
247-
disable_msvc_warnings(whisper-talk-llama)
248-
disable_msvc_warnings(whisper-bench)
249-
disable_msvc_warnings(quantize)
250-
endif()
221+
if (MSVC)
222+
set(MSVC_WARNING_FLAGS
223+
/wd4101 # Unreferenced local variable
224+
/wd4005 # Macro redefinition
225+
/wd4065 # switch statement contains 'default' but no 'case' labels
226+
/wd4267 # Conversion from 'size_t' to a smaller type, possible loss of data
227+
/wd4244 # Conversion from one type to another type, possible loss of ata
228+
/wd4805 # Unsafe mix of type
229+
/wd4305 # Truncation from 'type1' to 'type2' (often double to float)
230+
/wd4996 # Function or variable may be unsafe/deprecated
231+
)
232+
function(disable_msvc_warnings target_name)
233+
target_compile_options(${target_name} PRIVATE ${MSVC_WARNING_FLAGS})
234+
endfunction()
235+
236+
if (WHISPER_BUILD_EXAMPLES)
237+
disable_msvc_warnings(common)
238+
disable_msvc_warnings(common-sdl)
239+
disable_msvc_warnings(lsp)
240+
disable_msvc_warnings(wchess-core)
241+
disable_msvc_warnings(whisper-command)
242+
disable_msvc_warnings(whisper-cli)
243+
disable_msvc_warnings(whisper-server)
244+
disable_msvc_warnings(whisper-stream)
245+
disable_msvc_warnings(whisper-talk-llama)
246+
disable_msvc_warnings(whisper-bench)
247+
disable_msvc_warnings(quantize)
251248
endif()
252249
endif()

ggml/src/ggml-backend-reg.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,9 @@ struct dl_handle_deleter {
109109

110110
static dl_handle * dl_load_library(const fs::path & path) {
111111
// suppress error dialogs for missing DLLs
112+
#ifdef GGML_BINDINGS_FLAT // sbdbg
113+
fprintf(stderr, "dl_load_library()%s",path.wstring().c_str()); // sbdbg
114+
#endif // sbdbg
112115
DWORD old_mode = SetErrorMode(SEM_FAILCRITICALERRORS);
113116
SetErrorMode(old_mode | SEM_FAILCRITICALERRORS);
114117

0 commit comments

Comments
 (0)