From 0995df5c9e66b23242960538b8682b3ca086a64c Mon Sep 17 00:00:00 2001
From: Thomas Antony <mail@thomasantony.com>
Date: Mon, 13 Mar 2023 23:10:22 -0700
Subject: [PATCH] Add to CMakeLists.txt

---
 CMakeLists.txt | 65 +++++++++++++++++++++++++++++---------------------
 1 file changed, 38 insertions(+), 27 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 38e7266dc..ded54b4b6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,56 +7,57 @@ set(CMAKE_C_STANDARD 11)
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
 
-if (NOT XCODE AND NOT MSVC AND NOT CMAKE_BUILD_TYPE)
+if(NOT XCODE AND NOT MSVC AND NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type" FORCE)
     set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
 endif()
 
-option(LLAMA_ALL_WARNINGS            "llama: enable all compiler warnings"                   ON)
-option(LLAMA_ALL_WARNINGS_3RD_PARTY  "llama: enable all compiler warnings in 3rd party libs" OFF)
+option(LLAMA_ALL_WARNINGS "llama: enable all compiler warnings" ON)
+option(LLAMA_ALL_WARNINGS_3RD_PARTY "llama: enable all compiler warnings in 3rd party libs" OFF)
 
-option(LLAMA_SANITIZE_THREAD         "llama: enable thread sanitizer"    OFF)
-option(LLAMA_SANITIZE_ADDRESS        "llama: enable address sanitizer"   OFF)
-option(LLAMA_SANITIZE_UNDEFINED      "llama: enable undefined sanitizer" OFF)
+option(LLAMA_SANITIZE_THREAD "llama: enable thread sanitizer" OFF)
+option(LLAMA_SANITIZE_ADDRESS "llama: enable address sanitizer" OFF)
+option(LLAMA_SANITIZE_UNDEFINED "llama: enable undefined sanitizer" OFF)
 
-if (APPLE)
-    option(LLAMA_NO_ACCELERATE       "llama: disable Accelerate framework" OFF)
-    option(LLAMA_NO_AVX              "llama: disable AVX" OFF)
-    option(LLAMA_NO_AVX2             "llama: disable AVX2" OFF)
-    option(LLAMA_NO_FMA              "llama: disable FMA" OFF)
+if(APPLE)
+    option(LLAMA_NO_ACCELERATE "llama: disable Accelerate framework" OFF)
+    option(LLAMA_NO_AVX "llama: disable AVX" OFF)
+    option(LLAMA_NO_AVX2 "llama: disable AVX2" OFF)
+    option(LLAMA_NO_FMA "llama: disable FMA" OFF)
 endif()
 
-if (NOT MSVC)
-    if (LLAMA_SANITIZE_THREAD)
-        set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -fsanitize=thread")
+if(NOT MSVC)
+    if(LLAMA_SANITIZE_THREAD)
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}   -fsanitize=thread")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=thread")
     endif()
 
-    if (LLAMA_SANITIZE_ADDRESS)
+    if(LLAMA_SANITIZE_ADDRESS)
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}     -fsanitize=address -fno-omit-frame-pointer")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
     endif()
 
-    if (LLAMA_SANITIZE_UNDEFINED)
+    if(LLAMA_SANITIZE_UNDEFINED)
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}     -fsanitize=undefined")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined")
     endif()
 endif()
 
-if (APPLE AND NOT LLAMA_NO_ACCELERATE)
+if(APPLE AND NOT LLAMA_NO_ACCELERATE)
     find_library(ACCELERATE_FRAMEWORK Accelerate)
-    if (ACCELERATE_FRAMEWORK)
+
+    if(ACCELERATE_FRAMEWORK)
         message(STATUS "Accelerate framework found")
 
-        set(LLAMA_EXTRA_LIBS  ${LLAMA_EXTRA_LIBS}  ${ACCELERATE_FRAMEWORK})
+        set(LLAMA_EXTRA_LIBS ${LLAMA_EXTRA_LIBS} ${ACCELERATE_FRAMEWORK})
         set(LLAMA_EXTRA_FLAGS ${LLAMA_EXTRA_FLAGS} -DGGML_USE_ACCELERATE)
     else()
         message(WARNING "Accelerate framework not found")
     endif()
 endif()
 
-if (LLAMA_ALL_WARNINGS)
-    if (NOT MSVC)
+if(LLAMA_ALL_WARNINGS)
+    if(NOT MSVC)
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
             -Wall                           \
             -Wextra                         \
@@ -80,11 +81,12 @@ endif()
 
 message(STATUS "CMAKE_SYSTEM_PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}")
 
-if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
+if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
     message(STATUS "ARM detected")
 else()
     message(STATUS "x86 detected")
-    if (MSVC)
+
+    if(MSVC)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /arch:AVX2")
         set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /arch:AVX2")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /arch:AVX2")
@@ -92,22 +94,25 @@ else()
         if(NOT LLAMA_NO_AVX)
             set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mavx")
         endif()
+
         if(NOT LLAMA_NO_AVX2)
             set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mavx2")
         endif()
+
         if(NOT LLAMA_NO_FMA)
             set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfma")
         endif()
+
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mf16c")
     endif()
 endif()
 
 # if (LLAMA_PERF)
-#     set(LLAMA_EXTRA_FLAGS ${LLAMA_EXTRA_FLAGS} -DGGML_PERF)
+# set(LLAMA_EXTRA_FLAGS ${LLAMA_EXTRA_FLAGS} -DGGML_PERF)
 # endif()
-
 add_executable(llama
     main.cpp
+    llama.cpp
     utils.cpp
     utils.h)
 
@@ -116,6 +121,9 @@ add_executable(quantize
     utils.cpp
     utils.h)
 
+add_library(llamalib
+    llama.cpp)
+
 add_library(ggml
     ggml.c
     ggml.h)
@@ -125,7 +133,10 @@ target_compile_definitions(llama PUBLIC ${LLAMA_EXTRA_FLAGS})
 target_compile_definitions(quantize PUBLIC ${LLAMA_EXTRA_FLAGS})
 
 target_link_libraries(ggml PRIVATE ${LLAMA_EXTRA_LIBS})
+target_link_libraries(llamalib PRIVATE ggml ${LLAMA_EXTRA_LIBS})
+
 target_include_directories(ggml PUBLIC .)
-target_link_libraries(quantize PRIVATE ggml)
-target_link_libraries(llama PRIVATE ggml)
+
+target_link_libraries(quantize PRIVATE ggml llamalib)
+target_link_libraries(llama PRIVATE ggml llamalib)
 target_link_libraries(ggml PRIVATE Threads::Threads)