Merge pull request SciSharp#853 from martindevans/general_cleanup

General Code Cleanup
Lamothe · Jul 13, 2024 · e66b375 · e66b375
2 parents e907146 + 17c1ba0
commit e66b375
Show file tree

Hide file tree

Showing 62 changed files with 53 additions and 143 deletions.
diff --git a/LLama/Abstractions/IModelParams.cs b/LLama/Abstractions/IModelParams.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Buffers;
 using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -214,7 +213,7 @@ public class TensorSplitsCollectionConverter
         /// <inheritdoc/>
         public override TensorSplitsCollection Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
-            var arr = JsonSerializer.Deserialize<float[]>(ref reader, options) ?? Array.Empty<float>();
+            var arr = JsonSerializer.Deserialize<float[]>(ref reader, options) ?? [ ];
             return new TensorSplitsCollection(arr);
         }
 

diff --git a/LLama/Abstractions/INativeLibrary.cs b/LLama/Abstractions/INativeLibrary.cs
@@ -1,7 +1,5 @@
-using LLama.Native;
-using System;
+using LLama.Native;
 using System.Collections.Generic;
-using System.Text;
 
 namespace LLama.Abstractions
 {

diff --git a/LLama/Abstractions/INativeLibrarySelectingPolicy.cs b/LLama/Abstractions/INativeLibrarySelectingPolicy.cs
@@ -1,7 +1,5 @@
-using LLama.Native;
-using System;
+using LLama.Native;
 using System.Collections.Generic;
-using System.Text;
 
 namespace LLama.Abstractions
 {

diff --git a/LLama/Batched/Conversation.cs b/LLama/Batched/Conversation.cs
@@ -1,8 +1,6 @@
 using System;
-using System.Buffers;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.InteropServices;
 using System.Text.Json;
 using LLama.Native;
 
@@ -289,29 +287,19 @@ public void Prompt(SafeLlavaImageEmbedHandle embedding)
 
         if (embedding.Model.EmbeddingDimensions != Executor.Model.EmbeddingSize)
             throw new ArgumentException($"Embedding dimension mismatch between image embedding ({embedding.Model.EmbeddingDimensions}) and model ({Executor.Model.EmbeddingSize})");
-
-        // Get a temporary array large enough to hold one embedding item
-        var tempArr = ArrayPool<float>.Shared.Rent(embedding.Model.EmbeddingDimensions);
-        var tempSpan = tempArr.AsSpan(0, embedding.Model.EmbeddingDimensions);
-        try
+
+        for (var i = 0; i < embedding.Model.PatchCount; i++)
         {
-            for (var i = 0; i < embedding.Model.PatchCount; i++)
-            {
-                // Get a batch with space
-                (var batch, _requiredEpoch) = Executor.GetEmbeddingBatch();
+            // Get a batch with space
+            (var batch, _requiredEpoch) = Executor.GetEmbeddingBatch();
 
-                batch.Add(
-                    (i, embedding),
-                    static (Span<float> dest, (int index, SafeLlavaImageEmbedHandle embedding) tup) => tup.embedding.GetEmbedding(dest, tup.index),
-                    _end++,
-                    ConversationId,
-                    i == embedding.Model.PatchCount - 1
-                );
-            }
-        }
-        finally
-        {
-            ArrayPool<float>.Shared.Return(tempArr);
+            batch.Add(
+                (i, embedding),
+                static (Span<float> dest, (int index, SafeLlavaImageEmbedHandle embedding) tup) => tup.embedding.GetEmbedding(dest, tup.index),
+                _end++,
+                ConversationId,
+                i == embedding.Model.PatchCount - 1
+            );
         }
     }
 

diff --git a/LLama/ChatSession.cs b/LLama/ChatSession.cs
@@ -624,7 +624,7 @@ public record SessionState
     /// <summary>
     /// The input transform pipeline used in this session.
     /// </summary>
-    public ITextTransform[] InputTransformPipeline { get; set; } = Array.Empty<ITextTransform>();
+    public ITextTransform[] InputTransformPipeline { get; set; } = [ ];
 
     /// <summary>
     /// The output transform used in this session.
@@ -639,7 +639,7 @@ public record SessionState
     /// <summary>
     /// The the chat history messages for this session.
     /// </summary>
-    public ChatHistory.Message[] History { get; set; } = Array.Empty<ChatHistory.Message>();
+    public ChatHistory.Message[] History { get; set; } = [ ];
 
     /// <summary>
     /// Create a new session state.
@@ -741,7 +741,7 @@ public static SessionState Load(string path)
             inputTransforms = File.Exists(inputTransformFilepath) ? 
                 (JsonSerializer.Deserialize<ITextTransform[]>(File.ReadAllText(inputTransformFilepath))
                 ?? throw new ArgumentException("Input transform file is invalid", nameof(path)))
-                : Array.Empty<ITextTransform>();
+                : [ ];
         }
         catch (JsonException)
         {

diff --git a/LLama/Common/PolymorphicJSONConverter.cs b/LLama/Common/PolymorphicJSONConverter.cs
@@ -1,9 +1,6 @@
-using LLama.Abstractions;
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
-using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 

diff --git a/LLama/Extensions/EncodingExtensions.cs b/LLama/Extensions/EncodingExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Text;
 
 namespace LLama.Extensions;

diff --git a/LLama/Extensions/IReadOnlyListExtensions.cs b/LLama/Extensions/IReadOnlyListExtensions.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Buffers;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Text;

diff --git a/LLama/Grammars/GBNFGrammarParser.cs b/LLama/Grammars/GBNFGrammarParser.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -19,7 +19,7 @@ internal sealed class GBNFGrammarParser
         // copied from llama.cpp
         private static uint DecodeUTF8(ref ReadOnlySpan<byte> src)
         {
-            int[] lookup = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 3, 4 };
+            Span<int> lookup = [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 3, 4 ];
 
             byte firstByte = src[0];
             byte highbits = (byte)(firstByte >> 4);

diff --git a/LLama/Grammars/GrammarRule.cs b/LLama/Grammars/GrammarRule.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using LLama.Exceptions;
 using LLama.Native;

diff --git a/LLama/LLamaContext.cs b/LLama/LLamaContext.cs
@@ -7,13 +7,11 @@
 using System.IO;
 using System.IO.MemoryMappedFiles;
 using LLama.Common;
-using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using LLama.Abstractions;
 using LLama.Sampling;
 using Microsoft.Extensions.Logging;
 using System.Threading;
-using System.Security.Cryptography;
 
 namespace LLama
 {

diff --git a/LLama/LLamaEmbedder.cs b/LLama/LLamaEmbedder.cs
@@ -105,7 +105,7 @@ private float[] GetEmbeddingsArray()
                     embeddings = NativeApi.llama_get_embeddings_seq(Context.NativeHandle, LLamaSeqId.Zero);
 
                 if (embeddings == null)
-                    return Array.Empty<float>();
+                    return [ ];
 
                 return new Span<float>(embeddings, Context.EmbeddingSize).ToArray();
             }

diff --git a/LLama/LLamaInstructExecutor.cs b/LLama/LLamaInstructExecutor.cs
@@ -9,7 +9,6 @@
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using LLama.Exceptions;
-using LLama.Extensions;
 using Microsoft.Extensions.Logging;
 
 namespace LLama
@@ -119,7 +118,7 @@ protected override Task<bool> GetLoopCondition(InferStateArgs args)
         /// <inheritdoc />
         protected override Task PreprocessInputs(string text, InferStateArgs args)
         {
-            args.Antiprompts ??= new List<string>();
+            args.Antiprompts ??= [ ];
             args.Antiprompts.Add(_instructionPrefix);
             if (_is_prompt_run)
             {

diff --git a/LLama/LLamaInteractExecutor.cs b/LLama/LLamaInteractExecutor.cs
@@ -9,7 +9,6 @@
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using LLama.Exceptions;
-using LLama.Extensions;
 using Microsoft.Extensions.Logging;
 
 

diff --git a/LLama/LLamaStatelessExecutor.cs b/LLama/LLamaStatelessExecutor.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.CompilerServices;
-using System.Text;
 using System.Threading;
 using LLama.Exceptions;
 using LLama.Native;
@@ -28,9 +27,6 @@ public class StatelessExecutor
         // LLava Section
         public bool IsMultiModal => false;
 
-        /// <inheritdoc />
-        public bool MultiModalProject { get;  }
-
         /// <inheritdoc />
         public LLavaWeights? ClipModel { get;  }
 

diff --git a/LLama/LLamaTemplate.cs b/LLama/LLamaTemplate.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Buffers;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Text;

diff --git a/LLama/LLamaTransforms.cs b/LLama/LLamaTransforms.cs
@@ -1,4 +1,4 @@
-using LLama.Abstractions;
+using LLama.Abstractions;
 using LLama.Common;
 using System.Collections.Generic;
 using System.Linq;
@@ -196,7 +196,7 @@ public KeywordTextOutputStreamTransform(
                 int maxKeywordLength,
                 bool removeAllMatchedTokens)
             {
-                _keywords = new(keywords);
+                _keywords = [ ..keywords ];
                 _maxKeywordLength = maxKeywordLength;
                 _removeAllMatchedTokens = removeAllMatchedTokens;
             }
@@ -212,7 +212,7 @@ public KeywordTextOutputStreamTransform(
             /// <param name="removeAllMatchedTokens">If set to true, when getting a matched keyword, all the related tokens will be removed. Otherwise only the part of keyword will be removed.</param>
             public KeywordTextOutputStreamTransform(IEnumerable<string> keywords, int redundancyLength = 3, bool removeAllMatchedTokens = false)
             {
-                _keywords = new(keywords);
+                _keywords = [ ..keywords ];
                 _maxKeywordLength = _keywords.Max(x => x.Length) + redundancyLength;
                 _maxKeywordLength = _keywords.Select(x => x.Length).Max() + redundancyLength;
                 _removeAllMatchedTokens = removeAllMatchedTokens;

diff --git a/LLama/Native/GroupDisposable.cs b/LLama/Native/GroupDisposable.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Buffers;
+using System;
 using System.Collections.Generic;
 
 namespace LLama.Native;

diff --git a/LLama/Native/LLamaBatch.cs b/LLama/Native/LLamaBatch.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Runtime.InteropServices;
 
 namespace LLama.Native;
 

diff --git a/LLama/Native/LLamaBatchEmbeddings.cs b/LLama/Native/LLamaBatchEmbeddings.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Runtime.CompilerServices;
 
 namespace LLama.Native;
 

diff --git a/LLama/Native/LLamaChatMessage.cs b/LLama/Native/LLamaChatMessage.cs
@@ -1,5 +1,3 @@
-using System.Runtime.InteropServices;
-
 namespace LLama.Native;
 
 /// <summary>

diff --git a/LLama/Native/LLamaContextParams.cs b/LLama/Native/LLamaContextParams.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Runtime.InteropServices;
 
 namespace LLama.Native
 {

diff --git a/LLama/Native/LLamaGrammarElement.cs b/LLama/Native/LLamaGrammarElement.cs
@@ -1,5 +1,4 @@
 using System.Diagnostics;
-using System.Runtime.InteropServices;
 
 namespace LLama.Native
 {

diff --git a/LLama/Native/LLamaKvCacheView.cs b/LLama/Native/LLamaKvCacheView.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Runtime.InteropServices;
 
 namespace LLama.Native;
 

diff --git a/LLama/Native/LLamaModelMetadataOverride.cs b/LLama/Native/LLamaModelMetadataOverride.cs
@@ -1,5 +1,3 @@
-using System.Runtime.InteropServices;
-
 namespace LLama.Native;
 
 /// <summary>

diff --git a/LLama/Native/LLamaModelParams.cs b/LLama/Native/LLamaModelParams.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Runtime.InteropServices;
 
 namespace LLama.Native
 {

diff --git a/LLama/Native/LLamaModelQuantizeParams.cs b/LLama/Native/LLamaModelQuantizeParams.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Runtime.InteropServices;
+using System;
 
 namespace LLama.Native
 {

diff --git a/LLama/Native/LLamaNativeBatch.cs b/LLama/Native/LLamaNativeBatch.cs
@@ -1,5 +1,3 @@
-using System.Runtime.InteropServices;
-
 namespace LLama.Native;
 
 /// <summary>

diff --git a/LLama/Native/LLamaPos.cs b/LLama/Native/LLamaPos.cs
@@ -1,5 +1,3 @@
-using System.Runtime.InteropServices;
-
 namespace LLama.Native;
 
 /// <summary>

diff --git a/LLama/Native/LLamaSeqId.cs b/LLama/Native/LLamaSeqId.cs
@@ -1,5 +1,3 @@
-using System.Runtime.InteropServices;
-
 namespace LLama.Native;
 
 /// <summary>

diff --git a/LLama/Native/LLamaTimings.cs b/LLama/Native/LLamaTimings.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Runtime.InteropServices;
 
 namespace LLama.Native;
 

diff --git a/LLama/Native/LLamaToken.cs b/LLama/Native/LLamaToken.cs
@@ -1,5 +1,4 @@
 using System.Diagnostics;
-using System.Runtime.InteropServices;
 
 namespace LLama.Native;
 

diff --git a/LLama/Native/LLamaTokenData.cs b/LLama/Native/LLamaTokenData.cs
@@ -1,5 +1,3 @@
-using System.Runtime.InteropServices;
-
 namespace LLama.Native;
 
 /// <summary>

diff --git a/LLama/Native/LLamaTokenDataArray.cs b/LLama/Native/LLamaTokenDataArray.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Buffers;
-using System.Runtime.InteropServices;
 
 namespace LLama.Native
 {

diff --git a/LLama/Native/LLavaImageEmbed.cs b/LLama/Native/LLavaImageEmbed.cs
@@ -1,5 +1,3 @@
-using System.Runtime.InteropServices;
-
 namespace LLama.Native;
 
 /// <summary>

diff --git a/LLama/Native/Load/DefaultNativeLibrarySelectingPolicy.cs b/LLama/Native/Load/DefaultNativeLibrarySelectingPolicy.cs
@@ -1,6 +1,5 @@
-using LLama.Abstractions;
+using LLama.Abstractions;
 using System.Collections.Generic;
-using System.Runtime.InteropServices;
 
 namespace LLama.Native
 {

diff --git a/LLama/Native/Load/NativeLibraryUtils.cs b/LLama/Native/Load/NativeLibraryUtils.cs
@@ -1,9 +1,8 @@
-using LLama.Abstractions;
+using LLama.Abstractions;
 using LLama.Exceptions;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Runtime.InteropServices;
 
 namespace LLama.Native
 {

diff --git a/LLama/Native/Load/NativeLibraryWithAvx.cs b/LLama/Native/Load/NativeLibraryWithAvx.cs
@@ -1,6 +1,5 @@
-using LLama.Abstractions;
+using LLama.Abstractions;
 using System.Collections.Generic;
-using System.Runtime.InteropServices;
 
 namespace LLama.Native
 {

diff --git a/LLama/Native/Load/NativeLibraryWithCuda.cs b/LLama/Native/Load/NativeLibraryWithCuda.cs
@@ -1,6 +1,5 @@
-using LLama.Abstractions;
+using LLama.Abstractions;
 using System.Collections.Generic;
-using System.Runtime.InteropServices;
 
 namespace LLama.Native
 {