From: AT <redacted>
Date: Tue, 13 Feb 2024 21:44:25 +0000 (-0600)
Subject: Early return for zero size calls to get_tensor. (llama/5482)
X-Git-Tag: upstream/1.7.4~999
X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=31591649a06384d0e429df12f5ba9005a8b1ccc0;p=pkg%2Fggml%2Fsources%2Fwhisper.cpp

Early return for zero size calls to get_tensor. (llama/5482)

* Early return for zero size calls to get_tensor.

Signed-off-by: Adam Treat <redacted>

* Update ggml-kompute.cpp

Co-authored-by: Georgi Gerganov <redacted>

* Update ggml-kompute.cpp

Co-authored-by: Georgi Gerganov <redacted>

* Add an early return to the get/set tensor when the size is null.

Signed-off-by: Adam Treat <redacted>

* Early return after the assertions.

Signed-off-by: Adam Treat <redacted>

* Since we do the early return in the generic backend now no reason to do so here as well.

Signed-off-by: Adam Treat <redacted>

---------

Signed-off-by: Adam Treat <redacted>
Co-authored-by: Georgi Gerganov <redacted>
---

diff --git a/ggml-backend.c b/ggml-backend.c
index 9ee81b76..87eea844 100644
--- a/ggml-backend.c
+++ b/ggml-backend.c
@@ -219,6 +219,10 @@ GGML_CALL void ggml_backend_tensor_set(struct ggml_tensor * tensor, const void *
     GGML_ASSERT(buf != NULL && "tensor buffer not set");
     GGML_ASSERT(offset + size <= ggml_nbytes(tensor) && "tensor write out of bounds");
 
+    if (!size) {
+        return;
+    }
+
     tensor->buffer->iface.set_tensor(buf, tensor, data, offset, size);
 }
 
@@ -229,6 +233,10 @@ GGML_CALL void ggml_backend_tensor_get(const struct ggml_tensor * tensor, void *
     GGML_ASSERT(tensor->buffer != NULL && "tensor buffer not set");
     GGML_ASSERT(offset + size <= ggml_nbytes(tensor) && "tensor read out of bounds");
 
+    if (!size) {
+        return;
+    }
+
     tensor->buffer->iface.get_tensor(buf, tensor, data, offset, size);
 }