From d51c5eb9067bb5b5cef9208d754bcedc89bdbf01 Mon Sep 17 00:00:00 2001 From: Georgi Gerganov Date: Thu, 5 Jan 2023 21:07:50 +0200 Subject: [PATCH] ggml : define MIN / MAX only if not defined (minor) --- bindings/ios | 2 +- ggml.c | 8 +++++--- whisper.cpp | 5 ++--- whisper.h | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/bindings/ios b/bindings/ios index 1502317..6707f1e 160000 --- a/bindings/ios +++ b/bindings/ios @@ -1 +1 @@ -Subproject commit 1502317fe050c1d5ae1a81082153b8f00d50d9cd +Subproject commit 6707f1ea1caa7ee5e9b6908101fe98775e582cff diff --git a/ggml.c b/ggml.c index ddcdea5..5ce44d2 100644 --- a/ggml.c +++ b/ggml.c @@ -88,9 +88,6 @@ typedef void* thread_ret_t; #define GGML_MEM_ALIGN 16 #endif -#define MAX(a, b) ((a) > (b) ? (a) : (b)) -#define MIN(a, b) ((a) < (b) ? (a) : (b)) - #define UNUSED(x) (void)(x) #define SWAP(x, y, T) do { T SWAP = x; x = y; y = SWAP; } while (0) @@ -108,6 +105,11 @@ typedef void* thread_ret_t; #include #endif +#undef MIN +#undef MAX +#define MIN(a, b) ((a) < (b) ? (a) : (b)) +#define MAX(a, b) ((a) > (b) ? (a) : (b)) + // floating point type used to accumulate sums typedef double ggml_float; diff --git a/whisper.cpp b/whisper.cpp index 84c2490..8cfe04c 100644 --- a/whisper.cpp +++ b/whisper.cpp @@ -435,9 +435,8 @@ struct whisper_context { }; template -static void read_safe(std::ifstream& fin, T& dest) -{ - fin.read((char*)& dest, sizeof(T)); +static void read_safe(std::ifstream& fin, T& dest) { + fin.read((char*)& dest, sizeof(T)); } // load the model from a ggml file diff --git a/whisper.h b/whisper.h index e36b761..8cb16ca 100644 --- a/whisper.h +++ b/whisper.h @@ -148,7 +148,7 @@ extern "C" { struct whisper_context * ctx, const char * text, whisper_token * tokens, - int n_max_tokens); + int n_max_tokens); // Largest language id (i.e. number of available languages - 1) WHISPER_API int whisper_lang_max_id();