0013-re-enable-gpu-for-clip.patch 2.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
  2. From: jmorganca <jmorganca@gmail.com>
  3. Date: Sat, 4 Jan 2025 22:52:48 -0800
  4. Subject: [PATCH] re-enable gpu for clip
  5. ---
  6. examples/llava/clip.cpp | 86 ++++++++++++++++++++---------------------
  7. 1 file changed, 43 insertions(+), 43 deletions(-)
  8. diff --git a/examples/llava/clip.cpp b/examples/llava/clip.cpp
  9. index b3c1829f..718052e1 100644
  10. --- a/examples/llava/clip.cpp
  11. +++ b/examples/llava/clip.cpp
  12. @@ -8,25 +8,25 @@
  13. #include "ggml-alloc.h"
  14. #include "ggml-backend.h"
  15. -//#ifdef GGML_USE_CUDA
  16. -//#include "ggml-cuda.h"
  17. -//#endif
  18. -//
  19. -//#ifdef GGML_USE_SYCL
  20. -//#include "ggml-sycl.h"
  21. -//#endif
  22. -//
  23. -//#ifdef GGML_USE_METAL
  24. -//#include "ggml-metal.h"
  25. -//#endif
  26. -//
  27. -//#ifdef GGML_USE_CANN
  28. -//#include "ggml-cann.h"
  29. -//#endif
  30. -//
  31. -//#ifdef GGML_USE_VULKAN
  32. -//#include "ggml-vulkan.h"
  33. -//#endif
  34. +#ifdef GGML_USE_CUDA
  35. +#include "ggml-cuda.h"
  36. +#endif
  37. +
  38. +#ifdef GGML_USE_SYCL
  39. +#include "ggml-sycl.h"
  40. +#endif
  41. +
  42. +#ifdef GGML_USE_METAL
  43. +#include "ggml-metal.h"
  44. +#endif
  45. +
  46. +#ifdef GGML_USE_CANN
  47. +#include "ggml-cann.h"
  48. +#endif
  49. +
  50. +#ifdef GGML_USE_VULKAN
  51. +#include "ggml-vulkan.h"
  52. +#endif
  53. #define STB_IMAGE_IMPLEMENTATION
  54. #include "stb_image.h"
  55. @@ -1235,30 +1235,30 @@ struct clip_ctx * clip_model_load(const char * fname, const int verbosity = 1) {
  56. }
  57. }
  58. -//#ifdef GGML_USE_CUDA
  59. -// new_clip->backend = ggml_backend_cuda_init(0);
  60. -// LOG_INF("%s: CLIP using CUDA backend\n", __func__);
  61. -//#endif
  62. -//
  63. -//#ifdef GGML_USE_METAL
  64. -// new_clip->backend = ggml_backend_metal_init();
  65. -// LOG_INF("%s: CLIP using Metal backend\n", __func__);
  66. -//#endif
  67. -//
  68. -//#ifdef GGML_USE_CANN
  69. -// new_clip->backend = ggml_backend_cann_init(0);
  70. -// LOG_INF("%s: CLIP using CANN backend\n", __func__);
  71. -//#endif
  72. -//
  73. -//#ifdef GGML_USE_VULKAN
  74. -// new_clip->backend = ggml_backend_vk_init(0);
  75. -// LOG_INF("%s: CLIP using Vulkan backend\n", __func__);
  76. -//#endif
  77. -//
  78. -//#ifdef GGML_USE_SYCL
  79. -// new_clip->backend = ggml_backend_sycl_init(0);
  80. -// LOG_INF("%s: CLIP using SYCL backend\n", __func__);
  81. -//#endif
  82. +#ifdef GGML_USE_CUDA
  83. + new_clip->backend = ggml_backend_cuda_init(0);
  84. + LOG_INF("%s: CLIP using CUDA backend\n", __func__);
  85. +#endif
  86. +
  87. +#ifdef GGML_USE_METAL
  88. + new_clip->backend = ggml_backend_metal_init();
  89. + LOG_INF("%s: CLIP using Metal backend\n", __func__);
  90. +#endif
  91. +
  92. +#ifdef GGML_USE_CANN
  93. + new_clip->backend = ggml_backend_cann_init(0);
  94. + LOG_INF("%s: CLIP using CANN backend\n", __func__);
  95. +#endif
  96. +
  97. +#ifdef GGML_USE_VULKAN
  98. + new_clip->backend = ggml_backend_vk_init(0);
  99. + LOG_INF("%s: CLIP using Vulkan backend\n", __func__);
  100. +#endif
  101. +
  102. +#ifdef GGML_USE_SYCL
  103. + new_clip->backend = ggml_backend_sycl_init(0);
  104. + LOG_INF("%s: CLIP using SYCL backend\n", __func__);
  105. +#endif
  106. if (!new_clip->backend) {
  107. new_clip->backend = ggml_backend_cpu_init();