CS348Project/llama.cpp
5
0
Fork 0
mirror of https://github.com/ggml-org/llama.cpp.git synced 2025-11-04 09:32:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

ggml : remove duplicate static assert macros

Browse Source
This commit is contained in:
Georgi Gerganov
2023-10-30 18:35:03 +02:00
parent 223696c9f9
commit 1039a16ce2
3 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ggml-impl.h
View File

@@ -4,6 +4,7 @@
// GGML internal header // GGML internal header
#include <assert.h>
#include <stddef.h> #include <stddef.h>
#include <stdbool.h> #include <stdbool.h>
#include <string.h> // memcpy #include <string.h> // memcpy

14
ggml-quants.h
View File

@@ -1,22 +1,12 @@
#pragma once #pragma once
// This is a private API for quantization and dequantization #include "ggml-impl.h"
// Should not be used directly, use ggml.h instead
#include "ggml.h" // GGML internal header
#include <stdint.h> #include <stdint.h>
#include <assert.h>
#include <stddef.h> #include <stddef.h>
#ifndef static_assert
#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201100L)
#define static_assert(cond, msg) _Static_assert(cond, msg)
#else
#define static_assert(cond, msg) struct global_scope_noop_trick
#endif
#endif
#define QK4_0 32 #define QK4_0 32
typedef struct { typedef struct {
ggml_fp16_t d; // delta ggml_fp16_t d; // delta

2
llama.cpp
View File

@@ -1467,7 +1467,7 @@ static int32_t llama_kv_cache_cell_max(const struct llama_kv_cache & cache) {
} }
static void llama_kv_cache_clear(struct llama_kv_cache & cache) { static void llama_kv_cache_clear(struct llama_kv_cache & cache) {
for (int32_t i = 0; i < cache.size; ++i) { for (int32_t i = 0; i < (int32_t) cache.size; ++i) {
cache.cells[i].pos = -1; cache.cells[i].pos = -1;
cache.cells[i].seq_id.clear(); cache.cells[i].seq_id.clear();
} }