extern/whisper.cpp
1
0
Fork 1
mirror of https://github.com/ggerganov/whisper.cpp.git synced 2025-05-13 04:25:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

whisper: remove MSVC warnings pragmas (#3090)

Browse Source 
* ggml : remove MSVC warnings pragmas

This commit removes the MSVC-specific pragmas as these are now handled
in CMakeLists.txt.

* whisper : remove MSVC warning pragmas

This commit removes the MSVC-specific pragmas. These are now handled in
the CMakeLists.txt file.
This commit is contained in:
Daniel Bevenius 2025-05-05 13:09:35 +02:00 committed by GitHub
parent bcf1ed0163
commit 09846f4e12
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
16 changed files with 3 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -232,6 +232,7 @@ if (MSVC)
endfunction() endfunction()
if (WHISPER_BUILD_EXAMPLES) if (WHISPER_BUILD_EXAMPLES)
disable_msvc_warnings(whisper)
disable_msvc_warnings(common) disable_msvc_warnings(common)
disable_msvc_warnings(common-sdl) disable_msvc_warnings(common-sdl)
disable_msvc_warnings(lsp) disable_msvc_warnings(lsp)

4
examples/cli/cli.cpp
View File

@ -20,10 +20,6 @@
#include <windows.h> #include <windows.h>
#endif #endif
#if defined(_MSC_VER)
#pragma warning(disable: 4244 4267) // possible loss of data
#endif
// helper function to replace substrings // helper function to replace substrings
static void replace_all(std::string & s, const std::string & search, const std::string & replace) { static void replace_all(std::string & s, const std::string & search, const std::string & replace) {
for (size_t pos = 0; ; pos += replace.length()) { for (size_t pos = 0; ; pos += replace.length()) {

4
examples/common-whisper.cpp
View File

@ -26,10 +26,6 @@
#define MINIAUDIO_IMPLEMENTATION #define MINIAUDIO_IMPLEMENTATION
#include "miniaudio.h" #include "miniaudio.h"
#if defined(_MSC_VER)
#pragma warning(disable: 4244 4267) // possible loss of data
#endif
#ifdef _WIN32 #ifdef _WIN32
#include <fcntl.h> #include <fcntl.h>
#include <io.h> #include <io.h>

4
examples/common.cpp
View File

@ -10,10 +10,6 @@
#include <regex> #include <regex>
#include <sstream> #include <sstream>
#if defined(_MSC_VER)
#pragma warning(disable: 4244 4267) // possible loss of data
#endif
// Function to check if the next argument exists // Function to check if the next argument exists
static std::string get_next_arg(int& i, int argc, char** argv, const std::string& flag, gpt_params& params) { static std::string get_next_arg(int& i, int argc, char** argv, const std::string& flag, gpt_params& params) {
if (i + 1 < argc && argv[i + 1][0] != '-') { if (i + 1 < argc && argv[i + 1][0] != '-') {

4
examples/server/server.cpp
View File

@ -14,10 +14,6 @@
#include <thread> #include <thread>
#include <vector> #include <vector>
#if defined(_MSC_VER)
#pragma warning(disable: 4244 4267) // possible loss of data
#endif
using namespace httplib; using namespace httplib;
using json = nlohmann::ordered_json; using json = nlohmann::ordered_json;

4
examples/talk-llama/llama.cpp
View File

@ -16,10 +16,6 @@
#include <cstring> #include <cstring>
#include <ctime> #include <ctime>
#if defined(_MSC_VER)
#pragma warning(disable: 4244 4267) // possible loss of data
#endif
// //
// interface implementation // interface implementation
// //

2
ggml/CMakeLists.txt
View File

@ -366,6 +366,8 @@ if (MSVC)
/wd4005 # Macro redefinition /wd4005 # Macro redefinition
/wd4244 # Conversion from one type to another type, possible loss of data /wd4244 # Conversion from one type to another type, possible loss of data
/wd4267 # Conversion from 'size_t' to a smaller type, possible loss of data /wd4267 # Conversion from 'size_t' to a smaller type, possible loss of data
/wd4996 # Disable POSIX deprecation warnings
/wd4702 # Unreachable code warnings
) )
function(disable_msvc_warnings target_name) function(disable_msvc_warnings target_name)
if(TARGET ${target_name}) if(TARGET ${target_name})

2
ggml/src/ggml-cpu/ggml-cpu-aarch64.cpp
View File

@ -72,8 +72,6 @@ static_assert(sizeof(block_iq4_nlx4) == 4 * sizeof(ggml_half) + QK4_NL * 2, "wro
#if defined(__GNUC__) #if defined(__GNUC__)
#pragma GCC diagnostic ignored "-Woverlength-strings" #pragma GCC diagnostic ignored "-Woverlength-strings"
#elif defined(_MSC_VER)
#pragma warning(disable: 4244 4267) // possible loss of data
#endif #endif
#define UNUSED GGML_UNUSED #define UNUSED GGML_UNUSED

6
ggml/src/ggml-cpu/ggml-cpu-quants.c
View File

@ -20,12 +20,6 @@
#define GROUP_MAX_EPS_IQ1_M 1e-7f #define GROUP_MAX_EPS_IQ1_M 1e-7f
#define GROUP_MAX_EPS_IQ1_S 1e-12f #define GROUP_MAX_EPS_IQ1_S 1e-12f
#if defined(_MSC_VER)
// disable "possible loss of data" to avoid warnings for hundreds of casts
// we should just be careful :)
#pragma warning(disable: 4244 4267)
#endif
#define UNUSED GGML_UNUSED #define UNUSED GGML_UNUSED
// some compilers don't provide _mm256_set_m128i, e.g. gcc 7 // some compilers don't provide _mm256_set_m128i, e.g. gcc 7

13
ggml/src/ggml-cpu/ggml-cpu.c
View File

@ -50,19 +50,6 @@
#include "llamafile/sgemm.h" #include "llamafile/sgemm.h"
#endif #endif
#if defined(_MSC_VER)
// disable "possible loss of data" to avoid hundreds of casts
// we should just be careful :)
#pragma warning(disable: 4244 4267)
// disable POSIX deprecation warnings
// these functions are never going away, anyway
#pragma warning(disable: 4996)
// unreachable code because of multiple instances of code after GGML_ABORT
#pragma warning(disable: 4702)
#endif
// Note: once we move threading into a separate C++ file // Note: once we move threading into a separate C++ file
// will use std::hardware_destructive_interference_size instead of hardcoding it here // will use std::hardware_destructive_interference_size instead of hardcoding it here
// and we'll use C++ attribute syntax. // and we'll use C++ attribute syntax.

13
ggml/src/ggml-cpu/ops.cpp
View File

@ -8,19 +8,6 @@
#include <float.h> #include <float.h>
#if defined(_MSC_VER)
// disable "possible loss of data" to avoid hundreds of casts
// we should just be careful :)
#pragma warning(disable: 4244 4267)
// disable POSIX deprecation warnings
// these functions are never going away, anyway
#pragma warning(disable: 4996)
// unreachable code because of multiple instances of code after GGML_ABORT
#pragma warning(disable: 4702)
#endif
// ggml_compute_forward_dup // ggml_compute_forward_dup
static void ggml_compute_forward_dup_same_cont( static void ggml_compute_forward_dup_same_cont(

6
ggml/src/ggml-cpu/vec.cpp
View File

@ -2,12 +2,6 @@
#include <cassert> #include <cassert>
#if defined(_MSC_VER)
// disable "possible loss of data" to avoid hundreds of casts
// we should just be careful :)
#pragma warning(disable: 4244 4267)
#endif
// precomputed gelu table for f16 (128 KB) // precomputed gelu table for f16 (128 KB)
ggml_fp16_t ggml_table_gelu_f16[1 << 16]; ggml_fp16_t ggml_table_gelu_f16[1 << 16];

4
ggml/src/ggml-cuda/common.cuh
View File

@ -130,10 +130,6 @@ static int ggml_cuda_highest_compiled_arch(const int arch) {
#define MATRIX_ROW_PADDING 512 // last row of quant. matrices is a multiple of this to avoid out-of-bounds memory accesses #define MATRIX_ROW_PADDING 512 // last row of quant. matrices is a multiple of this to avoid out-of-bounds memory accesses
#if defined(_MSC_VER)
#pragma warning(disable: 4244 4267) // possible loss of data
#endif
#define GGML_CUDA_MAX_STREAMS 8 #define GGML_CUDA_MAX_STREAMS 8
[[noreturn]] [[noreturn]]

6
ggml/src/ggml-quants.c
View File

@ -19,12 +19,6 @@
#define GROUP_MAX_EPS_IQ1_M 1e-7f #define GROUP_MAX_EPS_IQ1_M 1e-7f
#define GROUP_MAX_EPS_IQ1_S 1e-12f #define GROUP_MAX_EPS_IQ1_S 1e-12f
#if defined(_MSC_VER)
// disable "possible loss of data" to avoid warnings for hundreds of casts
// we should just be careful :)
#pragma warning(disable: 4244 4267)
#endif
#define UNUSED GGML_UNUSED #define UNUSED GGML_UNUSED
// reference implementation for deterministic creation of model files // reference implementation for deterministic creation of model files

4
ggml/src/ggml-sycl/common.hpp
View File

@ -80,10 +80,6 @@ extern int g_ggml_sycl_disable_optimize;
// max batch size to use MMQ kernels when tensor cores are available // max batch size to use MMQ kernels when tensor cores are available
#define MMQ_MAX_BATCH_SIZE 32 #define MMQ_MAX_BATCH_SIZE 32
#if defined(_MSC_VER)
#pragma warning(disable : 4244 4267) // possible loss of data
#endif
// dmmv = dequantize_mul_mat_vec // dmmv = dequantize_mul_mat_vec
#ifndef GGML_SYCL_DMMV_X #ifndef GGML_SYCL_DMMV_X
#define GGML_SYCL_DMMV_X 32 #define GGML_SYCL_DMMV_X 32

4
src/whisper.cpp
View File

@ -37,10 +37,6 @@
// dummy // dummy
#if defined(_MSC_VER)
#pragma warning(disable: 4244 4267) // possible loss of data
#endif
#if defined(WHISPER_BIG_ENDIAN) #if defined(WHISPER_BIG_ENDIAN)
template<typename T> template<typename T>
static T byteswap(T value) { static T byteswap(T value) {