diff --git a/misc/koboldcpp/Makefile b/misc/koboldcpp/Makefile index 929dfeb19efd..37b29180bfb3 100644 --- a/misc/koboldcpp/Makefile +++ b/misc/koboldcpp/Makefile @@ -1,47 +1,47 @@ PORTNAME= koboldcpp DISTVERSIONPREFIX= v -DISTVERSION= 1.73.1 +DISTVERSION= 1.74 CATEGORIES= misc # machine-learning MAINTAINER= yuri@FreeBSD.org COMMENT= Simple way to run GGML and GGUF AI models with a KoboldAI WebUI WWW= https://github.com/lostruins/koboldcpp LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.md LIB_DEPENDS= libopenblas.so:math/openblas \ libvulkan.so:graphics/vulkan-loader RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}customtkinter>0:x11-toolkits/py-customtkinter@${PY_FLAVOR} USES= gmake localbase:ldflags python shebangfix USE_GITHUB= yes GH_ACCOUNT= LostRuins SHEBANG_FILES= koboldcpp.py MAKE_ARGS= LLAMA_OPENBLAS=1 LLAMA_VULKAN=1 LLAMA_PORTABLE=1 LDFLAGS="${LDFLAGS}" ALL_TARGET= do-install: # dir ${MKDIR} ${STAGEDIR}${DATADIR} # prog ${INSTALL_DATA} ${WRKSRC}/koboldcpp.py ${STAGEDIR}${DATADIR}/koboldcpp.py ${CHMOD} +x ${STAGEDIR}${DATADIR}/koboldcpp.py ${RLN} ${STAGEDIR}${DATADIR}/koboldcpp.py ${STAGEDIR}${PREFIX}/bin/koboldcpp # libraries .for lib in koboldcpp_default.so koboldcpp_failsafe.so koboldcpp_noavx2.so \ koboldcpp_openblas.so koboldcpp_vulkan.so koboldcpp_vulkan_noavx2.so ${INSTALL_LIB} ${WRKSRC}/${lib} ${STAGEDIR}${DATADIR} .endfor # embd files .for embd in klite.embd kcpp_docs.embd rwkv_vocab.embd rwkv_world_vocab.embd \ kcpp_sdui.embd taesd.embd taesd_xl.embd ${INSTALL_DATA} ${WRKSRC}/${embd} ${STAGEDIR}${DATADIR} .endfor .include diff --git a/misc/koboldcpp/distinfo b/misc/koboldcpp/distinfo index 3aed07f1298a..1e81634075cc 100644 --- a/misc/koboldcpp/distinfo +++ b/misc/koboldcpp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1724387078 -SHA256 (LostRuins-koboldcpp-v1.73.1_GH0.tar.gz) = 22e98fa6cff973ddb0d464bc1d35fba20cad5e300e81bb43051718d1973d2682 -SIZE (LostRuins-koboldcpp-v1.73.1_GH0.tar.gz) = 28503444 +TIMESTAMP = 1725179865 +SHA256 (LostRuins-koboldcpp-v1.74_GH0.tar.gz) = 10f99515eec5a34659d4f0b1d160404a6ca0cbf3054e77663c3f038ff4c7c08c +SIZE (LostRuins-koboldcpp-v1.74_GH0.tar.gz) = 28510760 diff --git a/misc/koboldcpp/files/patch-koboldcpp.py b/misc/koboldcpp/files/patch-koboldcpp.py new file mode 100644 index 000000000000..bad178aa0cc6 --- /dev/null +++ b/misc/koboldcpp/files/patch-koboldcpp.py @@ -0,0 +1,31 @@ +- submitted here: https://github.com/LostRuins/koboldcpp/issues/1110 + +--- koboldcpp.py.orig 2024-09-01 15:51:59 UTC ++++ koboldcpp.py +@@ -4159,8 +4159,9 @@ def main(launch_args,start_server=True): + + + #load embedded lite ++ basepath = os.path.abspath(os.path.dirname(os.path.realpath(__file__))) ++ + try: +- basepath = os.path.abspath(os.path.dirname(__file__)) + with open(os.path.join(basepath, "klite.embd"), mode='rb') as f: + embedded_kailite = f.read() + # patch it with extra stuff +@@ -4174,7 +4175,6 @@ def main(launch_args,start_server=True): + print("Could not find KoboldAI Lite. Embedded KoboldAI Lite will not be available.") + + try: +- basepath = os.path.abspath(os.path.dirname(__file__)) + with open(os.path.join(basepath, "kcpp_docs.embd"), mode='rb') as f: + embedded_kcpp_docs = f.read() + print("Embedded API docs loaded.") +@@ -4182,7 +4182,6 @@ def main(launch_args,start_server=True): + print("Could not find Embedded KoboldCpp API docs.") + + try: +- basepath = os.path.abspath(os.path.dirname(__file__)) + with open(os.path.join(basepath, "kcpp_sdui.embd"), mode='rb') as f: + embedded_kcpp_sdui = f.read() + if args.sdmodel: