libggml-python 0.9.5__tar.gz → 0.9.7__tar.gz

{libggml_python-0.9.5 → libggml_python-0.9.7}/.github/workflows/build-publish.yaml

@@ -31,7 +31,7 @@ jobs:
           submodules: recursive
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v3.3.0
+        uses: pypa/cibuildwheel@v3.3.1
         env:
           CIBW_PLATFORM: ${{ matrix.platform || 'auto' }}
 

{libggml_python-0.9.5 → libggml_python-0.9.7}/.gitignore

@@ -243,3 +243,6 @@ pyrightconfig.json
 
 # setuptools-scm
 _version.py
+
+# CMake
+CMakeFiles/

{libggml_python-0.9.5 → libggml_python-0.9.7}/.gitmodules

@@ -1,4 +1,4 @@
 [submodule "ggml"]
 	path = ggml
 	url = https://github.com/ggml-org/ggml
-	branch = v0.9.5
+	branch = v0.9.7

libggml_python-0.9.7/CMakeLists.txt

@@ -0,0 +1,98 @@
+cmake_minimum_required(VERSION 3.15)
+project(libggml LANGUAGES C CXX)
+
+add_subdirectory(ggml)
+
+target_link_libraries(ggml
+    PUBLIC
+        ggml-base
+        ggml-cpu
+)
+
+add_library(ggml::ggml ALIAS ggml)
+
+function(ggml_install_path target)
+    if(NOT TARGET ${target})
+        return()
+    endif()
+
+    if(APPLE)
+        set_target_properties(${target} PROPERTIES
+            BUILD_WITH_INSTALL_RPATH TRUE
+            INSTALL_RPATH "@loader_path"
+        )
+    else()
+        set_target_properties(${target} PROPERTIES
+            BUILD_WITH_INSTALL_RPATH TRUE
+            INSTALL_RPATH "$ORIGIN"
+        )
+    endif()
+endfunction()
+
+ggml_install_path(ggml)
+ggml_install_path(ggml-base)
+ggml_install_path(ggml-amx)
+ggml_install_path(ggml-blas)
+ggml_install_path(ggml-can)
+ggml_install_path(ggml-cpu)
+ggml_install_path(ggml-cuda)
+ggml_install_path(ggml-hip)
+ggml_install_path(ggml-kompute)
+ggml_install_path(ggml-metal)
+ggml_install_path(ggml-musa)
+ggml_install_path(ggml-rpc)
+ggml_install_path(ggml-sycl)
+ggml_install_path(ggml-vulkan)
+
+set(GGML_INSTALL_TARGETS
+    ggml
+    ggml-base
+    ggml-amx
+    ggml-blas
+    ggml-can
+    ggml-cpu
+    ggml-cuda
+    ggml-hip
+    ggml-kompute
+    ggml-metal
+    ggml-musa
+    ggml-rpc
+    ggml-sycl
+    ggml-vulkan
+)
+
+set(GGML_EXISTING_TARGETS "")
+foreach(t ${GGML_INSTALL_TARGETS})
+    if(TARGET ${t})
+        list(APPEND GGML_EXISTING_TARGETS ${t})
+    endif()
+endforeach()
+
+install(
+    TARGETS ${GGML_EXISTING_TARGETS}
+    EXPORT ggmlTargets
+    LIBRARY DESTINATION lib
+    ARCHIVE DESTINATION lib
+    RUNTIME DESTINATION lib
+)
+
+include(CMakePackageConfigHelpers)
+
+configure_package_config_file(
+    cmake/ggmlConfig.cmake.in
+    ${CMAKE_CURRENT_BINARY_DIR}/ggmlConfig.cmake
+    INSTALL_DESTINATION lib/cmake/ggml
+)
+
+install(
+    FILES
+        ${CMAKE_CURRENT_BINARY_DIR}/ggmlConfig.cmake
+    DESTINATION lib/cmake/ggml
+)
+
+install(
+    EXPORT ggmlTargets
+    FILE ggmlTargets.cmake
+    NAMESPACE ggml::
+    DESTINATION lib/cmake/ggml
+)

