From: Borislav Stanimirov Date: Thu, 6 Jul 2023 07:24:39 +0000 (+0300) Subject: ggml : restore GGML_RESTRICT (#350) X-Git-Tag: upstream/0.0.1642~1345 X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=4b41bae7639a906bb5aceb83c8b7b5074e884dae;p=pkg%2Fggml%2Fsources%2Fggml ggml : restore GGML_RESTRICT (#350) --- diff --git a/include/ggml/ggml.h b/include/ggml/ggml.h index 24ca8ae2..8264a3d9 100644 --- a/include/ggml/ggml.h +++ b/include/ggml/ggml.h @@ -1514,9 +1514,15 @@ extern "C" { // Internal types and functions exposed for tests and benchmarks // - typedef void (*ggml_to_float_t)(const void * x, float * y, int k); - typedef void (*ggml_from_float_t)(const float * x, void * y, int k); - typedef void (*ggml_vec_dot_t)(const int n, float * s, const void * x, const void * y); +#ifdef __cplusplus +// restrict not standard in C++ +#define GGML_RESTRICT +#else +#define GGML_RESTRICT restrict +#endif + typedef void (*ggml_to_float_t)(const void * GGML_RESTRICT x, float * GGML_RESTRICT y, int k); + typedef void (*ggml_from_float_t)(const float * GGML_RESTRICT x, void * GGML_RESTRICT y, int k); + typedef void (*ggml_vec_dot_t)(const int n, float * GGML_RESTRICT s, const void * GGML_RESTRICT x, const void * GGML_RESTRICT y); typedef struct { ggml_to_float_t to_float;