Merge branch 'master' of github.com:AsakusaRinne/LLamaSharp into add_kernel_memory_pkg

LLama.Examples/LLama.Examples.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\LLama\LLamaSharp.Runtime.targets" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -29,7 +29,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
-    <PackageReference Include="Microsoft.SemanticKernel" Version="1.0.0-beta1" />
+    <PackageReference Include="Microsoft.SemanticKernel" Version="1.0.0-beta4" />
   </ItemGroup>
 
   <ItemGroup>

LLama.Unittest/LLama.Unittest.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\LLama\LLamaSharp.Runtime.targets" />
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -13,8 +13,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
-    <PackageReference Include="xunit" Version="2.5.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
+    <PackageReference Include="xunit" Version="2.6.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

LLama.WebAPI/LLama.WebAPI.csproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualStudio.Validation" Version="17.6.11" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>
 
   <ItemGroup>

LLama/Native/SafeLLamaGrammarHandle.cs

@@ -3,6 +3,7 @@ using System.Buffers;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using LLama.Exceptions;
 using LLama.Grammars;
 
@@ -49,38 +50,39 @@ namespace LLama.Native
                 // Borrow an array large enough to hold every single element
                 // and another array large enough to hold a pointer to each rule
                 var allElements = ArrayPool<LLamaGrammarElement>.Shared.Rent(totalElements);
-                var pointers = ArrayPool<IntPtr>.Shared.Rent(rules.Count);
+                var rulePointers = ArrayPool<IntPtr>.Shared.Rent(rules.Count);
                 try
                 {
-                    fixed (LLamaGrammarElement* allElementsPtr = allElements)
+                    // We're taking pointers into `allElements` below, so this pin is required to fix
+                    // that memory in place while those pointers are in use!
+                    using var pin = allElements.AsMemory().Pin();
+
+                    var elementIndex = 0;
+                    var ruleIndex = 0;
+                    foreach (var rule in rules)
                     {
-                        var elementIndex = 0;
-                        var pointerIndex = 0;
-                        foreach (var rule in rules)
-                        {
-                            // Save a pointer to the start of this rule
-                            pointers[pointerIndex++] = (IntPtr)(allElementsPtr + elementIndex);
+                        // Save a pointer to the start of this rule
+                        rulePointers[ruleIndex++] = (IntPtr)Unsafe.AsPointer(ref allElements[elementIndex]);
 
-                            // Copy all of the rule elements into the flat array
-                            foreach (var element in rule.Elements)
-                                allElementsPtr[elementIndex++] = element;
-                        }
+                        // Copy all of the rule elements into the flat array
+                        foreach (var element in rule.Elements)
+                            allElements[elementIndex++] = element;
+                    }
 
-                        // Sanity check some things that should be true if the copy worked as planned
-                        Debug.Assert((ulong)pointerIndex == nrules);
-                        Debug.Assert(elementIndex == totalElements);
+                    // Sanity check some things that should be true if the copy worked as planned
+                    Debug.Assert((ulong)ruleIndex == nrules);
+                    Debug.Assert(elementIndex == totalElements);
 
-                        // Make the actual call through to llama.cpp
-                        fixed (void* ptr = pointers)
-                        {
-                            return Create((LLamaGrammarElement**)ptr, nrules, start_rule_index);
-                        }
+                    // Make the actual call through to llama.cpp
+                    fixed (void* ptr = rulePointers)
+                    {
+                        return Create((LLamaGrammarElement**)ptr, nrules, start_rule_index);
                     }
                 }
                 finally
                 {
                     ArrayPool<LLamaGrammarElement>.Shared.Return(allElements);
-                    ArrayPool<IntPtr>.Shared.Return(pointers);
+                    ArrayPool<IntPtr>.Shared.Return(rulePointers);
                 }
             }
         }