ExternalVendorCode/whisper.cpp
1
0
Fork 0
mirror of https://github.com/ggerganov/whisper.cpp.git synced 2025-06-19 23:33:43 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

ggml : define MIN / MAX only if not defined (minor)

Browse Source
This commit is contained in:
Georgi Gerganov
2023-01-05 21:07:50 +02:00
parent 0be6a1afd9
commit d51c5eb906
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bindings/ios

Submodule bindings/ios updated: 1502317fe0...6707f1ea1c

8
ggml.c
View File

@ -88,9 +88,6 @@ typedef void* thread_ret_t;
#define GGML_MEM_ALIGN 16 #define GGML_MEM_ALIGN 16
#endif #endif
#define MAX(a, b) ((a) > (b) ? (a) : (b))
#define MIN(a, b) ((a) < (b) ? (a) : (b))
#define UNUSED(x) (void)(x) #define UNUSED(x) (void)(x)
#define SWAP(x, y, T) do { T SWAP = x; x = y; y = SWAP; } while (0) #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 <cblas.h> #include <cblas.h>
#endif #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 // floating point type used to accumulate sums
typedef double ggml_float; typedef double ggml_float;

3
whisper.cpp
View File

@ -435,8 +435,7 @@ struct whisper_context {
}; };
template<typename T> template<typename T>
static void read_safe(std::ifstream& fin, T& dest) static void read_safe(std::ifstream& fin, T& dest) {
{
fin.read((char*)& dest, sizeof(T)); fin.read((char*)& dest, sizeof(T));
} }