diff --git a/misc/koboldcpp/Makefile b/misc/koboldcpp/Makefile index dc8aebc6a80f..c1cdd8950afa 100644 --- a/misc/koboldcpp/Makefile +++ b/misc/koboldcpp/Makefile @@ -1,76 +1,75 @@ PORTNAME= koboldcpp DISTVERSIONPREFIX= v -DISTVERSION= 1.82.4 -PORTREVISION= 1 +DISTVERSION= 1.83 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 #BROKEN_armv7= compilation fails, see https://github.com/LostRuins/koboldcpp/issues/1129 #BROKEN_i386= compilation fails, see https://github.com/LostRuins/koboldcpp/issues/1129 FLAVORS= default portable FLAVOR?= ${FLAVORS:[1]} portable_PKGNAMESUFFIX= -portable LIB_DEPENDS= libopenblas.so:math/openblas \ libvulkan.so:graphics/vulkan-loader RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}customtkinter>0:x11-toolkits/py-customtkinter@${PY_FLAVOR} USES= compiler:c++11-lang gmake localbase:ldflags python shebangfix USE_GITHUB= yes GH_ACCOUNT= LostRuins SHEBANG_FILES= koboldcpp.py .if ${FLAVOR} == default LIBS= koboldcpp_default.so koboldcpp_vulkan.so MAKE_ARGS= PRESET_CFLAGS="${CFLAGS}" PRESET_CXXFLAGS="${CXXFLAGS}" .endif .if ${FLAVOR} == portable MAKE_ARGS= LLAMA_PORTABLE=1 LIBS= koboldcpp_default.so koboldcpp_failsafe.so koboldcpp_noavx2.so \ koboldcpp_vulkan.so koboldcpp_vulkan_noavx2.so .endif MAKE_ARGS+= LLAMA_OPENBLAS=1 LLAMA_VULKAN=1 LDFLAGS="${LDFLAGS}" ALL_TARGET= PLIST_FILES= ${LIBS:S/^/%%DATADIR%%\//} .if defined(WITH_DEBUG) MAKE_ARGS+= KCPP_DEBUG=1 .endif 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 ${LIBS} ${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 .if ${ARCH} != amd64 IGNORE= portable flavor isn't defined on ${ARCH} because it is based on AVX2, etc. (?) .endif .include diff --git a/misc/koboldcpp/distinfo b/misc/koboldcpp/distinfo index 8d94ee480a68..0c0c3e7960f5 100644 --- a/misc/koboldcpp/distinfo +++ b/misc/koboldcpp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1737681737 -SHA256 (LostRuins-koboldcpp-v1.82.4_GH0.tar.gz) = fdee4bddd891a29ea231dae0a56b887f1fe4ea441c27cc054daabaade1c63062 -SIZE (LostRuins-koboldcpp-v1.82.4_GH0.tar.gz) = 28032612 +TIMESTAMP = 1739080679 +SHA256 (LostRuins-koboldcpp-v1.83_GH0.tar.gz) = 1289652de864782e248a8a5f12b065e2a3f97f2b938ab482cbc72709bf1a6862 +SIZE (LostRuins-koboldcpp-v1.83_GH0.tar.gz) = 31793378 diff --git a/misc/koboldcpp/files/patch-Makefile b/misc/koboldcpp/files/patch-Makefile index 020810c9c5b9..654beb45b197 100644 --- a/misc/koboldcpp/files/patch-Makefile +++ b/misc/koboldcpp/files/patch-Makefile @@ -1,40 +1,40 @@ ---- Makefile.orig 2024-12-24 20:09:43 UTC +--- Makefile.orig 2025-02-07 18:11:10 UTC +++ Makefile -@@ -48,8 +48,8 @@ endif +@@ -45,8 +45,8 @@ endif # # keep standard at C11 and C++17 --CFLAGS = --CXXFLAGS = -+CFLAGS = $(PRESET_CFLAGS) -+CXXFLAGS = $(PRESET_CXXFLAGS) +-CFLAGS ?= +-CXXFLAGS ?= ++CFLAGS ?= $(PRESET_CFLAGS) ++CXXFLAGS ?= $(PRESET_CXXFLAGS) ifdef KCPP_DEBUG CFLAGS = -g -O0 CXXFLAGS = -g -O0 -@@ -167,7 +167,7 @@ ifeq ($(UNAME_M),$(filter $(UNAME_M),x86_64 i686 amd64 - FULLCFLAGS += -mavx2 -msse3 -mfma -mf16c -mavx - endif - else -- CFLAGS += -march=native -mtune=native -+ CFLAGS += - endif - endif +@@ -151,7 +151,7 @@ else + FULLCFLAGS += -mavx2 -msse3 -mssse3 -mfma -mf16c -mavx + endif # LLAMA_NOAVX2 + else +- CFLAGS += -march=native -mtune=native ++ #CFLAGS += -march=native -mtune=native + endif # LLAMA_PORTABLE + endif # if x86 + +@@ -289,8 +289,8 @@ else + CXXFLAGS += -mcpu=native + endif + else +- CFLAGS += -mcpu=native +- CXXFLAGS += -mcpu=native ++ #CFLAGS += -mcpu=native ++ #CXXFLAGS += -mcpu=native + endif endif -@@ -332,8 +332,8 @@ ifneq ($(filter aarch64%,$(UNAME_M)),) - CXXFLAGS += -mcpu=native - endif - else -- CFLAGS += -mcpu=native -- CXXFLAGS += -mcpu=native -+ CFLAGS += -+ CXXFLAGS += - endif - endif endif -@@ -755,4 +755,4 @@ finishedmsg: +@@ -746,4 +746,4 @@ finishedmsg: #phony for printing messages finishedmsg: $(NOTIFY_MSG) - $(DONOTHING) \ No newline at end of file + $(DONOTHING)