refactor: update llama, ref #26

-- Penalty sampler API initalization was changed
alpaca-core · Dec 18, 2024 · c29a4b5 · c29a4b5
1 parent 4b493ff
commit c29a4b5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/code/ac/llama/Sampler.cpp b/code/ac/llama/Sampler.cpp
@@ -37,15 +37,10 @@ Sampler::Sampler(Model& model, const Params& params)
 
     llama_sampler_chain_add(chain,
         llama_sampler_init_penalties(
-            llama_n_vocab(lmodel),
-            llama_token_eos(lmodel),
-            llama_token_nl(lmodel),
             params.repetitionPenalty.numTokens,
             params.repetitionPenalty.repeat,
             params.repetitionPenalty.freq,
-            params.repetitionPenalty.present,
-            params.penalizeNewline,
-            params.ignoreEos
+            params.repetitionPenalty.present
         )
     );
 

diff --git a/code/ac/llama/Sampler.hpp b/code/ac/llama/Sampler.hpp
@@ -62,9 +62,6 @@ class AC_LLAMA_EXPORT Sampler {
             float threshold = 0.10f;   // > 0.5 disables XTC
         } xtc;
 
-        bool penalizeNewline = false; // consider newlines as a repeatable token
-        bool ignoreEos = false;
-
         std::vector<SamplingType> samplerSequence = {
             SamplingType::Top_K,
             SamplingType::Typical_P,

diff --git a/llama.cpp b/llama.cpp