pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

ggml: make vulkan a default-off option



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Wed Jul 1 22:28:11 2026 +0200
Changeset:	f685c272411195bbfc3e7a92549f1e318d858175

Modified Files:
	ggml/Makefile
	ggml/PLIST
	ggml/distinfo
Added Files:
	ggml/options.mk
	ggml/patches/patch-include_ggml.h

Log Message:
ggml: make vulkan a default-off option

Change a setting for stable-diffusion.cpp.

Bump PKGREVISION

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f685c272411195bbfc3e7a92549f1e318d858175

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 ggml/Makefile                     |  8 ++------
 ggml/PLIST                        |  6 +++---
 ggml/distinfo                     |  1 +
 ggml/options.mk                   | 21 +++++++++++++++++++++
 ggml/patches/patch-include_ggml.h | 15 +++++++++++++++
 5 files changed, 42 insertions(+), 9 deletions(-)

diffs:
diff --git a/ggml/Makefile b/ggml/Makefile
index 0874c7a163..7a27c1ceb1 100644
--- a/ggml/Makefile
+++ b/ggml/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD$
 
 DISTNAME=	ggml-0.15.3
+PKGREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ggml-org/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -10,8 +11,6 @@ HOMEPAGE=	https://github.com/ggml-org/ggml/
 COMMENT=	Tensor library for machine learning
 LICENSE=	mit
 
-DEPENDS+=	shaderc-[0-9]*:../../wip/shaderc
-
 USE_TOOLS+=	pkg-config
 USE_LANGUAGES=	c c++
 
@@ -23,7 +22,6 @@ PKGCONFIG_OVERRIDE+=	ggml.pc.in
 CMAKE_CONFIGURE_ARGS+=	-DGGML_BLAS=ON
 CMAKE_CONFIGURE_ARGS+=	-DGGML_BLAS_VENDOR=OpenBLAS
 CMAKE_CONFIGURE_ARGS+=	-DBLAS_LIBRARIES=${CBLAS_LIBS:Q}
-CMAKE_CONFIGURE_ARGS+=	-DGGML_VULKAN=ON
 
 BLAS_INDEX64=		yes
 BLAS_ACCEPTED=		openblas_pthread #openblas_openmp
@@ -35,9 +33,7 @@ SUBST_MESSAGE.findblas=	Fixing libpci soname
 SUBST_FILES.findblas+=	src/ggml-blas/CMakeLists.txt
 SUBST_SED.findblas+=	-e 's,DepBLAS openblas64,DepBLAS ${BLAS_PC},'
 
+.include "options.mk"
 .include "../../devel/cmake/build.mk"
-.include "../../graphics/vulkan-headers/buildlink3.mk"
-.include "../../graphics/vulkan-loader/buildlink3.mk"
-.include "../../parallel/spirv-headers/buildlink3.mk"
 .include "../../mk/blas.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/ggml/PLIST b/ggml/PLIST
index ef3d60d285..a5c46effcf 100644
--- a/ggml/PLIST
+++ b/ggml/PLIST
@@ -28,9 +28,9 @@ lib/libggml-blas.so.${PKGVERSION}
 lib/libggml-cpu.so
 lib/libggml-cpu.so.0
 lib/libggml-cpu.so.${PKGVERSION}
-lib/libggml-vulkan.so
-lib/libggml-vulkan.so.0
-lib/libggml-vulkan.so.${PKGVERSION}
+${PLIST.vulkan}lib/libggml-vulkan.so
+${PLIST.vulkan}lib/libggml-vulkan.so.0
+${PLIST.vulkan}lib/libggml-vulkan.so.${PKGVERSION}
 lib/libggml.so
 lib/libggml.so.0
 lib/libggml.so.${PKGVERSION}
diff --git a/ggml/distinfo b/ggml/distinfo
index 4e6e6f17ef..112d05505a 100644
--- a/ggml/distinfo
+++ b/ggml/distinfo
@@ -3,3 +3,4 @@ $NetBSD$
 BLAKE2s (ggml-0.15.3.tar.gz) = 7a4eeb168e4d9bf1f6a7aa589b91bc1ca4d9d31096c9143985f0628bb9a56fa0
 SHA512 (ggml-0.15.3.tar.gz) = 51dad3310aa28e3daf2689d3617c5f978b50469b4676d101ce7071d0dfbe8b1d04755cc2114cd8ef7ba6dd1466daf6362b0cd42ddf6c9f1a84c3bc43664ec56c
 Size (ggml-0.15.3.tar.gz) = 3227851 bytes
+SHA1 (patch-include_ggml.h) = c342dfeafcf9987298b35140e978aeed619f0bfe
diff --git a/ggml/options.mk b/ggml/options.mk
new file mode 100644
index 0000000000..72ef213682
--- /dev/null
+++ b/ggml/options.mk
@@ -0,0 +1,21 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gglm
+PKG_SUPPORTED_OPTIONS=	vulkan
+PKG_SUGGESTED_OPTIONS= 	# empty
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=		vulkan
+PRINT_PLIST_AWK+=	/libggml-vulkan/ { $$0 = "$${PLIST.vulkan}" $$0 }
+
+.if !empty(PKG_OPTIONS:Mvulkan)
+DEPENDS+=		shaderc-[0-9]*:../../wip/shaderc
+CMAKE_CONFIGURE_ARGS+=	-DGGML_VULKAN=ON
+PLIST.vulkan=		yes
+.include "../../graphics/vulkan-headers/buildlink3.mk"
+.include "../../graphics/vulkan-loader/buildlink3.mk"
+.include "../../parallel/spirv-headers/buildlink3.mk"
+.else
+CMAKE_CONFIGURE_ARGS+=	-DGGML_VULKAN=OFF
+.endif
diff --git a/ggml/patches/patch-include_ggml.h b/ggml/patches/patch-include_ggml.h
new file mode 100644
index 0000000000..768d4f0b9c
--- /dev/null
+++ b/ggml/patches/patch-include_ggml.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Needed by stable-diffusion.cpp.
+
+--- include/ggml.h.orig	2026-07-01 15:09:07.213680840 +0000
++++ include/ggml.h
+@@ -226,7 +226,7 @@
+ #define GGML_MAX_OP_PARAMS      64
+ 
+ #ifndef GGML_MAX_NAME
+-#   define GGML_MAX_NAME        64
++#   define GGML_MAX_NAME        128
+ #endif
+ 
+ #define GGML_DEFAULT_N_THREADS  4


Home | Main Index | Thread Index | Old Index