Refactored sampler handles to be much simpler, never exposing ownersh…

…ip of the individual stages.
SciSharp · Oct 2, 2024 · 5e85435 · 5e85435
1 parent 5804cbd
commit 5e85435
Show file tree

Hide file tree

Showing 5 changed files with 195 additions and 300 deletions.
diff --git a/LLama.Examples/Examples/BatchedExecutorBoolQ.cs b/LLama.Examples/Examples/BatchedExecutorBoolQ.cs
@@ -155,7 +155,7 @@ public ConversationRunner(BatchedExecutor executor, string sys, string question,
         {
             _executor = executor;
             _decoder = new StreamingTokenDecoder(executor.Context);
-            _sampler = new GreedySamplingWithGrammarPipeline { Grammar = AnswerGrammar };
+            _sampler = new GreedySamplingPipeline { Grammar = AnswerGrammar };
 
             // Make sure question ends with question mark
             if (!question.EndsWith('?'))
@@ -244,21 +244,4 @@ public void Dispose()
             _sampler.Dispose();
         }
     }
-
-    /// <summary>
-    /// A sampling pipeline which always selects the most likely token (after applying a grammar)
-    /// </summary>
-    public class GreedySamplingWithGrammarPipeline
-        : BaseSamplingPipeline
-    {
-        public required Grammar Grammar { get; init; }
-
-        protected override SafeLLamaSamplerChainHandle CreateChain(SafeLLamaContextHandle context)
-        {
-            var chain = SafeLLamaSamplerHandle.CreateChain(LLamaSamplerChainParams.Default());
-            chain.Add(SafeLLamaSamplerHandle.CreateGrammar(context.ModelHandle, Grammar.Gbnf, Grammar.Root));
-            chain.Add(SafeLLamaSamplerHandle.CreateGreedySampler());
-            return chain;
-        }
-    }
 }