update

768ab4df · xuxzh1 · 44f79c7e · 768ab4df · 768ab4df · 768ab4df
Commit 768ab4df authored Nov 13, 2024 by xuxzh1 🎱
20 changed files
--- a/llm/llama.cpp/examples/llama.swiftui/llama.swiftui/llama_swiftuiApp.swift
+++ b/llm/llama.cpp/examples/llama.swiftui/llama.swiftui/llama_swiftuiApp.swift
--- a/llm/llama.cpp/examples/llama.vim
+++ b/llm/llama.cpp/examples/llama.vim
--- a/llm/llama.cpp/examples/llava/CMakeLists.txt
+++ b/llm/llama.cpp/examples/llava/CMakeLists.txt
--- a/llm/llama.cpp/examples/llava/MobileVLM-README.md
+++ b/llm/llama.cpp/examples/llava/MobileVLM-README.md
--- a/llm/llama.cpp/examples/llava/README.md
+++ b/llm/llama.cpp/examples/llava/README.md
--- a/llm/llama.cpp/examples/llava/android/adb_run.sh
+++ b/llm/llama.cpp/examples/llava/android/adb_run.sh
--- a/llm/llama.cpp/examples/llava/android/build_64.sh
+++ b/llm/llama.cpp/examples/llava/android/build_64.sh
--- a/llm/llama.cpp/examples/llava/clip.cpp
+++ b/llm/llama.cpp/examples/llava/clip.cpp
@@ -3,6 +3,7 @@
 // I'll gradually clean and extend it
 // Note: Even when using identical normalized image inputs (see normalize_image_u8_to_f32()) we have a significant difference in resulting embeddings compared to pytorch
 #include "clip.h"
+#include "common.h"
 #include "log.h"
 #include "ggml.h"
 #include "ggml-alloc.h"
@@ -36,6 +37,14 @@
 #include <cinttypes>
 #include <limits>

+#if defined(_WIN32)
+#define WIN32_LEAN_AND_MEAN
+#ifndef NOMINMAX
+    #define NOMINMAX
+#endif
+#include <windows.h>
+#endif
+
 //#define CLIP_DEBUG_FUNCTIONS

 // RGB uint8 image
@@ -1064,7 +1073,22 @@ struct clip_ctx * clip_model_load(const char * fname, const int verbosity = 1) {
            return nullptr;
        }

+#ifdef _WIN32
+        int wlen = MultiByteToWideChar(CP_UTF8, 0, fname, -1, NULL, 0);
+        if (!wlen) {
+            return NULL;
+        }
+        wchar_t * wbuf = (wchar_t *) malloc(wlen * sizeof(wchar_t));
+        wlen = MultiByteToWideChar(CP_UTF8, 0, fname, -1, wbuf, wlen);
+        if (!wlen) {
+            free(wbuf);
+            return NULL;
+        }
+        auto fin = std::ifstream(wbuf, std::ios::binary);
+        free(wbuf);
+#else
        auto fin = std::ifstream(fname, std::ios::binary);
+#endif
        if (!fin) {
            LOG_TEE("cannot open model file for loading tensors\n");
            clip_free(new_clip);

--- a/llm/llama.cpp/examples/llava/clip.h
+++ b/llm/llama.cpp/examples/llava/clip.h
--- a/llm/llama.cpp/examples/llava/convert_image_encoder_to_gguf.py
+++ b/llm/llama.cpp/examples/llava/convert_image_encoder_to_gguf.py
--- a/llm/llama.cpp/examples/llava/llava-cli.cpp
+++ b/llm/llama.cpp/examples/llava/llava-cli.cpp
--- a/llm/llama.cpp/examples/llava/llava.cpp
+++ b/llm/llama.cpp/examples/llava/llava.cpp
--- a/llm/llama.cpp/examples/llava/llava.h
+++ b/llm/llama.cpp/examples/llava/llava.h
--- a/llm/llama.cpp/examples/llava/llava_surgery.py
+++ b/llm/llama.cpp/examples/llava/llava_surgery.py
--- a/llm/llama.cpp/examples/llava/llava_surgery_v2.py
+++ b/llm/llama.cpp/examples/llava/llava_surgery_v2.py
--- a/llm/llama.cpp/examples/llava/requirements.txt
+++ b/llm/llama.cpp/examples/llava/requirements.txt
--- a/llm/llama.cpp/examples/llm.vim
+++ b/llm/llama.cpp/examples/llm.vim
--- a/llm/llama.cpp/examples/lookahead/CMakeLists.txt
+++ b/llm/llama.cpp/examples/lookahead/CMakeLists.txt
--- a/llm/llama.cpp/examples/lookahead/README.md
+++ b/llm/llama.cpp/examples/lookahead/README.md
--- a/llm/llama.cpp/examples/lookahead/lookahead.cpp
+++ b/llm/llama.cpp/examples/lookahead/lookahead.cpp