pkgsrc-WIP-changes archive

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

wip/llama.cpp: Use openblas's header files



Module Name:	pkgsrc-wip
Committed By:	Ryo ONODERA <ryoon%NetBSD.org@localhost>
Pushed By:	ryoon
Date:		Tue Dec 24 22:37:03 2024 +0900
Changeset:	1ea258ce6e8345b2ed3afe20b5313d286b104384

Modified Files:
	llama.cpp/Makefile

Log Message:
wip/llama.cpp: Use openblas's header files

Fix build without math/blas.

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

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

diffstat:
 llama.cpp/Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diffs:
diff --git a/llama.cpp/Makefile b/llama.cpp/Makefile
index 3ad5e2d896..e5139b6e77 100644
--- a/llama.cpp/Makefile
+++ b/llama.cpp/Makefile
@@ -18,7 +18,6 @@ USE_CXX_FEATURES=	gnu++17
 BLAS_INDEX64=		yes
 BLAS_ACCEPTED=		openblas_pthread #openblas_openmp
 BLAS_C_INTERFACE=	yes
-CXXFLAGS+=		${BLAS_INCLUDES}
 
 PKGCONFIG_OVERRIDE+=	cmake/llama.pc.in
 REPLACE_PYTHON+=	*.py */*.py */*/*.py
@@ -31,6 +30,12 @@ CMAKE_CONFIGURE_ARGS+=	-DGGML_OPENCL_EMBED_KERNELS=OFF
 CMAKE_CONFIGURE_ARGS+=	-DGGML_OPENCL_PROFILING=OFF
 CMAKE_CONFIGURE_ARGS+=	-DGGML_OPENCL_USE_ADRENO_KERNELS=OFF
 
+SUBST_CLASSES+=		findblas
+SUBST_STAGE.findblas=	pre-configure
+SUBST_MESSAGE.findblas=	Fixing libpci soname
+SUBST_FILES.findblas+=	ggml/src/ggml-blas/CMakeLists.txt
+SUBST_SED.findblas+=	-e 's,DepBLAS openblas64,DepBLAS ${BLAS_PC},'
+
 .include "../../devel/cmake/build.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/blas.buildlink3.mk"


Home | Main Index | Thread Index | Old Index