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

ggml: fix ggml_graph_cpy undefined behavior (ggml/943)

Browse source
This commit is contained in:
Johannes Gäßler 2024-08-31 14:35:42 +02:00 • committed by Georgi Gerganov
parent ba1cf846ed
commit dbbebcab33
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ggml/include/ggml.h
View file

@ -681,8 +681,8 @@ extern "C" {
struct ggml_hash_set {
size_t size;
ggml_bitset_t * used;
struct ggml_tensor ** keys;
ggml_bitset_t * used; // whether or not the keys are in use i.e. set
struct ggml_tensor ** keys; // actual tensors in the set, keys[i] is only defined if ggml_bitset_get(used, i)
};
// computation graph

3
ggml/src/ggml.c
View file

@ -19130,7 +19130,8 @@ void ggml_graph_cpy(struct ggml_cgraph * src, struct ggml_cgraph * dst) {
}
for (size_t i = 0; i < src->visited_hash_set.size; ++i) {
if (src->visited_hash_set.keys[i]) {
// copy all hashset keys (tensors) that are in use
if (ggml_bitset_get(src->visited_hash_set.used, i)) {
ggml_hash_insert(&dst->visited_hash_set, src->visited_hash_set.keys[i]);
}
}