ggml-python 0.0.34__tar.gz → 0.0.36__tar.gz

ggml_python-0.0.36/.github/dependabot.yaml

@@ -0,0 +1,15 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "pip" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

{ggml_python-0.0.34 → ggml_python-0.0.36}/.github/workflows/publish.yaml

@@ -10,11 +10,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: "true"
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: "3.8"
     - name: Install dependencies

{ggml_python-0.0.34 → ggml_python-0.0.36}/.github/workflows/test.yaml

@@ -10,116 +10,105 @@ on:
 
 jobs:
   build-linux:
-
     runs-on: ubuntu-latest
     strategy:
       matrix:
         python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: "true"
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
           python3 -m pip install --upgrade pip pytest cmake scikit-build setuptools
-          python3 -m pip install --verbose --editable .
+          python3 -m pip install \
+            --verbose \
+            --config-settings cmake.args='-DCMAKE_BUILD_TYPE=Debug;-DCMAKE_CXX_FLAGS=-g3;-DCMAKE_C_FLAGS=-g3' \
+            --config-settings cmake.verbose=true \
+            --config-settings logging.level=INFO \
+            --config-settings install.strip=false \
+            --editable .
       - name: Test with pytest
         run: |
-          python3 -m pytest
+          python -m pytest -s -vvvv
 
   build-windows:
-
     runs-on: windows-latest
     strategy:
       matrix:
         python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: "true"
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
       - name: Install dependencies
         run: |
           python3 -m pip install --upgrade pip pytest cmake scikit-build setuptools
-          python3 -m pip install --verbose --editable .
+          python3 -m pip install --verbose --config-settings cmake.args='-DCMAKE_BUILD_TYPE=Debug;-DCMAKE_CXX_FLAGS=-g3;-DCMAKE_C_FLAGS=-g3' --config-settings cmake.verbose=true --config-settings logging.level=INFO --config-settings install.strip=false --editable .
       - name: Test with pytest
         run: |
-          python3 -m pytest
+          python -m pytest -s -vvvv
 
   build-macos:
-
-    runs-on: macos-latest
+    runs-on: macos-13
     strategy:
       matrix:
         python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: "true"
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
           python3 -m pip install --upgrade pip pytest cmake scikit-build setuptools
-          python3 -m pip install --verbose --editable .
+          python3 -m pip install \
+            --verbose \
+            --config-settings cmake.args='-DCMAKE_BUILD_TYPE=Debug;-DCMAKE_CXX_FLAGS=-g3;-DCMAKE_C_FLAGS=-g3' \
+            --config-settings cmake.verbose=true \
+            --config-settings logging.level=INFO \
+            --config-settings install.strip=false \
+            --editable .
       - name: Test with pytest
         run: |
-          python3 -m pytest
-
-  # build-linux-opencl:
-  #   runs-on: ubuntu-latest
-
-  #   steps:
-  #     - uses: actions/checkout@v3
-  #       with:
-  #         submodules: "true"
-
-  #     - name: Dependencies
-  #       run: |
-  #         wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
-  #         echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list  
-  #         sudo apt-get update
-  #         sudo apt-get install -y --no-install-recommends llvm intel-oneapi-runtime-opencl intel-oneapi-runtime-compilers libclblast-dev
-  #         sudo apt-get install -y python3-dev python3-pip make
-      
-  #     - name: Setup
-  #       run: |
-  #         python3 -m pip install pytest
-  #         make build.clblast
-
-  #     - name: Test with pytest
-  #       run: |
-  #         make test
+          python -m pytest -s -vvvv
 
   build-macos-metal:
-
-    runs-on: macos-latest
+    runs-on: macos-13
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: "true"
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.8"
       - name: Install dependencies
         run: |
           python3 -m pip install --upgrade pip pytest cmake scikit-build setuptools
