merge with main; bump to v0.1.8

Author: akaszynski

.github/workflows/testing-and-deployment.yml

@@ -4,9 +4,9 @@ on:
   pull_request:
   push:
     tags:
-      - "v*"
+    - v*
     branches:
-      - main
+    - main
 
 # disable concurrent runs
 concurrency:
@@ -19,71 +19,71 @@ jobs:
     runs-on: ubuntu-latest
     name: Smoke Testing
     steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.10"
-
-      - name: Install OS packages
-        run: |
-          sudo apt update
-          sudo apt install libgl1-mesa-glx
-
-      - name: Build and validate wheel
-        run: |
-          pip install build twine
-          python -m build
-          twine check dist/*
-
-      - name: Install
-        run: pip install dist/*.whl
-
-      - name: Test
-        run: |
-          pip install -r requirements_test.txt
-          cd tests && python -m pytest -v
-
-      - name: Upload sdist
-        uses: actions/upload-artifact@v4
-        with:
-          path: ./dist/*.tar.gz
-          name: fast-simplification-sdist
+    - uses: actions/checkout@v4
+
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.10'
+
+    - name: Install OS packages
+      run: |
+        sudo apt update
+        sudo apt install libgl1-mesa-glx
+
+    - name: Build and validate wheel
+      run: |
+        pip install build twine
+        python -m build
+        twine check dist/*
+
+    - name: Install
+      run: pip install dist/*.whl
+
+    - name: Test
+      run: |
+        pip install -r requirements_test.txt
+        cd tests && python -m pytest -v
+
+    - name: Upload sdist
+      uses: actions/upload-artifact@v4
+      with:
+        path: ./dist/*.tar.gz
+        name: fast-simplification-sdist
 
   docs_build:
     name: Build Documentation
     runs-on: ubuntu-latest
     needs: smoke_testing
 
     steps:
-      - uses: actions/checkout@v4
-
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.10"
-
-      - name: Install OS packages
-        run: |
-          sudo apt update
-          sudo apt install libgl1-mesa-glx xvfb
-
-      - name: Install library
-        run: pip install .
-
-      - name: Build Documentation
-        run: |
-          pip install -r requirements_docs.txt
-          xvfb-run make -C doc html
-
-      - name: Deploy on tag
-        uses: JamesIves/github-pages-deploy-action@v4
-        if: startsWith(github.ref, 'refs/tags/')
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          branch: gh-pages
-          folder: doc/_build/html
+    - uses: actions/checkout@v4
+
+    - name: Setup Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.10'
+
+    - name: Install OS packages
+      run: |
+        sudo apt update
+        sudo apt install libgl1-mesa-glx xvfb
+
+    - name: Install library
+      run: pip install .
+
+    - name: Build Documentation
+      run: |
+        pip install -r requirements_docs.txt
+        xvfb-run make -C doc html
+
+    - name: Deploy on tag
+      uses: JamesIves/github-pages-deploy-action@v4
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        branch: gh-pages
+        folder: doc/_build/html
 
   build_wheels:
     needs: smoke_testing
@@ -92,21 +92,21 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-2019, macOS-latest]
+        os: [ubuntu-latest, windows-2019, macos-14, macos-13]
 
     steps:
-      - uses: actions/checkout@v4
+    - uses: actions/checkout@v4
 
-      - name: Build wheels
-        uses: pypa/cibuildwheel@v2.16.5
+    - name: Build wheels
+      uses: pypa/cibuildwheel@v2.20.0
 
-      - name: List generated wheels
-        run: ls ./wheelhouse/*
+    - name: List generated wheels
+      run: ls ./wheelhouse/*
 
-      - uses: actions/upload-artifact@v4
-        with:
-          path: ./wheelhouse/*.whl
-          name: fast-simplification-wheel-${{ matrix.os }}
+    - uses: actions/upload-artifact@v4
+      with:
+        path: ./wheelhouse/*.whl
+        name: fast-simplification-wheel-${{ matrix.os }}
 
   release:
     name: Release
@@ -118,18 +118,19 @@ jobs:
       url: https://pypi.org/p/fast-simplification
     permissions:
       id-token: write  # this permission is mandatory for trusted publishing
+      contents: write  # required to create a release
     steps:
-      - uses: actions/download-artifact@v4
-      - name: Flatten directory structure
-        run: |
-          mkdir -p dist/
-          find . -name '*.whl' -exec mv {} dist/ \;
-          find . -name '*.tar.gz' -exec mv {} dist/ \;
-      - name: Publish package distributions to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-      - name: Create GitHub Release
-        uses: softprops/action-gh-release@v1
-        with:
-          generate_release_notes: true
-          files: |
-            ./**/*.whl
+    - uses: actions/download-artifact@v4
+    - name: Flatten directory structure
+      run: |
+        mkdir -p dist/
+        find . -name '*.whl' -exec mv {} dist/ \;
+        find . -name '*.tar.gz' -exec mv {} dist/ \;
+    - name: Publish package distributions to PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1
+    - name: Create GitHub Release
+      uses: softprops/action-gh-release@v1
+      with:
+        generate_release_notes: true
+        files: |
+          ./**/*.whl

.pre-commit-config.yaml

@@ -1,29 +1,29 @@
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.1.15
+  rev: v0.6.1
   hooks:
-    - id: ruff
-      args: [--fix, --exit-non-zero-on-fix]
-      exclude: ^(docs/|tests)
-    - id: ruff-format
+  - id: ruff
+    args: [--fix, --exit-non-zero-on-fix]
+    exclude: ^(docs/|tests)
+  - id: ruff-format
 
 - repo: https://github.com/pycqa/isort
   rev: 5.13.2
   hooks:
   - id: isort
 
 - repo: https://github.com/codespell-project/codespell
-  rev: v2.2.6
+  rev: v2.3.0
   hooks:
   - id: codespell
-    args: ["--toml", "pyproject.toml"]
-    additional_dependencies: ["tomli"]
+    args: [--toml, pyproject.toml]
+    additional_dependencies: [tomli]
 
 - repo: https://github.com/keewis/blackdoc
   rev: v0.3.9
   hooks:
   - id: blackdoc
-    files: '\.py$'
+    files: \.py$
 
 # - repo: https://github.com/pycqa/pydocstyle
 #   rev: 6.1.1
@@ -33,7 +33,7 @@ repos:
 #     exclude: "tests/"
 
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.5.0
+  rev: v4.6.0
   hooks:
   - id: check-merge-conflict
   - id: debug-statements
@@ -42,8 +42,16 @@ repos:
     args: [--branch, main]
   - id: requirements-txt-fixer
 
+- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
+  rev: v2.14.0
+  hooks:
+  - id: pretty-format-toml
+    args: [--autofix]
+  - id: pretty-format-yaml
+    args: [--autofix, --indent, '2']
+
 # this validates our github workflow files
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.27.4
+  rev: 0.29.1
   hooks:
-    - id: check-github-workflows
+  - id: check-github-workflows

examples/replay.py

@@ -5,6 +5,7 @@
 This example shows how to replay a decimation sequence with replay.
 
 """
+
 from time import time
 
 import numpy as np

fast_simplification/_replay.pyx

@@ -135,7 +135,7 @@ def compute_indice_mapping(int[:, :] collapses, int n_points):
     cdef int i = 0
     cdef int j = 0
 
-    cdef long[:] application = np.zeros(n_points, dtype=int)
+    cdef int[:] application = np.zeros(n_points, dtype=np.int32)
     for i in range(n_points):
         if j == len(keep):
             break
@@ -148,7 +148,7 @@ def compute_indice_mapping(int[:, :] collapses, int n_points):
     return indice_mapping
 
 
-def clean_triangles_and_edges(long[:, :] mapped_triangles, bool clean_edges=False):
+def clean_triangles_and_edges(int[:, :] mapped_triangles, bool clean_edges=False):
     """Return the edges and triangles of a mesh from mapped triangles
 
     Args:
@@ -164,8 +164,8 @@ def clean_triangles_and_edges(long[:, :] mapped_triangles, bool clean_edges=Fals
     cdef int n_edges = 0
     cdef int n_triangles = 0
     cdef int N = len(mapped_triangles)
-    cdef long[:, :] edges_with_rep = np.zeros((N, 2), dtype=int)
-    cdef long[:, :] triangles = np.zeros((N, 3), dtype=int)
+    cdef int[:, :] edges_with_rep = np.zeros((N, 2), dtype=np.int32)
+    cdef int[:, :] triangles = np.zeros((N, 3), dtype=np.int32)
 
     for i in range(N):
         j = mapped_triangles[i, 0]
@@ -201,11 +201,11 @@ def clean_triangles_and_edges(long[:, :] mapped_triangles, bool clean_edges=Fals
         return np.asarray(edges_with_rep)[:n_edges, :], np.asarray(triangles)[:n_triangles, :]
 
 
-    cdef long[:, :] edges = np.zeros((n_edges, 2), dtype=int)
+    cdef int[:, :] edges = np.zeros((n_edges, 2), dtype=np.int32)
 
 
     # Lexicographic sort
-    cdef long[:] order = np.lexsort((np.asarray(edges_with_rep[:n_edges, 1]), np.asarray(edges_with_rep[:n_edges, 0])))
+    cdef int[:] order = np.lexsort((np.asarray(edges_with_rep[:n_edges, 1]), np.asarray(edges_with_rep[:n_edges, 0])))
     # Remove duplicates
     cdef int n_keep_edges = 1
     edges[0, :] = edges_with_rep[order[0], :]
@@ -216,4 +216,4 @@ def clean_triangles_and_edges(long[:, :] mapped_triangles, bool clean_edges=Fals
             n_keep_edges += 1
 
 
-    return np.asarray(edges)[:n_keep_edges, :], np.asarray(triangles)[:n_triangles, :]
+    return np.asarray(edges)[:n_keep_edges, :], np.asarray(triangles)[:n_triangles, :]

fast_simplification/_version.py

@@ -6,5 +6,6 @@
 version_info = 0, 27, 'dev0'
 
 """
-version_info = 0, 1, 7
+
+version_info = 0, 1, 8
 __version__ = ".".join(map(str, version_info))

fast_simplification/simplify.py

@@ -1,4 +1,5 @@
 """Simplification library."""
+
 import numpy as np
 
 from . import _simplify
@@ -199,10 +200,7 @@ def simplify_mesh(mesh, target_reduction=None, target_count=None, agg=7, verbose
             "Please install pyvista to use this feature with:\n" "pip install pyvista"
         )
 
-    # installed by pyvista
-    import numpy as np
-
-    n_faces = mesh.n_faces
+    n_faces = mesh.n_cells
     _simplify.load_from_vtk(
         mesh.n_points,
         mesh.points.astype(np.float64, copy=False),