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

llama : no need to pass full file loader to the file saver

Browse source 
just gguf_ctx
This commit is contained in:
Georgi Gerganov 2023-08-15 11:22:37 +03:00
parent 5c85332e99
commit 9574f41818
No known key found for this signature in database
GPG key ID: 449E073F9DC10735
1 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

48
gguf-llama.cpp
View file

@ -697,12 +697,12 @@ struct gguf_file_saver {
// we need to calculate the delta in number of bytes written with a counter as a struct member. // we need to calculate the delta in number of bytes written with a counter as a struct member.
gguf_file file; gguf_file file;
gguf_file_loader * fl; gguf_context * ctx; // loaded gguf context (used to re-write the KV section (good enough for now))
size_t info_offset; size_t info_offset;
size_t tensor_offset = 0; size_t tensor_offset = 0;
gguf_file_saver(const char * fname, gguf_file_loader * fl) gguf_file_saver(const char * fname, gguf_context * ctx)
: file(fname, "wb"), fl(fl) { : file(fname, "wb"), ctx(ctx) {
fprintf(stderr, "llama.cpp: saving model to %s\n", fname); fprintf(stderr, "llama.cpp: saving model to %s\n", fname);
write_header(); write_header();
write_kv(); write_kv();
@ -711,15 +711,15 @@ struct gguf_file_saver {
void write_header() { void write_header() {
file.write_i32(GGUF_MAGIC); file.write_i32(GGUF_MAGIC);
file.write_i32(GGUF_VERSION); file.write_i32(GGUF_VERSION);
file.write_i32(gguf_get_n_tensors(fl->gguf_ctx)); file.write_i32(gguf_get_n_tensors(ctx));
file.write_i32(gguf_get_n_kv (fl->gguf_ctx)); file.write_i32(gguf_get_n_kv (ctx));
} }
void write_kv_arr_str(const std::string & key, enum gguf_type type, int i, int n_arr) { void write_kv_arr_str(const std::string & key, enum gguf_type type, int i, int n_arr) {
std::vector<std::string> data(n_arr); std::vector<std::string> data(n_arr);
for (int j = 0; j < n_arr; ++j) { for (int j = 0; j < n_arr; ++j) {
std::string val = gguf_get_arr_str(fl->gguf_ctx, i, j); std::string val = gguf_get_arr_str(ctx, i, j);
data[j] = val; data[j] = val;
} }
@ -730,7 +730,7 @@ struct gguf_file_saver {
std::vector<float> data(n_arr); std::vector<float> data(n_arr);
for (int j = 0; j < n_arr; ++j) { for (int j = 0; j < n_arr; ++j) {
float val = gguf_get_arr_f32(fl->gguf_ctx, i, j); float val = gguf_get_arr_f32(ctx, i, j);
data[j] = val; data[j] = val;
} }
@ -739,28 +739,28 @@ struct gguf_file_saver {
// re-write the key-value section from the loaded file // re-write the key-value section from the loaded file
void write_kv() { void write_kv() {
const int32_t n_kv = gguf_get_n_kv(fl->gguf_ctx); const int32_t n_kv = gguf_get_n_kv(ctx);
for (int i = 0; i < n_kv; ++i) { for (int i = 0; i < n_kv; ++i) {
const char * key = gguf_get_key(fl->gguf_ctx, i); const char * key = gguf_get_key(ctx, i);
if (strcmp(key, "general.quantization_version") == 0) { if (strcmp(key, "general.quantization_version") == 0) {
file.write_val<uint32_t>("general.quantization_version", GGUF_TYPE_UINT32, GGML_QNT_VERSION); file.write_val<uint32_t>("general.quantization_version", GGUF_TYPE_UINT32, GGML_QNT_VERSION);
} else { } else {
const gguf_type vtype = gguf_get_kv_type(fl->gguf_ctx, i); const gguf_type vtype = gguf_get_kv_type(ctx, i);
switch (vtype) { switch (vtype) {
case GGUF_TYPE_BOOL: file.write_val<bool> (key, GGUF_TYPE_BOOL, gguf_get_val_bool(fl->gguf_ctx, i)); break; case GGUF_TYPE_BOOL: file.write_val<bool> (key, GGUF_TYPE_BOOL, gguf_get_val_bool(ctx, i)); break;
case GGUF_TYPE_FLOAT32: file.write_val<float> (key, GGUF_TYPE_FLOAT32, gguf_get_val_f32 (fl->gguf_ctx, i)); break; case GGUF_TYPE_FLOAT32: file.write_val<float> (key, GGUF_TYPE_FLOAT32, gguf_get_val_f32 (ctx, i)); break;
case GGUF_TYPE_INT16: file.write_val<int16_t> (key, GGUF_TYPE_INT16, gguf_get_val_i16 (fl->gguf_ctx, i)); break; case GGUF_TYPE_INT16: file.write_val<int16_t> (key, GGUF_TYPE_INT16, gguf_get_val_i16 (ctx, i)); break;
case GGUF_TYPE_INT32: file.write_val<int32_t> (key, GGUF_TYPE_INT32, gguf_get_val_i32 (fl->gguf_ctx, i)); break; case GGUF_TYPE_INT32: file.write_val<int32_t> (key, GGUF_TYPE_INT32, gguf_get_val_i32 (ctx, i)); break;
case GGUF_TYPE_INT8: file.write_val<int8_t> (key, GGUF_TYPE_INT8, gguf_get_val_i8 (fl->gguf_ctx, i)); break; case GGUF_TYPE_INT8: file.write_val<int8_t> (key, GGUF_TYPE_INT8, gguf_get_val_i8 (ctx, i)); break;
case GGUF_TYPE_STRING: file.write_str (key, GGUF_TYPE_STRING, gguf_get_val_str (fl->gguf_ctx, i)); break; case GGUF_TYPE_STRING: file.write_str (key, GGUF_TYPE_STRING, gguf_get_val_str (ctx, i)); break;
case GGUF_TYPE_UINT16: file.write_val<uint16_t>(key, GGUF_TYPE_UINT16, gguf_get_val_u16 (fl->gguf_ctx, i)); break; case GGUF_TYPE_UINT16: file.write_val<uint16_t>(key, GGUF_TYPE_UINT16, gguf_get_val_u16 (ctx, i)); break;
case GGUF_TYPE_UINT32: file.write_val<uint32_t>(key, GGUF_TYPE_UINT32, gguf_get_val_u32 (fl->gguf_ctx, i)); break; case GGUF_TYPE_UINT32: file.write_val<uint32_t>(key, GGUF_TYPE_UINT32, gguf_get_val_u32 (ctx, i)); break;
case GGUF_TYPE_UINT8: file.write_val<uint8_t> (key, GGUF_TYPE_UINT8, gguf_get_val_u8 (fl->gguf_ctx, i)); break; case GGUF_TYPE_UINT8: file.write_val<uint8_t> (key, GGUF_TYPE_UINT8, gguf_get_val_u8 (ctx, i)); break;
case GGUF_TYPE_ARRAY: case GGUF_TYPE_ARRAY:
{ {
const gguf_type arr_type = gguf_get_arr_type(fl->gguf_ctx, i); const gguf_type arr_type = gguf_get_arr_type(ctx, i);
const int n_arr = gguf_get_arr_n (fl->gguf_ctx, i); const int n_arr = gguf_get_arr_n (ctx, i);
if (arr_type == GGUF_TYPE_FLOAT32) { if (arr_type == GGUF_TYPE_FLOAT32) {
write_kv_arr_f32(key, arr_type, i, n_arr); write_kv_arr_f32(key, arr_type, i, n_arr);
} else if (arr_type == GGUF_TYPE_STRING) { } else if (arr_type == GGUF_TYPE_STRING) {
@ -777,9 +777,9 @@ struct gguf_file_saver {
info_offset = file.tell(); info_offset = file.tell();
GGML_ASSERT(gguf_get_data_offset(fl->gguf_ctx) >= info_offset); GGML_ASSERT(gguf_get_data_offset(ctx) >= info_offset);
size_t count = gguf_get_data_offset(fl->gguf_ctx) - info_offset; size_t count = gguf_get_data_offset(ctx) - info_offset;
file.write_zeros(count); file.write_zeros(count);
file.seek(info_offset, SEEK_SET); file.seek(info_offset, SEEK_SET);
GGML_ASSERT(info_offset == file.tell()); GGML_ASSERT(info_offset == file.tell());
@ -3220,7 +3220,7 @@ static void llama_model_quantize_internal(const std::string & fname_inp, const s
} }
std::unique_ptr<llama_model_loader> model_loader(new llama_model_loader(fname_inp, /*use_mmap*/ false)); std::unique_ptr<llama_model_loader> model_loader(new llama_model_loader(fname_inp, /*use_mmap*/ false));
gguf_file_saver file_saver(fname_out.c_str(), model_loader->file_loader.get()); gguf_file_saver file_saver(fname_out.c_str(), model_loader->file_loader->gguf_ctx);
#ifdef GGML_USE_K_QUANTS #ifdef GGML_USE_K_QUANTS
int n_attention_wv = 0; int n_attention_wv = 0;