]> git.djapps.eu Git - pkg/ggml/sources/llama.cpp/commitdiff
ggml-alloc: Don't try to re-use buffers of external tensors (#2562)
authorSam Spilsbury <redacted>
Wed, 9 Aug 2023 20:47:42 +0000 (23:47 +0300)
committerGitHub <redacted>
Wed, 9 Aug 2023 20:47:42 +0000 (22:47 +0200)
* ggml-alloc: Don't try to re-use buffers of external tensors

They might be weights that came from another context, so we
have no control over them (and they might be re-used elsewhere
so writing to them would be a bad idea).

* ggml-alloc: >= when checking for out-of-bounds

Co-authored-by: slaren <redacted>
---------

Co-authored-by: slaren <redacted>
ggml-alloc.c

index 5e1be61ff6cef68fbdc4b24f036e19cdfaa537f1..4121f3dbab20ff82f7b58bd4a18e71bb4435c3ba 100644 (file)
@@ -394,6 +394,14 @@ static void allocate_node(struct ggml_allocr * alloc, struct ggml_tensor * node)
                     if (parent == NULL) {
                         break;
                     }
+
+                    // if the node's data is external, then we cannot re-use it
+                    if ((char *) parent->data < (char *) alloc->data ||
+                        (char *) parent->data >= ((char *) alloc->data + alloc->size)) {
+                        AT_PRINTF("not reusing parent %s for %s as %p is external\n", parent->name, node->name, parent->data);
+                        continue;
+                    }
+
                     struct hash_node * p_hn = hash_get(ht, parent);
                     if (parent->data != NULL && p_hn->n_children == 1 && p_hn->n_views == 0 && ggml_are_same_layout(node, parent)) {
                         if (ggml_is_view(parent)) {