Fix merge conflicts

saddam213 · Oct 20, 2023 · 45b9035 · 45b9035
1 parent bfe0f40
commit 45b9035
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/LLamaStack.Core/Inference/InstructInferenceHandler.cs b/LLamaStack.Core/Inference/InstructInferenceHandler.cs
@@ -166,7 +166,7 @@ protected override async Task InferInternal(IInferenceParams inferenceParams, In
                     _currentTokens.Add(_promptTokens[_consumedTokensCount]);
                     _lastTokens.Enqueue(_promptTokens[_consumedTokensCount]);
                     _consumedTokensCount++;
-                    if (_currentTokens.Count >= _model.ModelParams.BatchSize)
+                    if (_currentTokens.Count >= _model.LLamaParams.BatchSize)
                     {
                         break;
                     }

diff --git a/LLamaStack.Core/Inference/InteractiveInferenceHandler.cs b/LLamaStack.Core/Inference/InteractiveInferenceHandler.cs
@@ -156,7 +156,7 @@ protected override async Task InferInternal(IInferenceParams inferenceParams, In
                     _currentTokens.Add(_promptTokens[_consumedTokensCount]);
                     _lastTokens.Enqueue(_promptTokens[_consumedTokensCount]);
                     _consumedTokensCount++;
-                    if (_currentTokens.Count >= _model.ModelParams.BatchSize)
+                    if (_currentTokens.Count >= _model.LLamaParams.BatchSize)
                     {
                         break;
                     }

diff --git a/LLamaStack.Core/Inference/StatelessInferenceHandler.cs b/LLamaStack.Core/Inference/StatelessInferenceHandler.cs
@@ -1,4 +1,5 @@
-using LLama.Abstractions;
+using LLama;
+using LLama.Abstractions;
 using LLama.Common;
 using LLamaStack.Core.Common;
 using LLamaStack.Core.Services;
@@ -12,14 +13,13 @@ public sealed class StatelessInferenceHandler<T> : IInferenceHandler
         private readonly LLamaStackModel<T> _model;
         private readonly IContextParams _params;
 
-        public StatelessInferenceHandler(LLamaWeights weights, IContextParams @params)
         /// Initializes a new instance of the <see cref="StatelessInferenceHandler{T}"/> class.
         /// </summary>
         /// <param name="model">The model.</param>
         public StatelessInferenceHandler(LLamaStackModel<T> model)
         {
-            _weights = weights;
-            _params = @params;
+            _model = model;
+            _params = model.LLamaParams;
         }
 
         public LLamaContext Context { get; private set; }