Commit `0966ee2`

mo khan <mo@mokhan.ca>

2026-09-05 19:50:08

refactor: move elelem_llama to elelem/llama/

main

1 parent cd8d0d4

Changed files (3)

ext

elelem

llama

elelem.cpp

extconf.rb

lib

elelem

llama

client.rb

ext/elelem/llama/elelem_llama.cpp → ext/elelem/llama/elelem.cpp

File renamed without changes

ext/elelem/llama/extconf.rb

@@ -3,10 +3,10 @@
 require "fileutils"
 
 EXT_DIR   = __dir__
-GEM_ROOT  = File.expand_path("../..", EXT_DIR)
+GEM_ROOT  = File.expand_path("../../..", EXT_DIR)
 VENDOR    = File.join(GEM_ROOT, "vendor", "llama.cpp")
 BUILD_DIR = File.join(EXT_DIR, "build")
-NATIVE    = File.join(GEM_ROOT, "lib", "elelem", "native")
+NATIVE    = File.join(GEM_ROOT, "lib", "elelem", "gguf")
 STAMP     = File.join(BUILD_DIR, ".elelem_backend") # last backend built here
 VALID_BACKENDS = %w[cpu vulkan cuda].freeze
 
@@ -108,7 +108,7 @@ run(cxx, "-std=c++17", "-O2", "-Wall", "-Wextra", "-shared", "-fPIC",
     "-I", File.join(VENDOR, "ggml", "include"),
     "-I", File.join(VENDOR, "common"),   # chat.h (common_chat)
     "-I", File.join(VENDOR, "vendor"),   # nlohmann/json.hpp
-    File.join(EXT_DIR, "elelem_llama.cpp"),
+    File.join(EXT_DIR, "elelem/llama/elelem.cpp"),
     "-o", File.join(NATIVE, "libelelem_llama.so"),
     "-L", libdir, "-lllama-common", "-lllama",
     "-Wl,-rpath,$ORIGIN")

lib/elelem/llama/client.rb

@@ -6,7 +6,7 @@ require "json"
 module Elelem
   module Net
     class GGUF
-      NATIVE = File.expand_path("native", __dir__)
+      NATIVE = File.expand_path("gguf", __dir__)
       SHIM = File.join(NATIVE, "libelelem_llama.so")
       V = Fiddle::TYPE_VOIDP
       I = Fiddle::TYPE_INT
@@ -43,7 +43,7 @@ module Elelem
 
         Elelem.logger.debug("gguf: tool-call fallback used") if result["fallback"]
         Elelem.logger.debug("gguf: harmony tag fallback used") if result["harmony_tag_fallback"]
-        Elelem.logger.warn("gguf: native generate error: #{result["error"]}") if result["error"]
+        Elelem.logger.warn("gguf: generate error: #{result["error"]}") if result["error"]
         if result["ms_decode"]
           Elelem.logger.debug(format(
             "gguf: reset=%.0fms prefill=%.0fms (n=%d, %d reused) decode=%.0fms (n=%d)",

Commit 0966ee2

Commit `0966ee2`