-          python3 -m pip install --verbose --editable . --config-settings=cmake.args='-DGGML_METAL=On'
+          python3 -m pip install \
+            --verbose \
+            --config-settings cmake.args='-DCMAKE_BUILD_TYPE=Debug;-DCMAKE_CXX_FLAGS=-g3;-DCMAKE_C_FLAGS=-g3;-DGGML_METAL=On' \
+            --config-settings cmake.verbose=true \
+            --config-settings logging.level=INFO \
+            --config-settings install.strip=false \
+            --editable .
       - name: Test with pytest
         run: |
-          python3 -m pytest
+          python -m pytest -s -vvvv

{ggml_python-0.0.34 → ggml_python-0.0.36}/.github/workflows/wheels-cuda.yaml

@@ -22,7 +22,7 @@ jobs:
           $matrix = @{
               'os' = @('ubuntu-20.04', 'windows-latest')
               'pyver' = @("3.10", "3.11", "3.12")
-              'cuda' = @("12.1.1", "12.2.2", "12.3.2")
+              'cuda' = @("12.1.1", "12.2.2", "12.3.2", "12.4.1")
               'releasetag' = @("basic")
           }
 
@@ -47,12 +47,12 @@ jobs:
         with:
           submodules: "recursive"
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.pyver }}
 
       - name: Setup Mamba
-        uses: conda-incubator/setup-miniconda@v2.2.0
+        uses: conda-incubator/setup-miniconda@v3.0.4
         with:
           activate-environment: "build"
           python-version: ${{ matrix.pyver }}
@@ -65,7 +65,7 @@ jobs:
       - name: VS Integration Cache
         id: vs-integration-cache
         if: runner.os == 'Windows'
-        uses: actions/cache@v3.3.2
+        uses: actions/cache@v4.0.2
         with:
           path: ./MSBuildExtensions
           key: cuda-${{ matrix.cuda }}-vs-integration
@@ -74,7 +74,7 @@ jobs:
         if: runner.os == 'Windows' && steps.vs-integration-cache.outputs.cache-hit != 'true'
         run: |
           if ($env:CUDAVER -eq '12.1.1') {$x = '12.1.0'} else {$x = $env:CUDAVER}
-          $links = (Invoke-RestMethod 'https://github.com/Jimver/cuda-toolkit/raw/dc0ca7bb29c5a92f7a963d3d5c93f8d59765136a/src/links/windows-links.ts').Trim().split().where({$_ -ne ''})
+          $links = (Invoke-RestMethod 'https://raw.githubusercontent.com/Jimver/cuda-toolkit/master/src/links/windows-links.ts').Trim().split().where({$_ -ne ''})
           for ($i=$q=0;$i -lt $links.count -and $q -lt 2;$i++) {if ($links[$i] -eq "'$x',") {$q++}}
           Invoke-RestMethod $links[$i].Trim("'") -OutFile 'cudainstaller.zip'
           & 'C:\Program Files\7-Zip\7z.exe' e cudainstaller.zip -oMSBuildExtensions -r *\MSBuildExtensions\* > $null
@@ -122,7 +122,7 @@ jobs:
           python -m build --wheel
           Write-Output "CUDA_VERSION=$cudaVersion" >> $env:GITHUB_ENV
 
