Merge branch 'LostRuins:concedo' into concedo

expose.h

@@ -1,6 +1,19 @@
 #pragma once
 
 const int stop_token_max = 10;
+const int ban_token_max = 10;
+// match kobold's sampler list and order
+enum samplers
+{
+    KCPP_SAMPLER_TOP_K=0,
+    KCPP_SAMPLER_TOP_A=1,
+    KCPP_SAMPLER_TOP_P=2,
+    KCPP_SAMPLER_TFS=3,
+    KCPP_SAMPLER_TYP=4,
+    KCPP_SAMPLER_TEMP=5,
+    KCPP_SAMPLER_REP_PEN=6,
+    KCPP_SAMPLER_MAX
+};
 struct load_model_inputs
 {
     const int threads;
@@ -18,10 +31,12 @@ struct load_model_inputs
     const bool use_smartcontext;
     const bool unban_tokens;
     const int clblast_info = 0;
+    const int cublas_info = 0;
     const int blasbatchsize = 512;
     const int debugmode = 0;
     const int forceversion = 0;
     const int gpulayers = 0;
+    const char * banned_tokens[ban_token_max];
 };
 struct generation_inputs
 {
@@ -40,6 +55,8 @@ struct generation_inputs
     const int mirostat = 0;
     const float mirostat_eta;
     const float mirostat_tau;
+    const samplers sampler_order[KCPP_SAMPLER_MAX];
+    const int sampler_len;
     const char * stop_sequence[stop_token_max];
     const bool stream_sse;
 };