Merge branch 'master' into gg/flash-attn
This commit is contained in:
commit
2ddc9bbef1
30 changed files with 1758 additions and 1597 deletions
4
ggml.h
4
ggml.h
|
@ -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);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue