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

ggml : minor

Browse source
This commit is contained in:
Georgi Gerganov 2024-03-08 15:43:21 +02:00
parent ddc6397a20
commit a167b6df7d
No known key found for this signature in database
GPG key ID: 449E073F9DC10735
2 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
ggml-common.h
View file

@ -5,32 +5,32 @@
#define GGML_TABLE_BEGIN(type, name, size) static const type name[size] = { #define GGML_TABLE_BEGIN(type, name, size) static const type name[size] = {
#define GGML_TABLE_END() }; #define GGML_TABLE_END() };
#define GGML_COMMON_IMPL
#elif defined(GGML_COMMON_IMPL_METAL) #elif defined(GGML_COMMON_IMPL_METAL)
#include <metal_stdlib> #include <metal_stdlib>
#define GGML_TABLE_BEGIN(type, name, size) static const constant type name[size] = { #define GGML_TABLE_BEGIN(type, name, size) static const constant type name[size] = {
#define GGML_TABLE_END() }; #define GGML_TABLE_END() };
#define GGML_COMMON_IMPL
#elif defined(GGML_COMMON_IMPL_CUDA) #elif defined(GGML_COMMON_IMPL_CUDA)
#include <cstdint> #include <cstdint>
#define GGML_TABLE_BEGIN(type, name, size) static const __device__ __constant__ type name[size] = { #define GGML_TABLE_BEGIN(type, name, size) static const __device__ __constant__ type name[size] = {
#define GGML_TABLE_END() }; #define GGML_TABLE_END() };
#define GGML_COMMON_IMPL
#elif defined(GGML_COMMON_IMPL_SYCL) #elif defined(GGML_COMMON_IMPL_SYCL)
#include <cstdint> #include <cstdint>
#define GGML_TABLE_BEGIN(type, name, size) static dpct::global_memory<const type, 1> name(sycl::range<1>(size), { #define GGML_TABLE_BEGIN(type, name, size) static dpct::global_memory<const type, 1> name(sycl::range<1>(size), {
#define GGML_TABLE_END() }); #define GGML_TABLE_END() });
#else
#pragma message("Before including ggml-common.h you should define GGML_COMMON_IMPL_XXX")
#include <stdint.h> #define GGML_COMMON_IMPL
#define GGML_TABLE_BEGIN(type, name, size) static const type name[size] = {
#define GGML_TABLE_END() };
#endif #endif
// shared constants and structs across ggml backends #if defined(GGML_COMMON_IMPL)
// TODO: move quantum block declarations here
GGML_TABLE_BEGIN(uint8_t, kmask_iq2xs, 8) GGML_TABLE_BEGIN(uint8_t, kmask_iq2xs, 8)
1, 2, 4, 8, 16, 32, 64, 128 1, 2, 4, 8, 16, 32, 64, 128
@ -775,3 +775,5 @@ GGML_TABLE_BEGIN(uint64_t, iq1s_grid, NGRID_IQ2XXS)
0x010101ff010101ff, 0x01010100ffffffff, 0x01010100ff000001, 0x010101000000ff00, 0x010101ff010101ff, 0x01010100ffffffff, 0x01010100ff000001, 0x010101000000ff00,
0x0101010001010000, 0x0101010100ff0001, 0x010101010001ff01, 0x010101010101ffff, 0x0101010001010000, 0x0101010100ff0001, 0x010101010001ff01, 0x010101010101ffff,
GGML_TABLE_END() GGML_TABLE_END()
#endif // GGML_COMMON_IMPL

4
ggml-quants.h
View file

@ -1,9 +1,9 @@
#pragma once #pragma once
#include "ggml-impl.h"
// GGML internal header // GGML internal header
#include "ggml-impl.h"
#include <stdint.h> #include <stdint.h>
#include <stddef.h> #include <stddef.h>