Merge branch 'master' into WebUpdate

LLama.Examples/NewVersion/ChatSessionStripRoleName.cs

@@ -1,5 +1,4 @@
 using LLama.Common;
-using System.Text;
 
 namespace LLama.Examples.NewVersion
 {

LLama.Examples/NewVersion/ChatSessionWithRoleName.cs

@@ -1,5 +1,4 @@
 using LLama.Common;
-using System.Text;
 
 namespace LLama.Examples.NewVersion
 {

LLama.Examples/NewVersion/InstructModeExecute.cs

@@ -1,5 +1,4 @@
 using LLama.Common;
-using System.Text;
 
 namespace LLama.Examples.NewVersion
 {

LLama.Examples/NewVersion/InteractiveModeExecute.cs

@@ -1,5 +1,4 @@
 using LLama.Common;
-using System.Text;
 
 namespace LLama.Examples.NewVersion
 {

LLama.Examples/NewVersion/LoadAndSaveSession.cs

@@ -1,5 +1,4 @@
 using LLama.Common;
-using System.Text;
 
 namespace LLama.Examples.NewVersion
 {

LLama.Examples/NewVersion/LoadAndSaveState.cs

@@ -1,5 +1,4 @@
 using LLama.Common;
-using System.Text;
 
 namespace LLama.Examples.NewVersion
 {

LLama.Examples/Program.cs

@@ -1,7 +1,4 @@
-using LLama;
-using LLama.Common;
-using LLama.Examples;
-using LLama.Examples.NewVersion;
+using LLama.Examples.NewVersion;
 using LLama.Examples.Old;
 
 Console.WriteLine("======================================================================================================");

LLama.Unittest/BasicTest.cs

@@ -1,4 +1,3 @@
-using System.Text;
 using LLama.Common;
 
 namespace LLama.Unittest

LLama.Unittest/GrammarTest.cs

@@ -1,5 +1,4 @@
-using System.Text;
-using LLama.Common;
+using LLama.Common;
 using LLama.Native;
 
 namespace LLama.Unittest

LLama.Unittest/LLamaContextTests.cs

@@ -1,5 +1,4 @@
-using System.Text;
-using LLama.Common;
+using LLama.Common;
 
 namespace LLama.Unittest
 {

LLama/Abstractions/IHistoryTransform.cs

@@ -1,7 +1,4 @@
 using LLama.Common;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace LLama.Abstractions
 {

LLama/Abstractions/ILLamaExecutor.cs

@@ -1,7 +1,4 @@
-using LLama.Common;
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
 using System.Threading;
 
 namespace LLama.Abstractions

LLama/Abstractions/ITextStreamTransform.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
 
 namespace LLama.Abstractions
 {
@@ -15,6 +13,7 @@ public interface ITextStreamTransform
         /// <param name="tokens"></param>
         /// <returns></returns>
         IEnumerable<string> Transform(IEnumerable<string> tokens);
+
         /// <summary>
         /// Takes a stream of tokens and transforms them, returning a new stream of tokens asynchronously.
         /// </summary>

LLama/Abstractions/ITextTransform.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace LLama.Abstractions
+namespace LLama.Abstractions
 {
     /// <summary>
     /// An interface for text transformations.

LLama/Common/ModelParams.cs

@@ -1,6 +1,5 @@
 using LLama.Abstractions;
 using System;
-using System.Text;
 
 namespace LLama.Common
 {

LLama/LLamaExecutorBase.cs

@@ -266,10 +266,7 @@ protected virtual void TryReuseMathingPrefix()
         public virtual IEnumerable<string> Infer(string text, IInferenceParams? inferenceParams = null, CancellationToken cancellationToken = default)
         {
             cancellationToken.ThrowIfCancellationRequested();
-            if (inferenceParams is null)
-            {
-                inferenceParams = new InferenceParams();
-            }
+            inferenceParams ??= new InferenceParams();
 
             InferStateArgs args = new InferStateArgs()
             {

LLama/LLamaInstructExecutor.cs

@@ -108,10 +108,7 @@ protected override bool GetLoopCondition(InferStateArgs args)
         /// <inheritdoc />
         protected override void PreprocessInputs(string text, InferStateArgs args)
         {
-            if(args.Antiprompts is null)
-            {
-                args.Antiprompts = new List<string>();
-            }
+            args.Antiprompts ??= new List<string>();
             args.Antiprompts.Add(_instructionPrefix);
             if (_is_prompt_run)
             {
@@ -160,7 +157,7 @@ protected override bool PostProcess(IInferenceParams inferenceParams, InferState
 
                 if (_pastTokensCount > 0 && args.WaitForInput)
                 {
-                    extraOutputs = new string[] { "\n> " };
+                    extraOutputs = new[] { "\n> " };
                     return true;
                 }
             }

LLama/LLamaInteractExecutor.cs

@@ -154,7 +154,7 @@ protected override bool PostProcess(IInferenceParams inferenceParams, InferState
 
             if (_embeds.Count > 0 && _embeds.Last() == NativeApi.llama_token_eos())
             {
-                extraOutputs = new string[] { " [end of text]\n" };
+                extraOutputs = new[] { " [end of text]\n" };
                 return true;
             }
 

LLama/Native/LLamaContextParams.cs

@@ -1,11 +1,10 @@
 using System;
-using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using System.Text;
 
 namespace LLama.Native
 {
     public delegate void LlamaProgressCallback(float progress, IntPtr ctx);
+
     [StructLayout(LayoutKind.Sequential)]
     public struct LLamaContextParams
     {

LLama/Native/LLamaModelQuantizeParams.cs

@@ -1,6 +1,4 @@
-using System.Runtime.InteropServices;
-
-namespace LLama.Native
+namespace LLama.Native
 {
     /// <summary>
     /// Quantizer parameters used in the native API

LLama/Native/LLamaTokenData.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using System.Text;
+using System.Runtime.InteropServices;
 
 namespace LLama.Native
 {

LLama/Native/NativeApi.Quantize.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using System.Text;
+using System.Runtime.InteropServices;
 
 namespace LLama.Native
 {
@@ -16,6 +13,6 @@ public partial class NativeApi
         /// <remarks>not great API - very likely to change</remarks>
         /// <returns>Returns 0 on success</returns>
         [DllImport(libraryName, CallingConvention = CallingConvention.Cdecl)]
-        public unsafe static extern int llama_model_quantize(string fname_inp, string fname_out, LLamaModelQuantizeParams* param);
+        public static extern unsafe int llama_model_quantize(string fname_inp, string fname_out, LLamaModelQuantizeParams* param);
     }
 }

LLama/Native/SafeLlamaModelHandle.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.Text;
 using LLama.Exceptions;
 
@@ -150,7 +151,7 @@ public int[] Tokenize(string text, bool add_bos, Encoding encoding)
                     var tokens = new int[count];
                     fixed (int* tokensPtr = &tokens[0])
                     {
-                        count = NativeApi.llama_tokenize_with_model(this, bytesPtr, tokensPtr, count, add_bos);
+                        NativeApi.llama_tokenize_with_model(this, bytesPtr, tokensPtr, count, add_bos);
                         return tokens;
                     }
                 }

LLama/Utils.cs

@@ -102,7 +102,7 @@ public static sbyte BoolToSignedByte(bool value)
         /// <returns></returns>
         public static bool SignedByteToBool(sbyte value)
         {
-            return value > 0 ? true : false;
+            return value > 0;
         }
 
     }