Merge pull request #52 from janhq/49-bug-windows-does-not-have-some-libs

tikikun · web-flow · commit 43d72fdfc91f · 2023-10-05T14:54:45.000+07:00
49 bug windows does not have some libs
diff --git a/controllers/llamaCPP.h b/controllers/llamaCPP.h
@@ -1408,7 +1408,7 @@ class llamaCPP : public drogon::HttpSimpleController<llamaCPP> {
 
     // load the model
     if (!llama.loadModel(params)) {
-      LOG_ERROR_LLAMA("Strange error","Error loading the model will exit the program");
+      LOG_ERROR << "Error loading the model will exit the program";
       std::terminate();  
     }
     nitro_utils::nitro_logo();
diff --git a/main.cc b/main.cc
@@ -3,8 +3,8 @@
 #include <drogon/drogon.h>
 
 #if defined(__APPLE__) && defined(__MACH__)
-#include <mach-o/dyld.h>
 #include <libgen.h> // for dirname()
+#include <mach-o/dyld.h>
 #elif defined(__linux__)
 #include <libgen.h> // for dirname()
 #include <unistd.h> // for readlink()

Original file line number	Diff line number	Diff line change
`@@ -1408,7 +1408,7 @@ class llamaCPP : public drogon::HttpSimpleController<llamaCPP> {`
`1408`	`1408`
`1409`	`1409`	`// load the model`
`1410`	`1410`	`if (!llama.loadModel(params)) {`
`1411`		`- LOG_ERROR_LLAMA("Strange error","Error loading the model will exit the program");`
	`1411`	`+ LOG_ERROR << "Error loading the model will exit the program";`
`1412`	`1412`	`std::terminate();`
`1413`	`1413`	`}`
`1414`	`1414`	`nitro_utils::nitro_logo();`