{libggml_python-0.9.5 → libggml_python-0.9.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: libggml-python
-Version: 0.9.5
+Version: 0.9.7
 Summary: Prebuilt ggml libraries
 Author: benniekiss
 License-Expression: MIT

libggml_python-0.9.7/cmake/ggmlConfig.cmake.in

@@ -0,0 +1,3 @@
+@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/ggmlTargets.cmake")

{libggml_python-0.9.5 → libggml_python-0.9.7}/pyproject.toml

@@ -31,6 +31,24 @@ sdist.include = ["ggml/", "src/libggml/_version.py"]
 
 [tool.scikit-build.cmake.define]
 CMAKE_RUNTIME_OUTPUT_DIRECTORY = "build"
+GGML_OPENMP = "OFF"
+GGML_VULKAN = "OFF"
+GGML_CUDA = "OFF"
+
+[[tool.scikit-build.overrides]]
+if.env.USE_VULKAN = true
+inherit.cmake.define = "append"
+cmake.define.GGML_VULKAN = "1"
+
+[[tool.scikit-build.overrides]]
+if.env.USE_CUDA = true
+inherit.cmake.define = "append"
+cmake.define.GGML_CUDA = "1"
+
+[[tool.scikit-build.overrides]]
+if.env.USE_OPENMP = true
+inherit.cmake.define = "append"
+cmake.define.GGML_OPENMP = "1"
 
 [project.entry-points."cmake.root"]
 ggml = "libggml"
@@ -54,3 +72,8 @@ repair-wheel-command = "delocate-wheel --exclude libggml* --require-archs {deloc
 [tool.cibuildwheel.windows]
 before-build = "pip install delvewheel"
 repair-wheel-command = "delvewheel repair --ignore-existing -w {dest_dir} {wheel}"
+
+[tool.uv]
+managed = true
+required-version = "~=0.10.0"
+index-url = "https://pypi.org/simple/"

{libggml_python-0.9.5 → libggml_python-0.9.7}/src/libggml/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.9.5'
-__version_tuple__ = version_tuple = (0, 9, 5)
+__version__ = version = '0.9.7'
+__version_tuple__ = version_tuple = (0, 9, 7)
 
-__commit_id__ = commit_id = 'g7b2ef6a20'
+__commit_id__ = commit_id = 'gf36fe691a'

libggml_python-0.9.5/CMakeLists.txt

@@ -1,37 +0,0 @@
-cmake_minimum_required(VERSION 3.15)
-project(libggml LANGUAGES C CXX)
-
-add_subdirectory(ggml)
-
-function(ggml_install_path target)
-    if(NOT TARGET ${target})
-        return()
-    endif()
-
-    if(APPLE)
-        set_target_properties(${target} PROPERTIES
-            INSTALL_RPATH "@loader_path"
-            BUILD_WITH_INSTALL_RPATH TRUE
-        )
-    else()
-        set_target_properties(${target} PROPERTIES
-            INSTALL_RPATH "$ORIGIN"
-            BUILD_WITH_INSTALL_RPATH TRUE
-        )
-    endif()
-endfunction()
-
-ggml_install_path(ggml)
-ggml_install_path(ggml-base)
-ggml_install_path(ggml-amx)
-ggml_install_path(ggml-blas)
-ggml_install_path(ggml-can)
-ggml_install_path(ggml-cpu)
-ggml_install_path(ggml-cuda)
-ggml_install_path(ggml-hip)
-ggml_install_path(ggml-kompute)
-ggml_install_path(ggml-metal)
-ggml_install_path(ggml-musa)
-ggml_install_path(ggml-rpc)
-ggml_install_path(ggml-sycl)
-ggml_install_path(ggml-vulkan)