vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'ggerganov:master' into master

Browse source
This commit is contained in:
m3ndax 2023-07-02 10:29:26 +02:00 • committed by GitHub
commit 9bfaf7ddd0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

31
ggml.c
View file

@ -3855,28 +3855,29 @@ static_assert(sizeof(struct ggml_tensor)%GGML_MEM_ALIGN == 0, "ggml_tensor size
// Take care about compile options (e.g., GGML_USE_xxx). // Take care about compile options (e.g., GGML_USE_xxx).
static bool GGML_OP_HAS_INIT [GGML_OP_COUNT] = { 0 }; static bool GGML_OP_HAS_INIT [GGML_OP_COUNT] = { 0 };
static bool GGML_OP_HAS_FINALIZE[GGML_OP_COUNT] = { 0 }; static bool GGML_OP_HAS_FINALIZE[GGML_OP_COUNT] = { 0 };
static void ggml_setup_op_has_task_pass(void) { static void ggml_setup_op_has_task_pass(void) {
{ // INIT { // INIT
bool * I = GGML_OP_HAS_INIT; bool * p = GGML_OP_HAS_INIT;
I[GGML_OP_ACC ] = true; p[GGML_OP_ACC ] = true;
I[GGML_OP_MUL_MAT ] = true; p[GGML_OP_MUL_MAT ] = true;
I[GGML_OP_OUT_PROD ] = true; p[GGML_OP_OUT_PROD ] = true;
I[GGML_OP_SET ] = true; p[GGML_OP_SET ] = true;
I[GGML_OP_GET_ROWS_BACK ] = true; p[GGML_OP_GET_ROWS_BACK ] = true;
I[GGML_OP_DIAG_MASK_INF ] = true; p[GGML_OP_DIAG_MASK_INF ] = true;
I[GGML_OP_DIAG_MASK_ZERO ] = true; p[GGML_OP_DIAG_MASK_ZERO ] = true;
I[GGML_OP_CONV_1D_S1_PH ] = true; p[GGML_OP_CONV_1D_S1_PH ] = true;
I[GGML_OP_CONV_1D_S2_PH ] = true; p[GGML_OP_CONV_1D_S2_PH ] = true;
I[GGML_OP_CONV_2D_SK_P0 ] = true; p[GGML_OP_CONV_2D_SK_P0 ] = true;
I[GGML_OP_FLASH_ATTN_BACK ] = true; p[GGML_OP_FLASH_ATTN_BACK ] = true;
I[GGML_OP_CROSS_ENTROPY_LOSS ] = true; p[GGML_OP_CROSS_ENTROPY_LOSS ] = true;
} }
{ // FINALIZE { // FINALIZE
bool * F = GGML_OP_HAS_FINALIZE; bool * p = GGML_OP_HAS_FINALIZE;
F[GGML_OP_CROSS_ENTROPY_LOSS ] = true; p[GGML_OP_CROSS_ENTROPY_LOSS ] = true;
} }
} }