From 29054a2bee35ea94c51fc1771b91cf4756adae17 Mon Sep 17 00:00:00 2001 From: Concedo <39025047+LostRuins@users.noreply.github.com> Date: Mon, 20 Mar 2023 01:18:34 +0800 Subject: [PATCH] explicit buffer allocation from python --- expose.cpp | 4 ++-- llama_for_kobold.py | 2 +- llamacpp.dll | Bin 2939902 -> 2939902 bytes 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/expose.cpp b/expose.cpp index e10ec876b..a72506a8b 100644 --- a/expose.cpp +++ b/expose.cpp @@ -33,7 +33,7 @@ extern "C" { }; struct generation_outputs { - int status; + int status = -1; char text[16384]; //16kb should be enough for any response }; @@ -63,7 +63,7 @@ extern "C" { return true; } - generation_outputs generate(const generation_inputs inputs, generation_outputs output) + generation_outputs generate(const generation_inputs inputs, generation_outputs & output) { api_params.prompt = inputs.prompt; api_params.seed = inputs.seed; diff --git a/llama_for_kobold.py b/llama_for_kobold.py index 7b2cc8f0a..dc4b5564a 100644 --- a/llama_for_kobold.py +++ b/llama_for_kobold.py @@ -48,7 +48,7 @@ def load_model(model_filename,batch_size=8,max_context_length=512,threads=4,n_pa def generate(prompt,max_length=20,temperature=0.8,top_k=100,top_p=0.85,rep_pen=1.1,rep_pen_range=128,seed=-1,reset_state=True): inputs = generation_inputs() - outputs = generation_outputs() + outputs = ctypes.create_unicode_buffer(ctypes.sizeof(generation_outputs)) inputs.prompt = prompt.encode("UTF-8") inputs.max_length = max_length inputs.temperature = temperature diff --git a/llamacpp.dll b/llamacpp.dll index 4d3bb22dd4c6a4cad6875c5128c2ce45945a78a6..0e0255469b8bf14f3891546fa11344b7c824b6c0 100644 GIT binary patch delta 424 zcmXZUy-Pw-7zXfj)SF+WscB`IX1DJaX>6$_4&h=18Gm){hZQvA8c#KC}~- z;~C7hb+sFmsJP8?^^BlPYAhbKID-=Do^}w=QhKblwsz>6T+<7;M$)W)W4~AsvnWK1 zLixr{A`N{nZ6!@loAXGWdx^nMWZ`4UNu+0|g`S!{A?*HylDUmNFC>X#9CJ>+p z%wPd4*uW0G&{ruX996Hm<`N_~xyvV04sb$0xWEk_7yvK$U=W6282m5-qY!{G2to+P ZAq*2B!X!+=G|a#(%)xvmnOZ3C{{US9rqTca delta 419 zcmXZWyGuf07zXg~Q%~MCExVj9b~)W!godJ}A>u2}QUn%)G&nV-I2H&Uk;734YzP|k zFNop{cA0`eTyrS8K;v=Csl@Q>F&ciu!~4DuZ>yx!7MwhrB>C#4wkgW0B7HgtVOqk* z)GAZ6(nmY0b^U$og3>2FyM1G#i}|(irCa;o%`uB1=9^)0pXG9;)y_lZr$Y>dRiDym}SaH|MptFV4NemE%GrQ;1M7ff+0y zKnGaC26k|O6I|df6(XMNfVJ!s6hEnEqHzy+p%Z-Ihc4)b0Q5jF^g%y}FaU!v1j7)7 b5g3Ir7zYU^U=pTa8fIV?=1S4{d~yF54V9;%