C# signature functions

Author: amakropoulos

.gitignore

@@ -3,3 +3,6 @@
 build*/*
 csharp/bin
 csharp/obj
+tests/csharp/bin
+tests/csharp/obj
+tests/csharp/TestResults

csharp/LLM.cs

@@ -134,7 +134,7 @@ protected LLMProvider(LlamaLib llamaLibInstance) : base(llamaLibInstance)
         {
         }
 
-        public string Lora_Weight(string jsonData)
+        public string LoraWeight(string jsonData)
         {
             if (string.IsNullOrEmpty(jsonData))
                 throw new ArgumentNullException(nameof(jsonData));
@@ -145,7 +145,7 @@ public string Lora_Weight(string jsonData)
             return Marshal.PtrToStringAnsi(result) ?? string.Empty;
         }
 
-        public string Lora_List()
+        public string LoraList()
         {
             CheckLlamaLib();
 
@@ -174,7 +174,7 @@ public void Stop()
             llamaLib.LLM_Stop(llm);
         }
 
-        public void Start_Server(string host = "0.0.0.0", int port = 0, string apiKey = "")
+        public void StartServer(string host = "0.0.0.0", int port = 0, string apiKey = "")
         {
             CheckLlamaLib();
 
@@ -184,14 +184,14 @@ public void Start_Server(string host = "0.0.0.0", int port = 0, string apiKey =
             llamaLib.LLM_Start_Server(llm, host, port, apiKey ?? string.Empty);
         }
 
-        public void Stop_Server()
+        public void StopServer()
         {
             CheckLlamaLib();
 
             llamaLib.LLM_Stop_Server(llm);
         }
 
-        public void Join_Service()
+        public void JoinService()
         {
             CheckLlamaLib();
 
@@ -205,7 +205,7 @@ public void JoinServer()
             llamaLib.LLM_Join_Server(llm);
         }
 
-        public void Set_SSL(string sslCert, string sslKey)
+        public void SetSSL(string sslCert, string sslKey)
         {
             if (string.IsNullOrEmpty(sslCert))
                 throw new ArgumentNullException(nameof(sslCert));
@@ -217,25 +217,22 @@ public void Set_SSL(string sslCert, string sslKey)
             llamaLib.LLM_Set_SSL(llm, sslCert, sslKey);
         }
 
-        public int Status_Code()
+        public int StatusCode()
         {
             CheckLlamaLib();
-            
             return llamaLib.LLM_Status_Code(llm);
         }
 
-        public string Status_Message()
+        public string StatusMessage()
         {
             CheckLlamaLib();
-            
             var result = llamaLib.LLM_Status_Message(llm);
             return Marshal.PtrToStringAnsi(result) ?? string.Empty;
         }
 
-        public int Embedding_Size()
+        public int EmbeddingSize()
         {
             CheckLlamaLib();
-            
             return llamaLib.LLM_Embedding_Size(llm);
         }
 
@@ -290,18 +287,19 @@ public LLMService(string modelPath, int numThreads = -1, int numGpuLayers = 0,
 
         public LLMService(LlamaLib llamaLibInstance, IntPtr llmInstance)
         {
-            llamaLib = llamaLibInstance ?? throw new ArgumentNullException(nameof(llamaLibInstance));
+            if (llamaLibInstance == null) throw new ArgumentNullException(nameof(llamaLibInstance));
             if (llmInstance == IntPtr.Zero) throw new ArgumentNullException(nameof(llmInstance));
+            llamaLib = llamaLibInstance;
             llm = llmInstance;
         }
 
-        public static LLMService From_Command(string paramsString)
+        public static LLMService FromCommand(string paramsString)
         {
             if (string.IsNullOrEmpty(paramsString))
                 throw new ArgumentNullException(nameof(paramsString));
 
             LlamaLib llamaLibInstance = null;
-            IntPtr llmInstance;
+            IntPtr llmInstance = IntPtr.Zero;
             try
             {
                 llamaLibInstance = new LlamaLib(LlamaLib.Has_GPU_Layers(paramsString));

csharp/LlamaLib.cs

@@ -259,9 +259,11 @@ private void LoadLibraries(bool gpu)
                 try
                 {
                     string libraryPath = Path.Combine(libraryBasePath, library.Trim());
+                    Console.WriteLine("Trying " + libraryPath);
                     libraryHandle = LibraryLoader.LoadLibrary(libraryPath);
                     LoadFunctionPointers();
                     architecture = library.Trim();
+                    Console.WriteLine("Successfully loaded: " + libraryPath);
                     return;
                 }
                 catch (Exception ex)

tests/csharp/Tests.cs

@@ -215,26 +215,26 @@ public void Tests_LLMService()
             TestStart(llmService.Start, llmService.Started);
             TestTokenization(llmService.Tokenize, llmService.Detokenize);
             TestCompletion(llmService.Completion);
-            TestEmbedding(llmService.Embeddings, llmService.Embedding_Size);
+            TestEmbedding(llmService.Embeddings, llmService.EmbeddingSize);
             TestCancel(llmService.Cancel);
             TestSlotSaveRestore(llmService.Slot);
-            TestLoraList(llmService.Lora_List);
+            TestLoraList(llmService.LoraList);
 
             llmService?.Dispose();
         }
 
         [TestMethod]
         public void Tests_LLMClient()
         {
-            LLMService llmService = new LLMService(testModelPath);
+            LLMService llmService = LLMService.FromCommand(new String("-m " + testModelPath));
             llmService.Debug(3);
             TestStart(llmService.Start, llmService.Started);
 
             LLMClient llmClient = new LLMClient(llmService);
 
             TestTokenization(llmClient.Tokenize, llmClient.Detokenize);
             TestCompletion(llmClient.Completion);
-            TestEmbedding(llmClient.Embeddings, llmService.Embedding_Size);
+            TestEmbedding(llmClient.Embeddings, llmService.EmbeddingSize);
             TestCancel(llmClient.Cancel);
             TestSlotSaveRestore(llmClient.Slot);
 
@@ -247,13 +247,13 @@ public void Tests_LLMRemoteClient()
             LLMService llmService = new LLMService(testModelPath);
             llmService.Debug(3);
             TestStart(llmService.Start, llmService.Started);
-            llmService.Start_Server("", 13333);
+            llmService.StartServer("", 13333);
 
             LLMRemoteClient llmClient = new LLMRemoteClient("http://localhost", 13333);
 
             TestTokenization(llmClient.Tokenize, llmClient.Detokenize);
             TestCompletion(llmClient.Completion);
-            TestEmbedding(llmClient.Embeddings, llmService.Embedding_Size);
+            TestEmbedding(llmClient.Embeddings, llmService.EmbeddingSize);
 
             llmService?.Dispose();
         }