Skip to content

Commit 3500dd2

Browse files
committed
Add main.cpp back, and invoke llama_main from it
Signed-off-by: Thiago Padilha <[email protected]>
1 parent 3a61cf6 commit 3500dd2

File tree

5 files changed

+14
-3
lines changed

5 files changed

+14
-3
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ endif()
213213
#
214214

215215
add_executable(llama
216+
main.cpp
216217
llama.cpp)
217218

218219
add_executable(quantize quantize.cpp)

Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,11 +223,14 @@ ggml.o: ggml.c ggml.h
223223
utils.o: utils.cpp utils.h
224224
$(CXX) $(CXXFLAGS) -c utils.cpp -o utils.o
225225

226+
llama.o: llama.cpp llama.h
227+
$(CXX) $(CXXFLAGS) -c llama.cpp -o llama.o
228+
226229
clean:
227230
rm -f *.o main quantize
228231

229-
main: llama.cpp ggml.o utils.o
230-
$(CXX) $(CXXFLAGS) llama.cpp ggml.o utils.o -o main $(LDFLAGS)
232+
main: main.cpp ggml.o utils.o llama.o
233+
$(CXX) $(CXXFLAGS) main.cpp ggml.o utils.o llama.o -o main $(LDFLAGS)
231234
@echo "\x1b[36mrun ./main -h for help\x1b[0m"
232235

233236
quantize: quantize.cpp ggml.o utils.o

llama.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,7 @@ const char * llama_print_system_info(void) {
849849
return s.c_str();
850850
}
851851

852-
int main(int argc, char ** argv) {
852+
int llama_main(int argc, char ** argv) {
853853
ggml_time_init();
854854
const int64_t t_main_start_us = ggml_time_us();
855855

llama.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,5 @@ struct llama_model {
5757
struct ggml_context * ctx;
5858
std::map<std::string, struct ggml_tensor *> tensors;
5959
};
60+
61+
int llama_main(int argc, char ** argv);

main.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#include "llama.h"
2+
3+
int main(int argc, char ** argv) {
4+
return llama_main(argc, argv);
5+
}

0 commit comments

Comments
 (0)