Merge pull request #17 from huggingface/releases/0.3.1

v0.3.1 release
huggingface · Dec 23, 2024 · e5b82e1 · e5b82e1
2 parents 8c0bd74 + 43b4833
commit e5b82e1
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 66 deletions.
diff --git a/.github/workflows/package-release.yml b/.github/workflows/package-release.yml
@@ -1,72 +1,74 @@
 name: Package Release
 on:
-  push:
-    branches:
-      - "releases/**"
-  workflow_dispatch:
+    push:
+        branches:
+            - "releases/**"
+    workflow_dispatch:
 
 jobs:
-  package-release:
-    strategy:
-      matrix:
-        platform:
-          - filename: cpu-win64
-            os: windows-latest
-            requirements: cpu.txt
-          - filename: cuda-win64
-            os: windows-latest
-            requirements: cuda.txt
+    package-release:
+        strategy:
+            matrix:
+                platform:
+                    - filename: cpu-win64
+                      os: windows-latest
+                      requirements: cpu.txt
+                      args: ""
 
-          - filename: cpu-macos-arm
-            os: macos-latest
-            requirements: cpu.txt
-          - filename: cuda-macos-arm
-            os: macos-latest
-            requirements: cuda.txt
+                    - filename: cuda-win64
+                      os: windows-latest
+                      requirements: cuda.txt
+                      args: "--only-binary=llama_cpp_python"
 
-          - filename: cpu-macos-x86
-            os: macos-13
-            requirements: cpu.txt
-          - filename: cuda-macos-x86
-            os: macos-13
-            requirements: cuda.txt
+                    - filename: cpu-macos-arm
+                      os: macos-latest
+                      requirements: cpu.txt
+                      args: ""
 
-          - filename: cpu-linux
-            os: ubuntu-latest
-            requirements: cpu.txt
-          - filename: cuda-linux
-            os: ubuntu-latest
-            requirements: cuda.txt
-    runs-on: ${{ matrix.platform.os }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          path: meshgen
-
-      - name: Setup Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.11'
+                    - filename: cpu-macos-x86
+                      os: macos-13
+                      requirements: cpu.txt
+                      args: ""
 
-      - name: Upgrade pip
-        shell: bash
-        run: "python -m pip install --upgrade setuptools pip"
+                    - filename: cpu-linux
+                      os: ubuntu-latest
+                      requirements: cpu.txt
+                      args: ""
 
-      - name: Install dependencies
-        shell: bash
-        run: "python -m pip install -r requirements/${{ matrix.platform.requirements }} --no-cache-dir --target .python_dependencies"
-        working-directory: meshgen
-
-      - name: Archive release
-        uses: thedoctor0/zip-release@main
-        with:
-          type: zip
-          filename: meshgen-${{ matrix.platform.filename }}.zip
-          exclusions: '*.git*'
-
-      - name: Archive and upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: meshgen-${{ matrix.platform.filename }}
-          path: meshgen-${{ matrix.platform.filename }}.zip
+                    - filename: cuda-linux
+                      os: ubuntu-latest
+                      requirements: cuda.txt
+                      args: "--only-binary=llama_cpp_python"
+        runs-on: ${{ matrix.platform.os }}
+        steps:
+            - name: Checkout repository
+              uses: actions/checkout@v4
+              with:
+                  path: meshgen
+
+            - name: Setup Python
+              uses: actions/setup-python@v4
+              with:
+                  python-version: "3.11"
+
+            - name: Upgrade pip
+              shell: bash
+              run: "python -m pip install --upgrade setuptools pip"
+
+            - name: Install dependencies
+              shell: bash
+              run: "python -m pip install -r requirements/${{ matrix.platform.requirements }} ${{ matrix.platform.args }} --no-cache-dir --target .python_dependencies"
+              working-directory: meshgen
+
+            - name: Archive release
+              uses: thedoctor0/zip-release@main
+              with:
+                  type: zip
+                  filename: meshgen-${{ matrix.platform.filename }}.zip
+                  exclusions: "*.git*"
+
+            - name: Archive and upload artifact
+              uses: actions/upload-artifact@v4
+              with:
+                  name: meshgen-${{ matrix.platform.filename }}
+                  path: meshgen-${{ matrix.platform.filename }}.zip
diff --git a/__init__.py b/__init__.py
@@ -2,7 +2,7 @@
     "name": "MeshGen",
     "description": "A Blender addon for generating meshes with AI",
     "author": "Hugging Face",
-    "version": (0, 3, 0),
+    "version": (0, 3, 1),
     "blender": (4, 1, 0),
     "category": "Mesh",
     "support": "COMMUNITY",

diff --git a/requirements/cpu.txt b/requirements/cpu.txt
@@ -1,4 +1,5 @@
+--extra-index-url https://abetlen.github.io/llama-cpp-python/whl/cpu
 llama_cpp_python==0.2.90
 
 huggingface_hub
-ollama
+ollama
diff --git a/requirements/cuda.txt b/requirements/cuda.txt
@@ -1,4 +1,5 @@
+--extra-index-url https://abetlen.github.io/llama-cpp-python/whl/cu121
 llama_cpp_python==0.2.90
 
 huggingface_hub
-ollama
+ollama