Moved gptj/utils.* to g4a-common.*

CMakeLists.txt

@@ -18,7 +18,8 @@ add_subdirectory(llama.cpp)
 add_library(libjustlm STATIC
     include/justlm.hpp justlm.cpp
     justlm_llama.hpp
-    justlm_gptj.hpp gptj/gptj.cpp gptj/gptj.hpp gptj/utils.cpp gptj/utils.hpp
+    g4a-common.cpp g4a-common.hpp
+    justlm_gptj.hpp gptj/gptj.cpp gptj/gptj.hpp
     include/justlm_pool.hpp justlm_pool.cpp
 )
 target_link_libraries(libjustlm PRIVATE llama)

g4a-common.cpp

@@ -1,4 +1,4 @@
-#include "utils.hpp"
+#include "g4a-common.hpp"
 
 #include <fstream>
 #include <regex>

gptj/gptj.cpp

@@ -1,6 +1,6 @@
 #include "gptj.hpp"
 
-#include "utils.hpp"
+#include "../g4a-common.hpp"
 
 #include <cassert>
 #include <cmath>

gptj/gptj.hpp

@@ -5,7 +5,7 @@
 #include <map>
 #include <ggml.h>
 
-#include "utils.hpp"
+#include "../g4a-common.hpp"
 
 
 // default hparams (GPT-J 6B)

include/justlm.hpp

@@ -44,7 +44,7 @@
 
 #ifdef LM_COSCHED
 #ifndef LM_NOEXCEPT
-#warning Exceptions shouldn't be enabled in combination with CoSched. Any exceptions thrown will lead to a std::terminate() call
+#warning Exceptions should not be enabled in combination with CoSched. Any exceptions thrown will lead to a std::terminate() call
 #endif
 #endif
 

justlm_gptj.hpp

@@ -4,7 +4,7 @@
 #include <random>
 #include <cstring>
 #include "gptj/gptj.hpp"
-#include "gptj/utils.hpp"
+#include "g4a-common.hpp"
 
 
 namespace LM {