From 587308a202024c81171e34e69c1936d490c36e3e Mon Sep 17 00:00:00 2001 From: Concedo <39025047+LostRuins@users.noreply.github.com> Date: Mon, 22 May 2023 12:18:42 +0800 Subject: [PATCH] fixed some build errors on linux, changed icon resolution, added more error printing --- .gitignore | 1 - Makefile | 11 +++-------- build-info.h | 7 +++++++ ggml-opencl.cpp | 6 +++--- koboldcpp.py | 2 +- niko.ico | Bin 15086 -> 6832 bytes otherarch/ggml_v2-opencl.cpp | 6 +++--- 7 files changed, 17 insertions(+), 16 deletions(-) create mode 100644 build-info.h diff --git a/.gitignore b/.gitignore index b44be78fc..4bfed9c80 100644 --- a/.gitignore +++ b/.gitignore @@ -34,7 +34,6 @@ models/* /vdot /Pipfile -build-info.h arm_neon.h compile_commands.json diff --git a/Makefile b/Makefile index 840463749..9fdbfee06 100644 --- a/Makefile +++ b/Makefile @@ -266,7 +266,7 @@ gpttype_adapter_clblast.o: gpttype_adapter.cpp $(CXX) $(CXXFLAGS) $(CLBLAST_FLAGS) -c $< -o $@ clean: - rm -vf *.o main quantize_llama quantize_gpt2 quantize_gptj quantize_neox quantize-stats perplexity embedding benchmark-matmult save-load-state build-info.h main.exe quantize_llama.exe quantize_gptj.exe quantize_gpt2.exe quantize_neox.exe koboldcpp.dll koboldcpp_openblas.dll koboldcpp_noavx2.dll koboldcpp_openblas_noavx2.dll koboldcpp_clblast.dll koboldcpp.so koboldcpp_openblas.so koboldcpp_noavx2.so koboldcpp_openblas_noavx2.so koboldcpp_clblast.so gptj.exe gpt2.exe + rm -vf *.o main quantize_llama quantize_gpt2 quantize_gptj quantize_neox quantize-stats perplexity embedding benchmark-matmult save-load-state main.exe quantize_llama.exe quantize_gptj.exe quantize_gpt2.exe quantize_neox.exe koboldcpp.dll koboldcpp_openblas.dll koboldcpp_noavx2.dll koboldcpp_openblas_noavx2.dll koboldcpp_clblast.dll koboldcpp.so koboldcpp_openblas.so koboldcpp_noavx2.so koboldcpp_openblas_noavx2.so koboldcpp_clblast.so gptj.exe gpt2.exe # # Examples @@ -319,13 +319,8 @@ libllama.so: llama.o ggml.o $(OBJS) save-load-state: examples/save-load-state/save-load-state.cpp build-info.h ggml.o llama.o common.o $(OBJS) $(CXX) $(CXXFLAGS) $(filter-out %.h,$^) -o $@ $(LDFLAGS) -build-info.h: $(wildcard .git/index) scripts/build-info.sh - @sh scripts/build-info.sh > $@.tmp - @if ! cmp -s $@.tmp $@; then \ - mv $@.tmp $@; \ - else \ - rm $@.tmp; \ - fi +build-info.h: + $(DONOTHING) # # Tests diff --git a/build-info.h b/build-info.h new file mode 100644 index 000000000..70a4db739 --- /dev/null +++ b/build-info.h @@ -0,0 +1,7 @@ +#ifndef BUILD_INFO_H +#define BUILD_INFO_H + +#define BUILD_NUMBER 999 +#define BUILD_COMMIT "KOBOLDCPP" + +#endif // BUILD_INFO_H diff --git a/ggml-opencl.cpp b/ggml-opencl.cpp index 35f95863f..41002a07b 100644 --- a/ggml-opencl.cpp +++ b/ggml-opencl.cpp @@ -557,7 +557,7 @@ static void ggml_cl_mul_mat_f32(const ggml_tensor * src0, const ggml_tensor * sr &queue, &ev_sgemm); if (status != clblast::StatusCode::kSuccess) { - printf("\nF32 Matmul Failed (%d): You may be out of VRAM. Please check if you have enough.\n",status); + printf("\nF32 Matmul Failed (%d): [dims: %lld,%lld,%lld,%lld] You may be out of VRAM. Please check if you have enough.\n",status,ne00,ne01,ne10,ne11); GGML_ASSERT(false); } @@ -656,7 +656,7 @@ static void ggml_cl_mul_mat_f16(const ggml_tensor * src0, const ggml_tensor * sr &queue, &ev_sgemm); if (status != clblast::StatusCode::kSuccess) { - printf("\nF16 Matmul Failed (%d): You may be out of VRAM. Please check if you have enough.\n",status); + printf("\nF16 Matmul Failed (%d): [dims: %lld,%lld,%lld,%lld] You may be out of VRAM. Please check if you have enough.\n",status,ne00,ne01,ne10,ne11); GGML_ASSERT(false); } @@ -764,7 +764,7 @@ static void ggml_cl_mul_mat_q_f32(const ggml_tensor * src0, const ggml_tensor * &queue, &ev_sgemm); if (status != clblast::StatusCode::kSuccess) { - printf("\nQF32 Matmul Failed (%d): You may be out of VRAM. Please check if you have enough.\n",status); + printf("\nQF32 Matmul Failed (%d): [dims: %lld,%lld,%lld,%lld] You may be out of VRAM. Please check if you have enough.\n",status,ne00,ne01,ne10,ne11); GGML_ASSERT(false); } } diff --git a/koboldcpp.py b/koboldcpp.py index d7d051999..c281d33dc 100644 --- a/koboldcpp.py +++ b/koboldcpp.py @@ -208,7 +208,7 @@ maxctx = 2048 maxlen = 128 modelbusy = False defaultport = 5001 -KcppVersion = "1.24" +KcppVersion = "1.25" class ServerRequestHandler(http.server.SimpleHTTPRequestHandler): sys_version = "" diff --git a/niko.ico b/niko.ico index f0b191e4d98bfa3ec767447e15bc2e61fd07eb54..978ddac6506e677e4539ee7b0cb5cd82edc92e12 100644 GIT binary patch literal 6832 zcmV;h8c*c_0096206;(h0096X0Gb*A02TlM0EtjeM-2)Z3IG5A4M|8uQUCw|KmY&$ zKnMl^0063Kaozv`8evI9K~#90&07UrR@eK#CM6hvbcl!vicN^Lg(4_o5`rL|2D1ki z24H}g=ia*>x%XvYGTi+A@8|RV-22}5-V@*RoTtvY zg7DuQ^%ztcS}=5EFp+-Os>Zvu88jGLN$)miXd;#Q|N5YYH)d$b(34>ZLm0y(hH!>~ z30| zbm%g;Gt6VyFTJ~qA)O(fVXRb!IfJ?&lKwwCXcR~^NlZN$Vi^_-VuMdJ{KW7_?Rs*h z?EIKvk06eygCI(ZB7+h`1L>MN)Q{n7h64=GYS-oO{?2fR;UvR0h9s#jBB}#J!~eXe zA2_rGvBA*{O9XMmt}wiimsculZDtLnM(VJbmIr11_7Fruwlc&p^pV~jz|fzeuk`yX zK_u$2L3bB4v+;y+>#i{CXpcH|>Jb@F87?vGV@MIiY0`^9?ThtVI^-B^8KyGq7Q~Lf zR8~7)Oj1>8$1m!v!Br5a(ib~48N3-b zGd#2GKMZPWn(%PBh{Pa+|FYC3ccTf%GCD|8;0g$BCq(6pl~^c{m?*f$1- zeWIaf7XUT0-e{oH8XjqdunU}t;HX)Mnz4eH;X8H;yhercvRk(_gRZ#)j9tH?Y4wO9 zLl6g}@s}ik6xIla^$fp8EZT(7<%gi!R0mED19(HdyuvX$at{2*B|%He0Fl`*FnZq` z4Bzn=BjXKx_rBr3>Fm8*y1)A`gdZtJ7x!RzjGn+qoX5zF=H(3?;s^2)HkZ)`raF7gdJDwrmPK^8b1<=6_#;;LJN{Y1I!cjN4%N&;T}SVeku|1yxlI zL?8JRF~^Fl1FaPbU=w^szbSsB)r4rt8EaQk{A|KE=hr)M{Y2)N6zOc2fQ7o7s? zQl&Kiei{@u8Oi5Mc;jLjJQrla(6l==nrcB;TOX#5LlAqsq}l{{r{}YI-UwQ3#G7jB z!DjSigzf#g;(s3|F&bUmiGZ67iv-bve6cA&op)jw&#;N%j@|GeEG(?rLF#b8#%mb9 zI0sROey?`tWf+}N2(M-Nh(7$1|BgCVg4mrRp{SlhgVKTXvJs#E8i~iBVOj1Ytjv3e>Bs)~$DMv3W*&cmf)f{U^W-Vq zJC%Wv$b ze?ew+n?!<45}HT@Mh;tJsZZ59$iz`FLjlQ1hGBxJWy#i#mnynz(#)XzyUZ=TF>g0e zhC>C{K8t{9Oo|?SpzQl6b8+kNeq=9Af{wbHj0BQ|C_&Uuo>KdL1TiqP5k4M=@Pn8l zx0F0QGA|nhagNb7d2BT2i}bWK%g*lF#vAdW&dV_A*sB^7kaYa%hY65yi%o~@)Ffy$ zX-p*0bRbWYEJKDMnrR|sl_16;y@ZdLON#0!upxy)0S%cL^1Xjycp!)#+igV!`O>2s zGAcU%;B@{+8@M?4NsS3umizdV1QUu5e~WF22~d!eE0NksaR&upzcM_N?$NZR*r9{e z*LMyQ4-$Lw(XXg9QY&xYHyG{wSE7Z-OgOuYz#s=(e3Li}xm&+Mgzrc=+gQP(qZw?w zcfq(oUtG-I4WGfTxRsYv(YTGdKh>Ck6?s2b>FD*G14xaZ!me|XK5IGxhIt@pq$d*N zVvxITIg(<+F|3y(f(H*o7w`G#5WF5{!{$Ivp#izg6hx89bQ9jAC@HR{c%J6?w+t_x z-24%cmXE;wZ@A-e;ouQm+PfXSds?AxojPdHpaC>BHKCxOfLgU`aTw|AB6^G$dUWZC z+xa31d-HDAn1EH42)LfJA8lGRNAk1@FwoJis8fd8wQHku+g3QRaw%>xqE;NbjiBse zjM(r9Ms2OgWKsY{k!F-61yynhG%qMLr4aLqnuacdCM`k4)*nPubnJKBJbD1ehWfm+ zQKLp-@7}%GxpOC$ELnn{HZ~Ov(NtH%&;h*>>@|!}kAt6~2v_GmHi+41`2<>atFB@t%}3b_@DJX!+VVG|**q(V|a z5hUdk$Z=AxOaP^^f(0?WeCF&n8o`s6BI?^;c|(@uJ%xj1SI)ADi3zXFz`%gT=yl#1 z2|{xNJ#=W(5(V2gBB$W$XAtm!6Ob}34(`3}(YT?CC}~DU{9LzgU8tz2pl#c>h>3}T zo0}WI&-4@yY}>}2Cn{&?%uML(n?TYDWW@p*jAWgsIGW5}0>kP0_2o*(jGctQ>8mRm zGIV+dFPOx=Wy_ZQnmTXMy*s~d(cA%6-2X9N~fd{L3{aU=1VS!Rb6s zW?PfL%Wk055XJ`W*nrf5qM~BOG_qHIoPe+uc^G$`IU|RjLruR$l@Zp`(n4x#Dx962(aSL&u@P4g z5x5__Qj1_=?#!Q2QdB@k(^kkneCD&J!20C5u(#}7QMXyU!API^9Zqd6!{(%m(9tx+ z(xppbX=(Y6Bo0r>X5~myuN-KUf}ETjoIigaGp0|+pn>VQaQ+2KOUn@- zpTH~IlXi!b(ACTV^_lc+I&`td1gvCcFg0NcFSoZ-0(R|qh>)N;{I|V@8%}I0({TNyu6$vAt8Z}M(Uy>oH_g$&6sJThOL@;0{5W{n9*&wGS{&h}7HY=pSj^Ni>+oGds6ZEbB>cXnY!m*H9-lY*R6?7vdp zE;=7Mas(T8A4Uud$)j?L;hvHYg+@)uRlY5CeuiWUxm#RInhWFyOp#3C%|=bsN>j7) zxFk@LBP2ep3IXx)@$eb36QO}8u{q@~cx6HX{&-f#pD{Hxg=5Iv8WWJ3|CH$y zU1)2WF-3b7iBk*F+h!=Q$GUSroXIRhS!sDin`Fq#%fr&F?-6>a7!Gk8!9sQtdrG=e zEHhCMLwX&d(h3t@P!#CQFisGIpc@9QOtJE6DJP)Q0DtVr%&e#+EiDb6gEA1t2v{}e z8aGYUuwALQaOGGjZ`jHeD`4*8Q)2>V9{z>fbkla$7#DdBzQZyR<~5tw<7DN*#s5)J z**gRT1_Z!w=|P@nRMcorVoz!NHPTeK6+W_#Kt3`pT2PMunwgyoQYh8M%wbzLpS--h zDk?d7@+6!crg0@0;GG54CWcT~)keYQV&trQgV?Y=IDGgpdJPU3 z9_ZGs2d^h=>}k05TgVCUb{~gtlAd73S2r+aQc4v9^z`&FDlHG5+x|i$6Yd6+2RK&{ z^BEsao+?UngBB`^?1u*<>3k_HN5rCmN@MPDJbn6QRZ;AJr(eK$EIjuYd{;4N z=E(0*ZlZzdO#90!TeN5qtS!Si3DlT~ptFpOOR(=5hpAJiqKrK=HUCYG3E-x1|4HUe z=A(5hTSSGP=k>@ydZAq#S6sMop`uOX3$(HsfDwz2z%F`~EO|<~!(?ghSD%2sV`4F3 z|6PpPe3vIEl~pxRzkYpe*|Mdg!X--_`e|rljPMqN8 z*SL9SIM{xLf&CZ3$$l!D8(CsI^Z8|MNl#Db{zp&WNxVMqJ;jv?NRbFosP+`-?Cy=g zE$87j=NNQbb%XbcQ?M8o#YN2A+#DlEj>P22lX-_dJw4fc9gOhsFnA0Zf~HzJ@JcU0 z*zWu2;WG)kZMrb>#BZUj z*O3UIr8v@SPM?whHHiSO1e;sfBXrkg44j<<*Mx)c&bZD;X2|Sq(9|(RedcTs<8|xQ zMZJ3U(O5$dt$PfB%U7%5xB4{NF~wQ0zC3jFjp5MW3nN3~`AU%=A$DOE(0%`L$?%Oz zgvaQK{P`AbIzdiO0lFp~(9XsM>Uu4zc&3%1u4gRz{!Ds&Svz~htbV{t@>ZuamTGfC|9TOF=0d?M$g^pJ^*D#XzK}i zgOm&yh(i4rf4A9ox8Y6k&9}BLZh{M&PVX?DsbqGi3$*CM>FWR)*0r3t;6q2s*9I5whzZ#xc_x zefSSV9ejZpW-Vl<)_3g1!q+0*so@KF$3io{L&T0- zh}!>@HI}l(5^3*&xPlM6{F6UvPoZzszN(WVaCe8sau6b@6)Jil%| zxzZUqk5~Xy0>chH5V-l>kq+7W6cO1~of|T5V&2 z`!ROGZj7D3i=B5Nh_2Z?LCIMNUYw1PWycY=t`Lz-%;~+#Dv>B0z+V2U6X%AnxBpNU0ZqGsDxe_!|*XAAj<^S`_!Z%-kt3wO8>#MA&1Pv{HF4~_Wpc#9foEt}1pDOnw zwio^5_Cy~o#;BdIps1!#X7GE4M9CRas!RYmL$v*rc3@I&@a3#^nOJkZ6m!p(U>;M7 z3kyq;dZ`qPFP0)M@52=ar{=u3Q!c|o(Zgx*d)?r-LAKsIV$M7F!#8|fDyN(%=Iu+n zT#6;^OuJSnrPtX%iAMi7hMkhaZ!5fKzp=XH5G^Gs&^BmR9y)g!+#}=R>=T7^$UDRB74kveaIR{b}`w zHg;r4QcaEzZPZp4K5>v=Kq-PP?5-J zB(X*>(*`68muZEyNL@?2tbO+$uwxEOT;5-z4oKYbkxnFG4D$*J{^OH5#On`uij@?m z|AZyn-|(Ej7jlXXcn+Y4t2gAuk*7VwB;usRZKSpH#=w#uHZarO?{deOTAZ@+oXxK;0{5c}PrH7?#shbqs2Tj|5 zbA50w=gU6S?ujs_s5uS*Pi^J>JuR({kwKcv;n)}IJW%S?r4Q=DVs{@_dje!YGfzZKoU(;HX$^{>|mm+*w)x1yW4ckwK`b?t&z zfBuQAtbKgH(c7fmKAMe)VIH!TUYY`AslKQLP#SHNAS$1y8&|Kwvs*Xu@a)Nok#u#k z$Ku6{`7~&5po{w_j$z%r*=VM(kM3PMqpy=AT>JKcYoFfeB0L2gL6F1y!IMWr+&Jq?-~P0`oh zhILq)9!z?O;CrVFFf%p^8mg+YPiDwrquBn7P61gCfl_I-Yy3RJ^A^U<%V$lWhDS`4 zpWi7$5gVXM|o$@c#% zTjXnUkjF*A1&JW}1q%exRi>?IB%Uwi<@x^Ip9OJa62%zQU{YA}Z-Hz$?f0ksN<`*E zIdSjrGpQ`fWngK<=!;O=iLU;U zvgo5}TAHIRESb`~bY3czIYz33I!+}1Pd}Y~`=A5^`P{VPLUWRAGi^i~FP*7ly27VF zo~ErU)X8A!UHV>__W#qzk%oe}g8l!ht=d15p(z8a=y9Uzl eeJ*MP|-(T`pxLB~?pZ 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 IZh|%c1>O~segFUf diff --git a/otherarch/ggml_v2-opencl.cpp b/otherarch/ggml_v2-opencl.cpp index 48d2d7f59..0afa8e1aa 100644 --- a/otherarch/ggml_v2-opencl.cpp +++ b/otherarch/ggml_v2-opencl.cpp @@ -573,7 +573,7 @@ static void ggml_v2_cl_mul_mat_f32(const ggml_v2_tensor * src0, const ggml_v2_te &queue, &ev_sgemm); if (status != clblast::StatusCode::kSuccess) { - printf("\nF32 Matmul Failed (%d): You may be out of VRAM. Please check if you have enough.\n",status); + printf("\nF32 Matmul Failed (%d): [dims: %lld,%lld,%lld,%lld] You may be out of VRAM. Please check if you have enough.\n",status,ne00,ne01,ne10,ne11); GGML_V2_ASSERT(false); } @@ -672,7 +672,7 @@ static void ggml_v2_cl_mul_mat_f16(const ggml_v2_tensor * src0, const ggml_v2_te &queue, &ev_sgemm); if (status != clblast::StatusCode::kSuccess) { - printf("\nF16 Matmul Failed (%d): You may be out of VRAM. Please check if you have enough.\n",status); + printf("\nF16 Matmul Failed (%d): [dims: %lld,%lld,%lld,%lld] You may be out of VRAM. Please check if you have enough.\n",status,ne00,ne01,ne10,ne11); GGML_V2_ASSERT(false); } @@ -780,7 +780,7 @@ static void ggml_v2_cl_mul_mat_q_f32(const ggml_v2_tensor * src0, const ggml_v2_ &queue, &ev_sgemm); if (status != clblast::StatusCode::kSuccess) { - printf("\nQF32 Matmul Failed (%d): You may be out of VRAM. Please check if you have enough.\n",status); + printf("\nQF32 Matmul Failed (%d): [dims: %lld,%lld,%lld,%lld] You may be out of VRAM. Please check if you have enough.\n",status,ne00,ne01,ne10,ne11); GGML_V2_ASSERT(false); } }