From nobody Wed Dec 25 01:02:38 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YHtlf6dx4z5X2pQ; Wed, 25 Dec 2024 01:02:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YHtlf5Ssrz4ngM; Wed, 25 Dec 2024 01:02:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735088558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2clpcZ+mTyFWqoqPqOHleUfh+mJS/2EqGjdk47xOSMY=; b=LhHh8pyQn1vprIUZGMEHNuNo1VVyQN2aA77+4jyEsh2A1bwetht/S5LXK55CtraM89cahq zp9Kzjm5+NjOWRH0Ow+CvJitsncpkCbQCqeDBRiCY3ZZ/r6ylGUTrDg6yiF3YYEaEu0gKL CHlBDpOy3SzbE0d4juvZaQWC+Hxb5BDYTJ1ScYUwTCmolvVdtL0017WslW6rpxcH64bk+P qhp8QAfDexrlUdsWvMSv/MX20KAiAKLNXGApeEI5AbBM38oGbxxufFSoJldu1mQka84r/t Cl/KXyYDqeIUEoCsiLOoUYBobgTPlV+iIgd38+xFSsvo7fBJu2W5PAv67V+iQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735088558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2clpcZ+mTyFWqoqPqOHleUfh+mJS/2EqGjdk47xOSMY=; b=TciJKEKXfeshw52bU4FQ/I8GpIMgCyv0w9DgULfT0ZcUTvkAbcHIKtzKWW7tQiHgFLYiMu FmvQo9c5/6qS4vaqaY/CXuddPK3c0kPpNouc3c7vTyTWikDZMhbt0R7VXErf3JFJV5iG94 ofH12HJr+X4aKB5wEXlPH1cuCOai1i7f4pphBZdr3PHnsfiVtNP94dx+1Ra9RxZ+7L9bJ4 0gYSYosfysz1SgN98aSNE7ZK79ZTex1rdq/etRMFrk1yA8TbzsZzDNO52cXoyqy1lfXpGW bYmpLKuUjehpsUcPx+x+Ib0iwZYwV7R3FAQb38nwa5pa0ddysLtz92ogRPz3CQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735088558; a=rsa-sha256; cv=none; b=VHI3hzeBUD2cscMIPiSa9+oF0qZ4eHondrh71VheH6TOBjzaNuZrKvR9iRlMvE90aw/5pG 4HFB3SsK5QF+0l8A1tm+170f2QN5TTSPGE8qZG0XFtSJha95slBXSyq2h9uv4LcMERCLwW vJWW7lyYWD3mszxLlTLqZIWVA6NbhK06Iwx3rlJH6FyzsYSru3TwWmJHMVq23mi/IcxZps qNB2PKo6ztC784XDOKbnpSDt5rZ3pA4Y4guCHZfs1olF+u30L9D4apt4IeW+Gte1OcRguT krqevcJgNLF4RCFzkxKuHqkJsGTHf2o/gTRVmuWpp7ucI+BP0q0Qs0fBPTMR7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YHtlf4zLhz1333; Wed, 25 Dec 2024 01:02:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BP12cq4047453; Wed, 25 Dec 2024 01:02:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BP12cBn047449; Wed, 25 Dec 2024 01:02:38 GMT (envelope-from git) Date: Wed, 25 Dec 2024 01:02:38 GMT Message-Id: <202412250102.4BP12cBn047449@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: f6581ef1f7e3 - main - misc/koboldcpp: update 1.80.1 =?utf-8?Q?=E2=86=92?= 1.80.3; Flavorise List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f6581ef1f7e37af93d4d12cd1b4f630451b36e72 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=f6581ef1f7e37af93d4d12cd1b4f630451b36e72 commit f6581ef1f7e37af93d4d12cd1b4f630451b36e72 Author: Yuri Victorovich AuthorDate: 2024-12-25 00:53:35 +0000 Commit: Yuri Victorovich CommitDate: 2024-12-25 00:57:17 +0000 misc/koboldcpp: update 1.80.1 → 1.80.3; Flavorise * "default" flavor builds for a default CPU, or for CPU defined by ${CPUTYPE} when set * "portable" flavor reflects the portable option in the project, and it builds multiple binaries for various pre-defied CPU types. Reported by: portscout --- misc/koboldcpp/Makefile | 23 +++++++++++++++++---- misc/koboldcpp/distinfo | 6 +++--- misc/koboldcpp/files/patch-Makefile | 40 +++++++++++++++++++++++++++++++++++++ misc/koboldcpp/pkg-plist | 5 ----- 4 files changed, 62 insertions(+), 12 deletions(-) diff --git a/misc/koboldcpp/Makefile b/misc/koboldcpp/Makefile index bdf588f4ff74..cdd40ee85550 100644 --- a/misc/koboldcpp/Makefile +++ b/misc/koboldcpp/Makefile @@ -1,6 +1,6 @@ PORTNAME= koboldcpp DISTVERSIONPREFIX= v -DISTVERSION= 1.80.1 +DISTVERSION= 1.80.3 CATEGORIES= misc # machine-learning MAINTAINER= yuri@FreeBSD.org @@ -13,6 +13,10 @@ 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 @@ -25,10 +29,22 @@ GH_ACCOUNT= LostRuins SHEBANG_FILES= koboldcpp.py -MAKE_ARGS= LLAMA_OPENBLAS=1 LLAMA_VULKAN=1 LLAMA_PORTABLE=1 LDFLAGS="${LDFLAGS}" +.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 @@ -41,8 +57,7 @@ do-install: ${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_vulkan.so koboldcpp_vulkan_noavx2.so +.for lib in ${LIBS} ${INSTALL_LIB} ${WRKSRC}/${lib} ${STAGEDIR}${DATADIR} .endfor # embd files diff --git a/misc/koboldcpp/distinfo b/misc/koboldcpp/distinfo index 8fd7181f680e..bacb53518981 100644 --- a/misc/koboldcpp/distinfo +++ b/misc/koboldcpp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1734856109 -SHA256 (LostRuins-koboldcpp-v1.80.1_GH0.tar.gz) = a43dfe052860f4b09004511cce7d26b05d68dd2fb866ad23471d61f5f49d9acc -SIZE (LostRuins-koboldcpp-v1.80.1_GH0.tar.gz) = 29133623 +TIMESTAMP = 1735035023 +SHA256 (LostRuins-koboldcpp-v1.80.3_GH0.tar.gz) = adaeb8e47225dbc1b778840a3523a53765310916be883957784cd37165ac262f +SIZE (LostRuins-koboldcpp-v1.80.3_GH0.tar.gz) = 29134845 diff --git a/misc/koboldcpp/files/patch-Makefile b/misc/koboldcpp/files/patch-Makefile new file mode 100644 index 000000000000..020810c9c5b9 --- /dev/null +++ b/misc/koboldcpp/files/patch-Makefile @@ -0,0 +1,40 @@ +--- Makefile.orig 2024-12-24 20:09:43 UTC ++++ Makefile +@@ -48,8 +48,8 @@ endif + # + + # keep standard at C11 and C++17 +-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 + 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: + #phony for printing messages + finishedmsg: + $(NOTIFY_MSG) +- $(DONOTHING) +\ No newline at end of file ++ $(DONOTHING) diff --git a/misc/koboldcpp/pkg-plist b/misc/koboldcpp/pkg-plist index f4f740d331c1..7e6fc33f8a14 100644 --- a/misc/koboldcpp/pkg-plist +++ b/misc/koboldcpp/pkg-plist @@ -3,11 +3,6 @@ bin/koboldcpp %%DATADIR%%/kcpp_sdui.embd %%DATADIR%%/klite.embd %%DATADIR%%/koboldcpp.py -%%DATADIR%%/koboldcpp_default.so -%%DATADIR%%/koboldcpp_failsafe.so -%%DATADIR%%/koboldcpp_noavx2.so -%%DATADIR%%/koboldcpp_vulkan.so -%%DATADIR%%/koboldcpp_vulkan_noavx2.so %%DATADIR%%/rwkv_vocab.embd %%DATADIR%%/rwkv_world_vocab.embd %%DATADIR%%/taesd.embd