Skip to content

Commit 65119b0

Browse files
committed
Add main.cpp back, and invoke llama_main from it
Signed-off-by: Thiago Padilha <[email protected]>
1 parent 59a7f5f commit 65119b0

File tree

5 files changed

+15
-4
lines changed

5 files changed

+15
-4
lines changed

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,9 @@ endif()
107107
# endif()
108108

109109
add_executable(llama
110-
llama.cpp
110+
main.cpp
111111
utils.cpp
112+
llama.cpp
112113
utils.h)
113114

114115
add_executable(quantize

Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,11 +188,14 @@ ggml.o: ggml.c ggml.h
188188
utils.o: utils.cpp utils.h
189189
$(CXX) $(CXXFLAGS) -c utils.cpp -o utils.o
190190

191+
llama.o: llama.cpp llama.h
192+
$(CXX) $(CXXFLAGS) -c llama.cpp -o llama.o
193+
191194
clean:
192195
rm -f *.o main quantize
193196

194-
main: llama.cpp ggml.o utils.o
195-
$(CXX) $(CXXFLAGS) llama.cpp ggml.o utils.o -o main $(LDFLAGS)
197+
main: main.cpp ggml.o utils.o llama.o
198+
$(CXX) $(CXXFLAGS) main.cpp ggml.o utils.o llama.o -o main $(LDFLAGS)
196199
./main -h
197200

198201
quantize: quantize.cpp ggml.o utils.o

llama.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ const char * llama_print_system_info(void) {
731731
return s.c_str();
732732
}
733733

734-
int main(int argc, char ** argv) {
734+
int llama_main(int argc, char ** argv) {
735735
ggml_time_init();
736736
const int64_t t_main_start_us = ggml_time_us();
737737

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)