mirror of
https://github.com/ggml-org/whisper.cpp.git
synced 2026-10-22 03:48:19 +02:00
webgpu : reorder includes since V that appears in common_decls.tmpl may be defined as K in flash_attn_decls.tmpl if KV_OVERLAP (llama/27545)
Co-authored-by: Stanisław Szymczyk <sszymczy@gmail.com>
This commit is contained in:
committed by
Georgi Gerganov
co-authored by
Stanisław Szymczyk
parent
32d0f49ddc
commit
103305e656
@@ -5,10 +5,9 @@ enable subgroups;
|
|||||||
enable chromium_experimental_subgroup_matrix;
|
enable chromium_experimental_subgroup_matrix;
|
||||||
|
|
||||||
#define BYTE_HELPERS
|
#define BYTE_HELPERS
|
||||||
#include "common_decls.tmpl"
|
|
||||||
|
|
||||||
#define FLASH_ATTN_SCALAR_KV
|
#define FLASH_ATTN_SCALAR_KV
|
||||||
#include "flash_attn_decls.tmpl"
|
#include "flash_attn_decls.tmpl"
|
||||||
|
#include "common_decls.tmpl"
|
||||||
|
|
||||||
// Default values
|
// Default values
|
||||||
// The actual values are defined in shader-lib.
|
// The actual values are defined in shader-lib.
|
||||||
|
|||||||
@@ -2,8 +2,8 @@ enable f16;
|
|||||||
enable subgroups;
|
enable subgroups;
|
||||||
|
|
||||||
#define BYTE_HELPERS
|
#define BYTE_HELPERS
|
||||||
#include "common_decls.tmpl"
|
|
||||||
#include "flash_attn_decls.tmpl"
|
#include "flash_attn_decls.tmpl"
|
||||||
|
#include "common_decls.tmpl"
|
||||||
|
|
||||||
// Default values
|
// Default values
|
||||||
// The actual values are defined in shader-lib.
|
// The actual values are defined in shader-lib.
|
||||||
|
|||||||
@@ -3,9 +3,9 @@ enable f16;
|
|||||||
enable subgroups;
|
enable subgroups;
|
||||||
|
|
||||||
#define BYTE_HELPERS
|
#define BYTE_HELPERS
|
||||||
#include "common_decls.tmpl"
|
|
||||||
#define FLASH_ATTN_VEC_SPLIT
|
#define FLASH_ATTN_VEC_SPLIT
|
||||||
#include "flash_attn_decls.tmpl"
|
#include "flash_attn_decls.tmpl"
|
||||||
|
#include "common_decls.tmpl"
|
||||||
|
|
||||||
// Default values
|
// Default values
|
||||||
// The actual values are defined in shader-lib.
|
// The actual values are defined in shader-lib.
|
||||||
|
|||||||
Reference in New Issue
Block a user