0007-clip-unicode.patch 1.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354
  1. From ae2b188a679c83ce105aa1e823499441dfab3c57 Mon Sep 17 00:00:00 2001
  2. From: Michael Yang <mxyng@pm.me>
  3. Date: Mon, 16 Sep 2024 15:53:15 -0700
  4. Subject: [PATCH] 07-clip-unicode.diff
  5. ---
  6. examples/llava/clip.cpp | 23 +++++++++++++++++++++++
  7. 1 file changed, 23 insertions(+)
  8. diff --git a/examples/llava/clip.cpp b/examples/llava/clip.cpp
  9. index cb51793d..8716472b 100644
  10. --- a/examples/llava/clip.cpp
  11. +++ b/examples/llava/clip.cpp
  12. @@ -41,6 +41,14 @@
  13. #include <cinttypes>
  14. #include <limits>
  15. +#if defined(_WIN32)
  16. +#define WIN32_LEAN_AND_MEAN
  17. +#ifndef NOMINMAX
  18. + #define NOMINMAX
  19. +#endif
  20. +#include <windows.h>
  21. +#endif
  22. +
  23. //#define CLIP_DEBUG_FUNCTIONS
  24. // RGB uint8 image
  25. @@ -1223,7 +1231,22 @@ struct clip_ctx * clip_model_load(const char * fname, const int verbosity = 1) {
  26. return nullptr;
  27. }
  28. +#ifdef _WIN32
  29. + int wlen = MultiByteToWideChar(CP_UTF8, 0, fname, -1, NULL, 0);
  30. + if (!wlen) {
  31. + return NULL;
  32. + }
  33. + wchar_t * wbuf = (wchar_t *) malloc(wlen * sizeof(wchar_t));
  34. + wlen = MultiByteToWideChar(CP_UTF8, 0, fname, -1, wbuf, wlen);
  35. + if (!wlen) {
  36. + free(wbuf);
  37. + return NULL;
  38. + }
  39. + auto fin = std::ifstream(wbuf, std::ios::binary);
  40. + free(wbuf);
  41. +#else
  42. auto fin = std::ifstream(fname, std::ios::binary);
  43. +#endif
  44. if (!fin) {
  45. LOG_TEE("cannot open model file for loading tensors\n");
  46. clip_free(new_clip);
  47. --
  48. 2.46.0