summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ggml-alloc.c2
-rw-r--r--ggml-cuda.cu8
2 files changed, 5 insertions, 5 deletions
diff --git a/ggml-alloc.c b/ggml-alloc.c
index a97436b1..a27dd54b 100644
--- a/ggml-alloc.c
+++ b/ggml-alloc.c
@@ -72,7 +72,7 @@ static void remove_allocated_tensor(ggml_tallocr_t alloc, struct ggml_tensor * t
// check if a tensor is allocated by this buffer
static bool ggml_tallocr_is_own(ggml_tallocr_t alloc, const struct ggml_tensor * tensor) {
- return tensor->buffer == alloc->buffer;
+ return tensor->buffer == alloc->buffer && (!tensor->view_src || tensor->view_src->buffer == alloc->buffer);
}
static bool ggml_is_view(struct ggml_tensor * t) {
diff --git a/ggml-cuda.cu b/ggml-cuda.cu
index b124774a..7c2a834e 100644
--- a/ggml-cuda.cu
+++ b/ggml-cuda.cu
@@ -5273,17 +5273,17 @@ static __global__ void im2col_f32_f16(
const int ky = (i - kd) / OW;
const int ix = i % OW;
- const int iiw = ix * s0 + kx * d0 - p0;
- const int iih = blockIdx.y * s1 + ky * d1 - p1;
+ const int64_t iiw = ix * s0 + kx * d0 - p0;
+ const int64_t iih = blockIdx.y * s1 + ky * d1 - p1;
- const int offset_dst =
+ const int64_t offset_dst =
(blockIdx.y * OW + ix) * CHW +
(blockIdx.z * (KW * KH) + ky * KW + kx);
if (iih < 0 || iih >= IH || iiw < 0 || iiw >= IW) {
dst[offset_dst] = __float2half(0.0f);
} else {
- const int offset_src = blockIdx.z * offset_delta;
+ const int64_t offset_src = blockIdx.z * offset_delta;
dst[offset_dst] = __float2half(x[offset_src + iih * IW + iiw]);
}
}