chore: sync with llama.cpp upstream

Author: shubham0204

llama.cpp

@@ -33,10 +33,11 @@ set(SMOLLM_SOURCES
         ${LLAMA_DIR}/src/llama-model-loader.cpp
         ${LLAMA_DIR}/src/llama-impl.cpp
         ${LLAMA_DIR}/src/llama-memory.cpp
+        ${LLAMA_DIR}/src/llama-memory-recurrent.cpp
+        ${LLAMA_DIR}/src/llama-memory-hybrid.cpp
         ${LLAMA_DIR}/src/llama-mmap.cpp
         ${LLAMA_DIR}/src/llama-hparams.cpp
         ${LLAMA_DIR}/src/llama-hparams.cpp
-        ${LLAMA_DIR}/src/llama-kv-cache-recurrent.cpp
         ${LLAMA_DIR}/src/llama-kv-cache-unified-iswa.cpp
         ${LLAMA_DIR}/src/llama-kv-cache-unified.cpp
         ${LLAMA_DIR}/src/llama-batch.cpp
@@ -104,9 +105,17 @@ function(build_library target_name)
             ${VENDOR_DIR}
     )
 
-    # set the compile options for the target `ggml`
-    # targets `llama` and `common` are linked to `ggml`,
-    # thus inheriting the same compile options
+    # Constants GGML_COMMIT and GGML_VERSION in ggml.c
+    # are supplied through llama.cpp's CMake script (that in turn gets them from git)
+    # As we are NOT using llama.cpp's CMake script, we need to define them here
+    # The functions used to access these constants are unused, hence setting them
+    # to empty strings does not affect any functionality.
+    target_compile_definitions(
+            ${target_name}
+            PRIVATE
+            GGML_COMMIT=""
+            GGML_VERSION=""
+    )
 
     # -fvisibility=hidden: hide all symbols by default
     # -fvisibility-inlines-hidden: hide all inline symbols by default
@@ -193,6 +202,17 @@ target_include_directories(
         ${GGML_DIR}/src
         ${GGML_DIR}/src/ggml-cpu
 )
+# Constants GGML_COMMIT and GGML_VERSION in ggml.c
+# are supplied through llama.cpp's CMake script (that in turn gets them from git)
+# As we are NOT using llama.cpp's CMake script, we need to define them here
+# The functions used to access these constants are unused, hence setting them
+# to empty strings does not affect any functionality.
+target_compile_definitions(
+        ${TARGET_NAME_GGUF_READER}
+        PRIVATE
+        GGML_COMMIT=""
+        GGML_VERSION=""
+)
 target_compile_options(
         ${TARGET_NAME_GGUF_READER}
         PUBLIC