refactored.

Author: foldl

.github/workflows/build.yml

@@ -490,8 +490,8 @@ jobs:
             -DGGML_SYCL_F16=ON
           cmake --build build --config Release -j $(nproc)
 
-  build-linux-cross:
-    uses: ./.github/workflows/build-linux-cross.yml
+  #build-linux-cross:
+  #  uses: ./.github/workflows/build-linux-cross.yml
 
   macOS-latest-cmake-ios:
     runs-on: macos-latest

CMakeLists.txt

@@ -55,13 +55,66 @@ set(core_files src/backend.cpp
     src/unicode-data.cpp
     src/vision_process.cpp
     src/audio_process.cpp
+    models/adept.cpp
+    models/allenai.cpp
+    models/alphageo.cpp
+    models/apriel.cpp
+    models/aquila.cpp
+    models/baichuan.cpp
+    models/bailing.cpp
+    models/bce.cpp
+    models/bge.cpp
+    models/bluelm.cpp
+    models/chatglm.cpp
+    models/characterglm.cpp
+    models/codegeex.cpp
+    models/codefuse.cpp
+    models/codellama.cpp
+    models/cohere.cpp
+    models/decilm.cpp
+    models/deepseek.cpp
+    models/dolphinphi2.cpp
     models/ernie.cpp
     models/exaone.cpp
+    models/falcon.cpp
+    models/gemma.cpp
+    models/gigachat.cpp
+    models/granite.cpp
+    models/groq.cpp
+    models/grok.cpp
+    models/hermes.cpp
     models/hunyuan.cpp
+    models/index.cpp
+    models/instella.cpp
+    models/internlm.cpp
+    models/jina.cpp
     models/llama.cpp
+    models/m_a_p.cpp
+    models/megrez.cpp
+    models/minicpm.cpp
+    models/mistral.cpp
+    models/moonshot.cpp
+    models/neuralbeagle.cpp
+    models/numinamath.cpp
+    models/orpheus.cpp
+    models/openchat.cpp
+    models/orion.cpp
+    models/oute.cpp
     models/pangu.cpp
+    models/phi.cpp
     models/qwen.cpp
+    models/reka.cpp
     models/smol.cpp
+    models/solar.cpp
+    models/stablelm.cpp
+    models/starcoder.cpp
+    models/starling.cpp
+    models/telechat.cpp
+    models/tigerbot.cpp
+    models/wizard.cpp
+    models/xverse.cpp
+    models/yi.cpp
+    models/zhinao.cpp
     )
 
 add_library(libchatllm SHARED EXCLUDE_FROM_ALL src/main.cpp ${core_files})

models/adept.cpp

@@ -1,5 +1,8 @@
+#include "../src/models.h"
+#include "../src/models_priv.h"
+#include "../src/vision_process.h"
 
-namespace persimmon
+namespace chatllm::adept::persimmon
 {
     struct Config : public BaseConfig
     {
@@ -149,7 +152,7 @@ namespace persimmon
     }
 }
 
-namespace fuyu
+namespace chatllm::adept::fuyu
 {
     struct Config : public persimmon::Config
     {
@@ -278,7 +281,7 @@ namespace fuyu
             const int total_patches = tok->get_image_total_emb_vectors();
             ggml::tensor *patches = ggml::new_tensor_2d(&ctx, ggml::type::GGML_TYPE_F32, 3 * vis_config.patch_size * vis_config.patch_size, total_patches);
 
-            dbg_ctx = &ctx;
+            set_dbg_ctx(&ctx);
 
             auto r = vis_emb->vision_embed.forward(&ctx, patches);
 
@@ -454,4 +457,10 @@ namespace fuyu
 
         tok->encode("\n\n", ids, false, false);
     }
+}
+
+namespace chatllm
+{
+    REGISTER_MODEL_LOADER(PERSIMMON,             adept::persimmon, 1);
+    REGISTER_MODEL_LOADER(FUYU,                  adept::fuyu, 1);
 }