-      - uses: softprops/action-gh-release@v1
+      - uses: softprops/action-gh-release@v2
         with:
           files: dist/*
           tag_name: ${{ github.ref_name }}-cu${{ env.CUDA_VERSION }}

{ggml_python-0.0.34 → ggml_python-0.0.36}/.github/workflows/wheels-index.yaml

@@ -31,13 +31,14 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Setup Pages
-        uses: actions/configure-pages@v4
+        uses: actions/configure-pages@v5
       - name: Build
         run: |
           ./scripts/releases-to-pep-503.sh index/whl/cpu '^[v]?[0-9]+\.[0-9]+\.[0-9]+$'
           ./scripts/releases-to-pep-503.sh index/whl/cu121 '^[v]?[0-9]+\.[0-9]+\.[0-9]+-cu121$'
           ./scripts/releases-to-pep-503.sh index/whl/cu122 '^[v]?[0-9]+\.[0-9]+\.[0-9]+-cu122$'
           ./scripts/releases-to-pep-503.sh index/whl/cu123 '^[v]?[0-9]+\.[0-9]+\.[0-9]+-cu123$'
+          ./scripts/releases-to-pep-503.sh index/whl/cu124 '^[v]?[0-9]+\.[0-9]+\.[0-9]+-cu124$'
           ./scripts/releases-to-pep-503.sh index/whl/metal '^[v]?[0-9]+\.[0-9]+\.[0-9]+-metal$'
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3

{ggml_python-0.0.34 → ggml_python-0.0.36}/.github/workflows/wheels-metal.yaml

@@ -1,4 +1,4 @@
-name: Build Wheels (Metal)
+name: Wheels Metal
 
 on: workflow_dispatch
 
@@ -41,7 +41,7 @@ jobs:
         with:
           submodules: "recursive"
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.pyver }}
 
@@ -78,7 +78,7 @@ jobs:
             VERBOSE=1 python -m build --wheel
           fi
 
-      - uses: softprops/action-gh-release@v1
+      - uses: softprops/action-gh-release@v2
         with:
           files: dist/*
           # set release name to <tag>-metal

{ggml_python-0.0.34 → ggml_python-0.0.36}/.github/workflows/wheels.yaml

@@ -14,12 +14,12 @@ jobs:
         os: [ubuntu-20.04, macos-11, windows-2022]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: "recursive"
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.16.5
+        uses: pypa/cibuildwheel@v2.18.0
         env:
           # disable repair
           CIBW_REPAIR_WHEEL_COMMAND: ""
@@ -30,7 +30,7 @@ jobs:
           package-dir: .
           output-dir: wheelhouse
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           path: ./wheelhouse/*.whl
 
@@ -40,11 +40,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: artifact
           path: dist
-      - uses: softprops/action-gh-release@v1
+      - uses: softprops/action-gh-release@v2
         with:
           files: dist/*
         env:

{ggml_python-0.0.34 → ggml_python-0.0.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ggml_python
-Version: 0.0.34
+Version: 0.0.36
 Summary: Python bindings for ggml
 Author-Email: Andrei Betlen <abetlen@gmail.com>
 License: MIT
@@ -23,13 +23,13 @@ Requires-Dist: mkdocs-material; extra == "docs"
 Requires-Dist: pillow; extra == "docs"
 Requires-Dist: cairosvg; extra == "docs"
 Requires-Dist: build; extra == "publish"
-Requires-Dist: accelerate==0.19.0; extra == "convert"
-Requires-Dist: numpy==1.24.3; extra == "convert"
-Requires-Dist: sentencepiece==0.1.98; extra == "convert"
-Requires-Dist: torch==2.0.1; extra == "convert"
-Requires-Dist: torchaudio==2.0.2; extra == "convert"
-Requires-Dist: torchvision==0.15.2; extra == "convert"
-Requires-Dist: transformers==4.29.2; extra == "convert"
+Requires-Dist: accelerate==0.30.1; extra == "convert"
+Requires-Dist: numpy==1.26.4; extra == "convert"
+Requires-Dist: sentencepiece==0.2.0; extra == "convert"
+Requires-Dist: torch==2.3.0; extra == "convert"
+Requires-Dist: torchaudio==2.3.0; extra == "convert"
+Requires-Dist: torchvision==0.18.0; extra == "convert"
+Requires-Dist: transformers==4.40.2; extra == "convert"
 Provides-Extra: test
 Provides-Extra: docs
 Provides-Extra: publish

{ggml_python-0.0.34 → ggml_python-0.0.36}/examples/clip/requirements.txt

@@ -1,24 +1,24 @@
 --extra-index-url https://download.pytorch.org/whl/cpu
-certifi==2022.12.7
+certifi==2023.7.22
 charset-normalizer==2.1.1
 clip==1.0
 filelock==3.9.0
 ftfy==6.1.1
 ggml-python @ git+https://github.com/abetlen/ggml-python@main
-idna==3.4
-Jinja2==3.1.2
+idna==3.7
+Jinja2==3.1.4
 MarkupSafe==2.1.2
-mpmath==1.2.1
+mpmath==1.3.0
 networkx==3.0
 numpy==1.24.1
-Pillow==9.3.0
+Pillow==10.3.0
 regex==2023.6.3
-requests==2.28.1
+requests==2.31.0
 scipy==1.10.1
 sympy==1.11.1
 torch==2.0.1+cpu
 torchvision==0.15.2+cpu
-tqdm==4.65.0
+tqdm==4.66.3
 typing-extensions==4.6.3
-urllib3==1.26.13
+urllib3==1.26.18
 wcwidth==0.2.6

ggml_python-0.0.36/examples/optimizer/simple.py

@@ -0,0 +1,89 @@
+# %% [markdown]
+"""
+# Single-batch stochastic gradient descent example using ggml
+
+This example demonstrates how to use ggml to implement a simple SGD optimizer.
+"""
+# %%
+import ggml
+import random
+
+a_real = 3.0
+b_real = 4.0
+
+ctx0 = ggml.ggml_init(ggml.ggml_init_params(
+    mem_size=128 * 1024 * 1024, mem_buffer=None, no_alloc=False
+))
+
+assert ctx0 is not None
+
+# define parameters
+a = ggml.ggml_new_tensor_1d(ctx0, ggml.GGML_TYPE_F32, 1)
+ggml.ggml_set_param(ctx0, a)
+
+b = ggml.ggml_new_tensor_1d(ctx0, ggml.GGML_TYPE_F32, 1)
+ggml.ggml_set_param(ctx0, b)
+
+# define input and output
+x = ggml.ggml_new_tensor_1d(ctx0, ggml.GGML_TYPE_F32, 1)
+ggml.ggml_set_input(x)
+
+tmp = ggml.ggml_mul(ctx0, a, x)
+f = ggml.ggml_add(ctx0, tmp, b)
+
+# define loss
+f_true = ggml.ggml_new_tensor_1d(ctx0, ggml.GGML_TYPE_F32, 1)
+ggml.ggml_set_input(f_true)
+
+tmp = ggml.ggml_sub(ctx0, f, f_true)
+loss = ggml.ggml_mul(ctx0, tmp, tmp)
+
+# build forward and backward graph
+gf = ggml.ggml_new_graph_custom(ctx0, ggml.GGML_DEFAULT_GRAPH_SIZE, True)
+ggml.ggml_build_forward_expand(gf, loss)
+gb = ggml.ggml_graph_dup(ctx0, gf)
+ggml.ggml_build_backward_expand(ctx0, gf, gb, False)
+
+# initialize parameters
+ggml.ggml_set_f32(a, 1.0)
+ggml.ggml_set_f32(b, 1.0)
+
+# SGD
+lr = 1e-2
+nsteps = 1000
+decay = 1e-3
+
+for i in range(nsteps):
+    # sample data
+    x_sample = random.uniform(-10, 10)
+    f_sample = a_real * x_sample + b_real
+
+    # set input
+    ggml.ggml_set_f32(x, x_sample)
+    ggml.ggml_set_f32(f_true, f_sample)
+
+    # reset graph
+    ggml.ggml_graph_reset(gf)
+    ggml.ggml_set_f32(loss.contents.grad, 1.0)
+
+    # compute forward and backward
+    ggml.ggml_graph_compute_with_ctx(ctx0, gb, 1)
+
+    # print loss
+    loss_ = ggml.ggml_get_f32_1d(loss, 0)
+    print(f"step {i}: loss = {loss_}")
+
+    # decay learning rate
+    lr *= (1.0 - decay)
+
+    # update parameters
+    ggml.ggml_set_f32(a, ggml.ggml_get_f32_1d(a, 0) - lr * ggml.ggml_get_f32_1d(a.contents.grad, 0))
+    ggml.ggml_set_f32(b, ggml.ggml_get_f32_1d(b, 0) - lr * ggml.ggml_get_f32_1d(b.contents.grad, 0))
+
+    # print parameters
+    print(f"a = {ggml.ggml_get_f32_1d(a, 0):.2f}, b = {ggml.ggml_get_f32_1d(b, 0):.2f}")
+
+
+ggml.ggml_free(ctx0)
+
+# %%