delete gguf_find_key_array()

Author: katsu560

examples/yolo/yolov3-tiny.cpp

@@ -159,10 +159,6 @@ static bool load_labels(const char * filename, std::vector<std::string> & labels
 
 static bool load_labels_gguf(const struct gguf_context * ctx, const char * filename, std::vector<std::string> & labels)
 {
-    int key_id = gguf_find_key_array(ctx, "embedded_files", filename);
-    if (key_id == -1) {
-        return false;
-    }
     int tensor = gguf_find_tensor(ctx, filename);
     if (tensor == -1) {
         return false;
@@ -206,11 +202,6 @@ static bool load_alphabet_gguf(const struct gguf_context * ctx, std::vector<yolo
         for (int i = 32; i < 127; i++) {
             char fname[256];
             sprintf(fname, "data/labels/%d_%d.png", i, j);
-            int key_id = gguf_find_key_array(ctx, "embedded_files", fname);
-            if (key_id == -1) {
-                fprintf(stderr, "Cannot find '%s' in embedded_files\n", fname);
-                return false;
-            }
             int tensor = gguf_find_tensor(ctx, fname);
             if (tensor == -1) {
                 fprintf(stderr, "Cannot find '%s' in tensor\n", fname);
@@ -602,15 +593,15 @@ int main(int argc, char *argv[])
     }
     std::vector<std::string> labels;
     if (!load_labels_gguf(model.ctx_gguf, "data/coco.names", labels)) {
-        fprintf(stderr, "%s: failed to load labels from 'data/coco.names' in model\n", __func__);
+        fprintf(stderr, "%s: skipped loading labels from 'data/coco.names' in model\n", __func__);
         if (!load_labels("data/coco.names", labels)) {
             fprintf(stderr, "%s: failed to load labels from 'data/coco.names'\n", __func__);
             return 1;
         }
     }
     std::vector<yolo_image> alphabet;
     if (!load_alphabet_gguf(model.ctx_gguf, alphabet)) {
-        fprintf(stderr, "%s: failed to load alphabet from model\n", __func__);
+        fprintf(stderr, "%s: skipped loading alphabet from model\n", __func__);
         if (!load_alphabet(alphabet)) {
             fprintf(stderr, "%s: failed to load alphabet\n", __func__);
             return 1;

include/ggml/ggml.h

@@ -2305,7 +2305,6 @@ extern "C" {
 
     GGML_API int          gguf_get_n_kv(const struct gguf_context * ctx);
     GGML_API int          gguf_find_key(const struct gguf_context * ctx, const char * key);
-    GGML_API int          gguf_find_key_array(const struct gguf_context * ctx, const char * key, const char * val);
     GGML_API const char * gguf_get_key (const struct gguf_context * ctx, int key_id);
 
     GGML_API enum gguf_type gguf_get_kv_type (const struct gguf_context * ctx, int key_id);

src/ggml.c

@@ -21791,37 +21791,6 @@ int gguf_find_key(const struct gguf_context * ctx, const char * key) {
     return keyfound;
 }
 
-int gguf_find_key_array(const struct gguf_context * ctx, const char * key, const char * val) {
-    // return -1 if key not found
-    int keyfound = -1;
-    int key_id = -1;
-
-    const int n_kv = gguf_get_n_kv(ctx);
-
-    for (int i = 0; i < n_kv; ++i) {
-        if (strcmp(key, gguf_get_key(ctx, i)) == 0) {
-            key_id = i;
-            break;
-        }
-    }
-
-    if (key_id != -1) {
-        if (ctx->kv[key_id].type == GGUF_TYPE_ARRAY) {
-            const int n = gguf_get_arr_n(ctx, key_id); 
-            struct gguf_kv * kv = &ctx->kv[key_id];
-
-            for (int i = 0; i < n; ++i) {
-                struct gguf_str * str = &((struct gguf_str *) kv->value.arr.data)[i];
-                if (strcmp(val, str->data) == 0) {
-                    keyfound = i;
-                }
-            }
-        }
-    }
-
-    return keyfound;
-}
-
 const char * gguf_get_key(const struct gguf_context * ctx, int key_id) {
     GGML_ASSERT(key_id >= 0 && key_id < gguf_get_n_kv(ctx));
     return ctx->kv[key_id].key.data;