pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
llama.cpp: use gglm
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Wed Jul 1 15:08:25 2026 +0200
Changeset: 7e13453c691a8663c0f7f6a178db7074ec447efd
Modified Files:
llama.cpp/Makefile
llama.cpp/PLIST
Log Message:
llama.cpp: use gglm
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7e13453c691a8663c0f7f6a178db7074ec447efd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
llama.cpp/Makefile | 21 +++------------------
llama.cpp/PLIST | 32 --------------------------------
2 files changed, 3 insertions(+), 50 deletions(-)
diffs:
diff --git a/llama.cpp/Makefile b/llama.cpp/Makefile
index dfefbd111e..cb1448b45f 100644
--- a/llama.cpp/Makefile
+++ b/llama.cpp/Makefile
@@ -18,35 +18,20 @@ USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
USE_CXX_FEATURES= c++17
-BLAS_INDEX64= yes
-BLAS_ACCEPTED= openblas_pthread #openblas_openmp
-BLAS_C_INTERFACE= yes
-
PKGCONFIG_OVERRIDE+= cmake/llama.pc.in
CMAKE_CONFIGURE_ARGS+= -DLLAMA_BUILD_NUMBER=${LLAMA_BUILD_NUMBER}
CMAKE_CONFIGURE_ARGS+= -DLLAMA_BUILD_COMMIT=${LLAMA_BUILD_COMMIT}
-CMAKE_CONFIGURE_ARGS+= -DGGML_BLAS=ON
-CMAKE_CONFIGURE_ARGS+= -DGGML_BLAS_VENDOR=OpenBLAS
-CMAKE_CONFIGURE_ARGS+= -DBLAS_LIBRARIES=${CBLAS_LIBS:Q}
-CMAKE_CONFIGURE_ARGS+= -DLLAMA_BUILD_TESTS=no
-CMAKE_CONFIGURE_ARGS+= -DGGML_OPENCL_EMBED_KERNELS=OFF
-CMAKE_CONFIGURE_ARGS+= -DGGML_OPENCL_PROFILING=OFF
-CMAKE_CONFIGURE_ARGS+= -DGGML_OPENCL_USE_ADRENO_KERNELS=OFF
+CMAKE_CONFIGURE_ARGS+= -DLLAMA_BUILD_TESTS=NO
+CMAKE_CONFIGURE_ARGS+= -DLLAMA_USE_SYSTEM_GGML=YES
PRINT_PLIST_AWK+= /lib\/.*\.so/ { sub(/${LLAMA_BUILD_NUMBER}/, "$${LLAMA_BUILD_NUMBER}") }
PLIST_SUBST+= LLAMA_BUILD_NUMBER=${LLAMA_BUILD_NUMBER}
-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},'
-
post-extract:
${LN} -s ${WRKDIR}/llama-${GITHUB_TAG} ${WRKSRC}/tools/ui/dist
.include "../../www/curl/buildlink3.mk"
+.include "../../wip/ggml/buildlink3.mk"
.include "../../devel/cmake/build.mk"
-.include "../../mk/blas.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/llama.cpp/PLIST b/llama.cpp/PLIST
index 043aa4103a..a8570b1856 100644
--- a/llama.cpp/PLIST
+++ b/llama.cpp/PLIST
@@ -41,45 +41,13 @@ bin/llama-speculative-simple
bin/llama-template-analysis
bin/llama-tokenize
bin/llama-tts
-include/ggml-alloc.h
-include/ggml-backend.h
-include/ggml-blas.h
-include/ggml-cann.h
-include/ggml-cpp.h
-include/ggml-cpu.h
-include/ggml-cuda.h
-include/ggml-metal.h
-include/ggml-openvino.h
-include/ggml-opt.h
-include/ggml-rpc.h
-include/ggml-sycl.h
-include/ggml-virtgpu.h
-include/ggml-vulkan.h
-include/ggml-webgpu.h
-include/ggml-zendnn.h
-include/ggml.h
-include/gguf.h
include/llama-cpp.h
include/llama.h
include/mtmd-debug.h
include/mtmd-helper.h
include/mtmd.h
-lib/cmake/ggml/ggml-config.cmake
-lib/cmake/ggml/ggml-version.cmake
lib/cmake/llama/llama-config.cmake
lib/cmake/llama/llama-version.cmake
-lib/libggml-base.so
-lib/libggml-base.so.0
-lib/libggml-base.so.0.15.3
-lib/libggml-blas.so
-lib/libggml-blas.so.0
-lib/libggml-blas.so.0.15.3
-lib/libggml-cpu.so
-lib/libggml-cpu.so.0
-lib/libggml-cpu.so.0.15.3
-lib/libggml.so
-lib/libggml.so.0
-lib/libggml.so.0.15.3
lib/libllama-batched-bench-impl.so
lib/libllama-bench-impl.so
lib/libllama-cli-impl.so
Home |
Main Index |
Thread Index |
Old Index