From e3648474d6220c25e7fd1bda92e35e4e20753c92 Mon Sep 17 00:00:00 2001
From: Thiago Padilha <thiago@padilha.cc>
Date: Sat, 18 Mar 2023 11:58:11 -0300
Subject: [PATCH] Add main.cpp back, and invoke llama_main from it

Signed-off-by: Thiago Padilha <thiago@padilha.cc>
---
 CMakeLists.txt | 3 ++-
 Makefile       | 7 +++++--
 llama.cpp      | 2 +-
 llama.h        | 2 ++
 main.cpp       | 5 +++++
 5 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 main.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 803e9b273..09ac18b1a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -107,8 +107,9 @@ endif()
 # endif()
 
 add_executable(llama
-    llama.cpp
+    main.cpp
     utils.cpp
+    llama.cpp
     utils.h)
 
 add_executable(quantize
diff --git a/Makefile b/Makefile
index b03c7a083..b7abaa9a0 100644
--- a/Makefile
+++ b/Makefile
@@ -188,11 +188,14 @@ ggml.o: ggml.c ggml.h
 utils.o: utils.cpp utils.h
 	$(CXX) $(CXXFLAGS) -c utils.cpp -o utils.o
 
+llama.o: llama.cpp llama.h
+	$(CXX) $(CXXFLAGS) -c llama.cpp -o llama.o
+
 clean:
 	rm -f *.o main quantize
 
-main: llama.cpp ggml.o utils.o
-	$(CXX) $(CXXFLAGS) llama.cpp ggml.o utils.o -o main $(LDFLAGS)
+main: main.cpp ggml.o utils.o llama.o
+	$(CXX) $(CXXFLAGS) main.cpp ggml.o utils.o llama.o -o main $(LDFLAGS)
 	./main -h
 
 quantize: quantize.cpp ggml.o utils.o
diff --git a/llama.cpp b/llama.cpp
index 2450e1c3d..21369cea2 100644
--- a/llama.cpp
+++ b/llama.cpp
@@ -733,7 +733,7 @@ const char * llama_print_system_info(void) {
     return s.c_str();
 }
 
-int main(int argc, char ** argv) {
+int llama_main(int argc, char ** argv) {
     ggml_time_init();
     const int64_t t_main_start_us = ggml_time_us();
 
diff --git a/llama.h b/llama.h
index 84f4db408..ea71c7402 100644
--- a/llama.h
+++ b/llama.h
@@ -57,3 +57,5 @@ struct llama_model {
     struct ggml_context * ctx;
     std::map<std::string, struct ggml_tensor *> tensors;
 };
+
+int llama_main(int argc, char ** argv);
diff --git a/main.cpp b/main.cpp
new file mode 100644
index 000000000..8b9a3ff50
--- /dev/null
+++ b/main.cpp
@@ -0,0 +1,5 @@
+#include "llama.h"
+
+int main(int argc, char ** argv) {
+    return llama_main(argc, argv);
+}