Skip to content

Commit d0304f7

Browse files
Anontrollkotze
Anon
authored andcommitted
llama_control_vector_load: free gguf_context before ggml_context
1 parent 9914014 commit d0304f7

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

common/common.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2673,40 +2673,40 @@ static llama_control_vector_data llama_control_vector_load_one(const llama_contr
26732673
uint32_t layer = std::stoi(name.substr(dotpos + 1));
26742674
if (layer == 0) {
26752675
fprintf(stderr, "%s: direction tensor invalid in %s\n", __func__, load_info.fname.c_str());
2676-
ggml_free(meta_ctx);
26772676
gguf_free(meta_ctx_gguf);
2677+
ggml_free(meta_ctx);
26782678
return result;
26792679
}
26802680
if (layer > max_direction_layer) {
26812681
max_direction_layer = layer;
26822682
}
26832683
} catch (...) {
26842684
fprintf(stderr, "%s: direction tensor invalid in %s\n", __func__, load_info.fname.c_str());
2685-
ggml_free(meta_ctx);
26862685
gguf_free(meta_ctx_gguf);
2686+
ggml_free(meta_ctx);
26872687
return result;
26882688
}
26892689
}
26902690

26912691
struct ggml_tensor * tensor_meta = ggml_get_tensor(meta_ctx, name.c_str());
26922692
if (tensor_meta->type != GGML_TYPE_F32 || ggml_n_dims(tensor_meta) != 1) {
26932693
fprintf(stderr, "%s: direction tensor invalid in %s\n", __func__, load_info.fname.c_str());
2694-
ggml_free(meta_ctx);
26952694
gguf_free(meta_ctx_gguf);
2695+
ggml_free(meta_ctx);
26962696
return result;
26972697
}
26982698
if (result.n_embd == -1) {
26992699
result.n_embd = ggml_nelements(tensor_meta);
27002700
} else if (ggml_nelements(tensor_meta) != result.n_embd) {
27012701
fprintf(stderr, "%s: direction tensor sizes mismatched in %s\n", __func__, load_info.fname.c_str());
2702-
ggml_free(meta_ctx);
27032702
gguf_free(meta_ctx_gguf);
2703+
ggml_free(meta_ctx);
27042704
return result;
27052705
}
27062706
n_bytes += ggml_nbytes(tensor_meta);
27072707
}
2708-
ggml_free(meta_ctx);
27092708
gguf_free(meta_ctx_gguf);
2709+
ggml_free(meta_ctx);
27102710
}
27112711

27122712
if (n_tensors == 0) {

0 commit comments

Comments
 (0)