Merge branch 'master' into gg/flash-attn

This commit is contained in:
Georgi Gerganov 2024-01-31 18:49:43 +02:00
commit 2ddc9bbef1
No known key found for this signature in database
GPG key ID: 449E073F9DC10735
30 changed files with 1758 additions and 1597 deletions

4
ggml.h
View file

@ -1496,7 +1496,8 @@ extern "C" {
int p1,
int d0,
int d1,
bool is_2D);
bool is_2D,
enum ggml_type dst_type);
GGML_API struct ggml_tensor * ggml_conv_depthwise_2d(
struct ggml_context * ctx,
@ -2284,6 +2285,7 @@ extern "C" {
GGML_API int ggml_cpu_has_cublas (void);
GGML_API int ggml_cpu_has_clblast (void);
GGML_API int ggml_cpu_has_vulkan (void);
GGML_API int ggml_cpu_has_kompute (void);
GGML_API int ggml_cpu_has_gpublas (void);
GGML_API int ggml_cpu_has_sse3 (void);
GGML_API int ggml_cpu_has_ssse3 (void);