diff --git a/misc/ggml/Makefile b/misc/ggml/Makefile index b635001401ae..94140d9521b8 100644 --- a/misc/ggml/Makefile +++ b/misc/ggml/Makefile @@ -1,46 +1,46 @@ PORTNAME= ggml DISTVERSIONPREFIX= v -DISTVERSION= 0.9.4 +DISTVERSION= 0.9.5 CATEGORIES= misc # machine-learning MAINTAINER= yuri@FreeBSD.org COMMENT= Tensor library for machine learning WWW= https://github.com/ggml-org/ggml LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE USES= cmake:testing compiler:c++17-lang python:run shebangfix USE_LDCONFIG= yes BROKEN_i386= compilation fails: LLVM ERROR: out of memory USE_GITHUB= yes GH_ACCOUNT= ggml-org -CMAKE_ON= BUILD_SHARED_LIBS +CMAKE_ON= BUILD_SHARED_LIBS \ + GGML_NATIVE CMAKE_OFF= GGML_BUILD_TESTS \ GGML_BUILD_EXAMPLES \ - GGML_NATIVE \ GGML_SSE42 \ GGML_AVX \ GGML_AVX2 \ GGML_BMI2 \ GGML_FMA \ GGML_F16C CMAKE_TESTING_ON= GGML_BUILD_TESTS BINARY_ALIAS= git=false OPTIONS_DEFINE= VULKAN OPTIONS_DEFAULT= VULKAN OPTIONS_SUB= yes VULKAN_CMAKE_BOOL= GGML_VULKAN VULKAN_BUILD_DEPENDS= glslc:graphics/shaderc \ vulkan-headers>0:graphics/vulkan-headers VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader -# tests as of 0.9.4: 100% tests passed, 0 tests failed out of 21 +# tests as of 0.9.5: 100% tests passed, 0 tests failed out of 21 .include diff --git a/misc/ggml/distinfo b/misc/ggml/distinfo index a5eede128310..cb78b54949e3 100644 --- a/misc/ggml/distinfo +++ b/misc/ggml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1762648478 -SHA256 (ggml-org-ggml-v0.9.4_GH0.tar.gz) = 24bd1500aef27147b92d023cff6dcffdfc8da9c56750f941f5d5d1b53875c623 -SIZE (ggml-org-ggml-v0.9.4_GH0.tar.gz) = 2193279 +TIMESTAMP = 1767411382 +SHA256 (ggml-org-ggml-v0.9.5_GH0.tar.gz) = 566d957c5884e4538ee62725b9a13ec0eb09e6442292572c4d95556a7309d107 +SIZE (ggml-org-ggml-v0.9.5_GH0.tar.gz) = 2437354 diff --git a/misc/ggml/files/patch-src_ggml-cpu_CMakeLists.txt b/misc/ggml/files/patch-src_ggml-cpu_CMakeLists.txt index a44169da8da7..6905a7cfff2b 100644 --- a/misc/ggml/files/patch-src_ggml-cpu_CMakeLists.txt +++ b/misc/ggml/files/patch-src_ggml-cpu_CMakeLists.txt @@ -1,30 +1,12 @@ ---- src/ggml-cpu/CMakeLists.txt.orig 2025-09-16 11:42:24 UTC +--- src/ggml-cpu/CMakeLists.txt.orig 2026-01-03 04:49:29 UTC +++ src/ggml-cpu/CMakeLists.txt -@@ -127,10 +127,6 @@ function(ggml_add_cpu_backend_variant_impl tag_name) - if (NOT ARM_MCPU_RESULT) - string(REGEX MATCH "-mcpu=[^ ']+" ARM_MCPU_FLAG "${ARM_MCPU}") +@@ -137,8 +137,7 @@ function(ggml_add_cpu_backend_variant_impl tag_name) endif() -- if ("${ARM_MCPU_FLAG}" STREQUAL "") -- set(ARM_MCPU_FLAG -mcpu=native) -- message(STATUS "ARM -mcpu not found, -mcpu=native will be used") -- endif() - include(CheckCXXSourceRuns) - -@@ -382,13 +378,13 @@ function(ggml_add_cpu_backend_variant_impl tag_name) - string(REGEX REPLACE "POWER *([0-9]+)" "\\1" EXTRACTED_NUMBER "${MATCHED_STRING}") - - if (EXTRACTED_NUMBER GREATER_EQUAL 10) -- list(APPEND ARCH_FLAGS -mcpu=power10 -mpowerpc64) -+ list(APPEND ARCH_FLAGS -mcpu=power10) - elseif (EXTRACTED_NUMBER EQUAL 9) -- list(APPEND ARCH_FLAGS -mcpu=power9 -mpowerpc64) -+ list(APPEND ARCH_FLAGS -mcpu=power9) - elseif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc64le") - list(APPEND ARCH_FLAGS -mcpu=powerpc64le -mtune=native) - else() -- list(APPEND ARCH_FLAGS -mcpu=native -mtune=native -mpowerpc64) -+ list(APPEND ARCH_FLAGS -mcpu=native -mtune=native) - endif() - elseif(GGML_CPU_ALL_VARIANTS) - # Begin with the lowest baseline + if ("${ARM_NATIVE_FLAG}" STREQUAL "") +- set(ARM_NATIVE_FLAG -mcpu=native) +- message(WARNING "ARM -march/-mcpu not found, -mcpu=native will be used") ++ message(WARNING "ARM: CPUTYPE will be used") + else() + message(STATUS "ARM detected flags: ${ARM_NATIVE_FLAG}") + endif() diff --git a/misc/ggml/pkg-plist b/misc/ggml/pkg-plist index 9c74452171bf..eed077be66fa 100644 --- a/misc/ggml/pkg-plist +++ b/misc/ggml/pkg-plist @@ -1,22 +1,31 @@ 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-opt.h include/ggml-rpc.h include/ggml-sycl.h include/ggml-vulkan.h include/ggml-webgpu.h +include/ggml-zendnn.h include/ggml.h include/gguf.h lib/cmake/ggml/ggml-config.cmake lib/cmake/ggml/ggml-version.cmake lib/libggml-base.so +lib/libggml-base.so.0 +lib/libggml-base.so.0.9.5 lib/libggml-cpu.so +lib/libggml-cpu.so.0 +lib/libggml-cpu.so.0.9.5 %%VULKAN%%lib/libggml-vulkan.so +%%VULKAN%%lib/libggml-vulkan.so.0 +%%VULKAN%%lib/libggml-vulkan.so.0.9.5 lib/libggml.so +lib/libggml.so.0 +lib/libggml.so.0.9.5 share/pkgconfig/ggml.pc