ggml : tag ggml_tensor::backend as deprecated (llama/7290)

diff --git a/include/ggml/ggml.h b/include/ggml/ggml.h
index 5e121604a80e6177f4db1912d630629092ef8fa3..8c13f4ba89c6e71a492a182eadbb008e8e810d77 100644 (file)
--- a/include/ggml/ggml.h
+++ b/include/ggml/ggml.h
@@ -565,7 +565,8 @@ extern "C" {
     // n-dimensional tensor
     struct ggml_tensor {
         enum ggml_type         type;
-        enum ggml_backend_type backend;
+
+        GGML_DEPRECATED(enum ggml_backend_type backend, "use the buffer type to find the storage location of the tensor");
 
         struct ggml_backend_buffer * buffer;
 

diff --git a/src/ggml-backend.c b/src/ggml-backend.c
index dd090a583f685c6f5508b1df654f9b933ae7af68..9e35ce98d7ace898338369bdfd36ef26d3213bfb 100644 (file)
--- a/src/ggml-backend.c
+++ b/src/ggml-backend.c
@@ -1895,7 +1895,6 @@ void ggml_backend_view_init(ggml_backend_buffer_t buffer, struct ggml_tensor * t
 
     tensor->buffer = buffer;
     tensor->data = (char *)tensor->view_src->data + tensor->view_offs;
-    tensor->backend = tensor->view_src->backend;
     ggml_backend_buffer_init_tensor(buffer, tensor);
 }
 

diff --git a/src/ggml.c b/src/ggml.c
index f09cc30609bfd7d189a7fea50438853934b327ac..67e17a2102b166ef6b6a984c815f60922def59a6 100644 (file)
--- a/src/ggml.c
+++ b/src/ggml.c
@@ -3178,6 +3178,12 @@ static struct ggml_tensor * ggml_new_tensor_impl(
 
     struct ggml_tensor * const result = (struct ggml_tensor *)((char *)ctx->mem_buffer + obj_new->offs);
 
+#ifdef __clang__
+    // temporary until ggml_tensor::backend is removed
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
     *result = (struct ggml_tensor) {
         /*.type         =*/ type,
         /*.backend      =*/ GGML_BACKEND_TYPE_CPU,
@@ -3200,6 +3206,10 @@ static struct ggml_tensor * ggml_new_tensor_impl(
         /*.padding      =*/ { 0 },
     };
 
+#ifdef __clang__
+    #pragma clang diagnostic pop
+#endif
+
     // TODO: this should not be needed as long as we don't rely on aligned SIMD loads
     //ggml_assert_aligned(result->data);