pytetwild 0.1.dev1__tar.gz → 0.2.0__tar.gz

pytetwild-0.2.0/.clang-format

@@ -0,0 +1,13 @@
+---
+# We'll use defaults from the LLVM style, but with 4 columns indentation.
+BasedOnStyle: LLVM
+IndentWidth: 4
+---
+Language: Cpp
+# Force pointers to the type for C++.
+DerivePointerAlignment: false
+PointerAlignment: Right
+ColumnLimit: 94
+AlignAfterOpenBracket: AlwaysBreak
+BinPackArguments: false
+BinPackParameters: false

{pytetwild-0.1.dev1 → pytetwild-0.2.0}/.github/workflows/build-and-deploy.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
   push:
     tags:
-      - "*"
+      - "v*"
     branches:
       - "main"
 
@@ -19,21 +19,21 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-24.04, windows-2025, macos-latest, macos-15-intel]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: true
 
       - name: Setup Miniconda (Windows)
         if: runner.os == 'Windows'
-        uses: conda-incubator/setup-miniconda@v3.0.3
+        uses: conda-incubator/setup-miniconda@v3.3.0
 
       - name: Install Dependencies (Windows)
         if: runner.os == 'Windows'
         shell: powershell
-        run: conda install -c conda-forge mpir -y
+        run: conda install -c conda-forge mpir zlib -y
 
       - name: Set env (Windows)
         if: runner.os == 'Windows'
@@ -43,21 +43,58 @@ jobs:
           echo "GMP_LIB=C:\Miniconda\envs\test\Library\lib" >> ${env:GITHUB_ENV}
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.16.5
+        uses: pypa/cibuildwheel@v3.3.1
+        env:
+          CIBW_ENVIRONMENT_MACOS: 'MACOSX_DEPLOYMENT_TARGET="15.0"'
+          CIBW_ARCHS_MACOS: "auto"
 
       - name: List generated wheels
         run: ls ./wheelhouse/*
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v6
         with:
           path: ./wheelhouse/*.whl
-          name: pytetwild-wheel-${{ matrix.os }}
+          name: pytetwild-wheels-${{ matrix.os }}
+
+  test_abi3:
+    name: Test ABI3 wheels
+    needs: build_wheels
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ['3.13'] # , '3.14']  # skip 3.14 testing until vtk 9.6 is released
+        os: [ubuntu-24.04, windows-2025, macos-15-intel]  # must match build_wheels os
+    steps:
+    - uses: actions/checkout@v6
+    - uses: actions/setup-python@v6
+      with:
+        python-version: ${{ matrix.python-version }}
+    - uses: actions/download-artifact@v7
+      with:
+        pattern: pytetwild-wheels-${{ matrix.os }}
+        path: wheels/
+    - name: Find ABI3 wheel
+      id: find_wheel
+      shell: bash
+      run: |
+        WHEEL=$(ls wheels/*abi3*.whl | head -n 1)
+        echo "wheel=$WHEEL" >> "$GITHUB_OUTPUT"
+    - name: Install wheel
+      run: pip install "${{ steps.find_wheel.outputs.wheel }}"
+    - name: Install test dependencies from source
+      run: |
+        pip install tomli
+        python tools/extract-deps.py
+        pip install -r requirements-tests.txt
+    - name: Run tests
+      run: pytest
 
   build_sdist:
     name: Build source distribution
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: true
 
@@ -71,7 +108,6 @@ jobs:
           libboost-thread-dev \
           libglu1-mesa-dev \
           libsuitesparse-dev \
-          xorg-dev \
           ccache
 
       - name: Build source distribution
@@ -86,12 +122,12 @@ jobs:
       - name: Install from dist/
         run: |
           sdist_file=$(ls dist/*.tar.gz)
-          pip install "$sdist_file[dev]"
+          pip install "$sdist_file[tests]"
 
       - name: Test
         run: pytest -vv
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v6
         with:
           path: dist/*.tar.gz
           name: pytetwild-sdist
@@ -107,7 +143,7 @@ jobs:
     permissions:
       id-token: write  # this permission is mandatory for trusted publishing
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v7
       - name: Flatten directory structure
         run: |
           mkdir -p dist/
@@ -116,7 +152,7 @@ jobs:
       - name: Publish package distributions to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
       - name: Create GitHub Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           generate_release_notes: true
           files: |

{pytetwild-0.1.dev1 → pytetwild-0.2.0}/.gitignore

@@ -45,10 +45,13 @@ venv/
 
 # skbuild
 _skbuild/
+.skbuild-info.json
+compile_commands.json
 
 # cmake
 .ninja_deps
 .ninja_log
+.cmake
 CMakeCache.txt
 CMakeFiles/
 CMakeInit.txt
@@ -72,6 +75,23 @@ fTetWildWrapper.sln
 x64/
 Release/
 mpir.dll
+_deps
+appleclang*
+gnu_14.3_cxx17_64_release/
+src/GPATH
+src/GRTAGS
+src/GTAGS
+.clangd
+libnanobind-static-abi3.a
 
 # cibuildwheel
-wheelhouse
+wheelhouse
+
+# test and temp files
+tests/test_data/csgtree.json
+__b_vs.xyz
+__cutting.stl
+__opt.stl
+
+# nixos
+shell.nix

{pytetwild-0.1.dev1 → pytetwild-0.2.0}/.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.1.11
+  rev: v0.14.14
   hooks:
     - id: ruff
       args: [--fix, --exit-non-zero-on-fix]
@@ -8,19 +8,19 @@ repos:
     - id: ruff-format
 
 - repo: https://github.com/keewis/blackdoc
-  rev: v0.3.9
+  rev: v0.4.6
   hooks:
   - id: blackdoc
     exclude: README.rst
 
 - repo: https://github.com/numpy/numpydoc
-  rev: v1.6.0
+  rev: v1.10.0
   hooks:
   - id: numpydoc-validation
     files: ^src/pytetwild
 
 - repo: https://github.com/codespell-project/codespell
-  rev: v2.2.6
+  rev: v2.4.1
   hooks:
   - id: codespell
     args: ["--skip=*.vt*"]
@@ -33,14 +33,14 @@ repos:
     files: ^src/pytetwild/.*\.py
 
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.5.0
+  rev: v6.0.0
   hooks:
   - id: check-merge-conflict
   - id: debug-statements
   - id: trailing-whitespace
 
 - repo: https://github.com/pre-commit/mirrors-clang-format
-  rev: v17.0.6
+  rev: v21.1.8
   hooks:
   - id: clang-format
     files: |
@@ -49,18 +49,16 @@ repos:
       )$
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: v1.7.0
+  rev: v1.19.1
   hooks:
   - id: mypy
     exclude: ^(docs/|tests)
     additional_dependencies: [
-    "mypy-extensions==1.0.0",
     "toml==0.10.2",
-    "npt_promote",
     "numpy",
   ]
 
 - repo: https://github.com/python-jsonschema/check-jsonschema
-  rev: 0.27.3
+  rev: 0.36.1
   hooks:
     - id: check-github-workflows

{pytetwild-0.1.dev1 → pytetwild-0.2.0}/CMakeLists.txt

@@ -1,25 +1,35 @@
 cmake_minimum_required(VERSION 3.15...3.26)
-project(fTetWildWrapper)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ./src/pytetwild)
+project(fTetWildWrapper_project LANGUAGES CXX)
 
-if($ENV{USE_MAVX})
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mavx")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx")
-endif()
+find_package(Python 3.10
+  REQUIRED COMPONENTS Interpreter Development.Module
+  OPTIONAL_COMPONENTS Development.SABIModule)
+find_package(nanobind CONFIG REQUIRED)
+
+nanobind_add_module(
+  # name of the extension
+  PyfTetWildWrapper
+
+  # Target the stable ABI for Python 3.12+, which reduces
+  # the number of binary wheels that must be built. This
+  # does nothing on older Python versions
+  STABLE_ABI
+
+  src/FTetWildWrapper.cpp
+)
+
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ./src/pytetwild)
 
 # Set the path to the fTetWild project
 set(fTetWild_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/fTetWild")
 
-# Add the pybind11 submodule
-set(PYBIND11_NEWPYTHON ON)
-set(pybind11_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/pybind11")
-add_subdirectory(${pybind11_DIR})
+# Enable aggressive optimization
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
+set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -O3")
 
 # Include the fTetWild project as a subdirectory
 add_subdirectory(${fTetWild_DIR} EXCLUDE_FROM_ALL)
 
-pybind11_add_module(PyfTetWildWrapper MODULE "${CMAKE_CURRENT_SOURCE_DIR}/src/FTetWildWrapper.cpp")
-
 # Include directories from fTetWild required for the wrapper
 target_include_directories(PyfTetWildWrapper PUBLIC ${fTetWild_DIR}/src)
 
@@ -27,6 +37,7 @@ target_include_directories(PyfTetWildWrapper PUBLIC ${fTetWild_DIR}/src)
 target_link_libraries(PyfTetWildWrapper PRIVATE FloatTetwild)
 target_compile_features(PyfTetWildWrapper PUBLIC cxx_std_11)
 
+# still necessary?
 if(WIN32)
     set_target_properties(PyfTetWildWrapper PROPERTIES SUFFIX ".pyd")
     foreach(OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES})
@@ -38,4 +49,4 @@ if(WIN32)
     endforeach()
 endif()
 
-install(TARGETS PyfTetWildWrapper LIBRARY DESTINATION ./pytetwild)
+install(TARGETS PyfTetWildWrapper LIBRARY DESTINATION pytetwild)

{pytetwild-0.1.dev1 → pytetwild-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pytetwild
-Version: 0.1.dev1
+Version: 0.2.0
 Summary: Python wrapper of fTetWild
 Author-Email: Alex Kaszynski <akascap@gmail.com>
 Classifier: Development Status :: 3 - Alpha
@@ -10,20 +10,22 @@ Classifier: License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: POSIX
 Classifier: Operating System :: MacOS
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Requires-Python: <3.15,>=3.10
 Requires-Dist: numpy
-Requires-Dist: pyvista; extra == "all"
-Requires-Dist: pytest; extra == "dev"
-Requires-Dist: pre-commit; extra == "dev"
-Requires-Dist: pyvista; extra == "dev"
-Requires-Dist: scipy; extra == "dev"
-Requires-Dist: meshio; extra == "dev"
 Provides-Extra: all
+Requires-Dist: pyvista; extra == "all"
+Provides-Extra: tests
+Requires-Dist: pytest; extra == "tests"
+Requires-Dist: pyvista; extra == "tests"
+Requires-Dist: scipy; extra == "tests"
+Requires-Dist: meshio; extra == "tests"
 Provides-Extra: dev
+Requires-Dist: pre-commit; extra == "dev"
 Description-Content-Type: text/x-rst
 
 pytetwild
@@ -45,13 +47,17 @@ Python wrapper around the efficient C++ library for tetrahedral meshing provided
 Installation
 ************
 
-We have pre-built wheels for Python 3.8 - Python 3.12 for Windows and Linux x64.
+We have pre-built wheels for Python 3.10 - Python 3.14 for Windows, Linux, and macOS.
 
 The recommended way to install ``pytetwild`` is via PyPI:
 
 .. code:: sh
 
-   pip install pytetwild
+   pip install pytetwild[all]
+
+This installs ``pyvista`` by default, which you can use to tetrahedralize
+sufrace meshes from PyVista. Alternatively you can just install with ``pip
+install pytetwild`` for a lighter install.
 
 You can also clone the repository and install it from source, but since there's
 C++ involved, the build is a bit more complicated. See ``CONTRIBUTING.md`` for
@@ -61,7 +67,8 @@ more details.
 Usage
 *****
 
-To tetrahedralize a surface mesh from `PyVista <https://docs.pyvista.org>`_:
+To tetrahedralize a surface mesh from `PyVista <https://docs.pyvista.org>`_,
+you'll need to first install ``pyvista`` as it's not a dependency and then run:
 
 .. code:: py
 
@@ -74,18 +81,22 @@ To tetrahedralize a surface mesh from `PyVista <https://docs.pyvista.org>`_:
 
    # Convert the surface mesh to a tetrahedral mesh. For this example let's
    # use a coarse mesh
-   tetrahedral_mesh = pytetwild.tetrahedralize_pv(surface_mesh, edge_length_fac=1))
+   tetrahedral_mesh = pytetwild.tetrahedralize_pv(surface_mesh, edge_length_fac=1)
 
    # Visualize the tetrahedral mesh in an "exploded" view
-   tetrahedral_mesh.explode(1).plot(show_edges=True)
+   tetrahedral_mesh.explode(0.5).plot(
+       show_edges=True, zoom=1.6, ssao=True, anti_aliasing="ssaa"
+   )
+
 
 .. image:: https://github.com/pyvista/pytetwild/raw/main/exploded-sphere.png
 
 You can also work with raw arrays. Here's a simple cube that we turn into tetrahedra.
 
-.. code:: pycon
+.. code:: py
 
    import numpy as np
+   import pytetwild
 
    # Define vertices of the cube
    vertices = np.array([
@@ -114,25 +125,49 @@ You can also work with raw arrays. Here's a simple cube that we turn into tetrah
 
 Usage - Options
 ---------------
-We've surfaced a handful of parameters to each of our interfaces
-``tetrahedralize`` and ``tetrahedralize_pv``. Here are the optional parameters.
+We've surfaced a several parameters to each of our interfaces
+``tetrahedralize`` and ``tetrahedralize_pv``:
 
 .. code::
 
-    Additional Parameters
-    ---------------------
+    Parameters
+    ----------
     edge_length_fac : float, default: 0.05
-        Tetrahedral edge length as a function of bounding box diagional. The
-        default ideal edge length is bb/20 (bounding box divided by 20).
-    optimize : bool
+        Tetrahedral edge length as a function of bounding box diagonal. The
+        default ideal edge length is ``bb/20`` (bounding box divided by
+        20). Ignored when ``edge_length_abs`` is input.
+    edge_length_abs : float, optional
+        Absolute ideal edge length. When input ``edge_length_fac`` is ignored.
+    optimize : bool, default: True
         Improve the minimum scaled Jacobean for each cell. This leads to higher
-        cell quality at the expense of computation time.
+        cell quality at the expense of computation time. Optimization level is
+        dependent on ``stop_energy`` and ``num_opt_iter``.
+    simplify : bool, default: True
+        Simplfiy the input mesh surface before tetrahedralization.
+    epsilon : float, default 1e-3
+        Envelop size, specifying the maximum distance of the output surface
+        from the input surface, relative to the bounding box size.
+    stop_energy : float, default: 10.0
+        The mesh optimization stops when the conformal AMIPS energy reaches
+        ``stop_energy``.
+    coarsen : bool, default: False
+        Coarsen the output as much as possible, while maintaining the mesh
+        quality.
+    num_threads : int, default: 0
+        Set number of threads used. 0 (default) uses all available cores.
+    num_opt_iter : int, default: 80
+        Maximum number of optimization iterations if ``optimize=True``.
+    loglevel : int, default: 6
+        Set log level (0 = most verbose, 6 = minimal output).
+    quiet : bool, default: False
+        Disable all output. Overrides ``loglevel``.
+
 
 
 License and Acknowledgments
 ***************************
 
-This project relies on ``fTetWild`` and credits go to the original authors for
+This project relies on ``fTetWild`` and credit goes to the original authors for
 their efficient C++ library for tetrahedral meshing. That work is licensed
 under the Mozilla Public License v2.0.
 

{pytetwild-0.1.dev1 → pytetwild-0.2.0}/README.rst

@@ -17,13 +17,17 @@ Python wrapper around the efficient C++ library for tetrahedral meshing provided
 Installation
 ************
 
-We have pre-built wheels for Python 3.8 - Python 3.12 for Windows and Linux x64.
+We have pre-built wheels for Python 3.10 - Python 3.14 for Windows, Linux, and macOS.
 
 The recommended way to install ``pytetwild`` is via PyPI:
 
 .. code:: sh
 
-   pip install pytetwild
+   pip install pytetwild[all]
+
+This installs ``pyvista`` by default, which you can use to tetrahedralize
+sufrace meshes from PyVista. Alternatively you can just install with ``pip
+install pytetwild`` for a lighter install.
 
 You can also clone the repository and install it from source, but since there's
 C++ involved, the build is a bit more complicated. See ``CONTRIBUTING.md`` for
@@ -33,7 +37,8 @@ more details.
 Usage
 *****
 
-To tetrahedralize a surface mesh from `PyVista <https://docs.pyvista.org>`_:
+To tetrahedralize a surface mesh from `PyVista <https://docs.pyvista.org>`_,
+you'll need to first install ``pyvista`` as it's not a dependency and then run:
 
 .. code:: py
 
@@ -46,18 +51,22 @@ To tetrahedralize a surface mesh from `PyVista <https://docs.pyvista.org>`_:
 
    # Convert the surface mesh to a tetrahedral mesh. For this example let's
    # use a coarse mesh
-   tetrahedral_mesh = pytetwild.tetrahedralize_pv(surface_mesh, edge_length_fac=1))
+   tetrahedral_mesh = pytetwild.tetrahedralize_pv(surface_mesh, edge_length_fac=1)
 
    # Visualize the tetrahedral mesh in an "exploded" view
-   tetrahedral_mesh.explode(1).plot(show_edges=True)
+   tetrahedral_mesh.explode(0.5).plot(
+       show_edges=True, zoom=1.6, ssao=True, anti_aliasing="ssaa"
+   )
+
 
 .. image:: https://github.com/pyvista/pytetwild/raw/main/exploded-sphere.png
 
 You can also work with raw arrays. Here's a simple cube that we turn into tetrahedra.
 
-.. code:: pycon
+.. code:: py
 
    import numpy as np
+   import pytetwild
 
    # Define vertices of the cube
    vertices = np.array([
@@ -86,25 +95,49 @@ You can also work with raw arrays. Here's a simple cube that we turn into tetrah
 
 Usage - Options
 ---------------
-We've surfaced a handful of parameters to each of our interfaces
-``tetrahedralize`` and ``tetrahedralize_pv``. Here are the optional parameters.
+We've surfaced a several parameters to each of our interfaces
+``tetrahedralize`` and ``tetrahedralize_pv``:
 
 .. code::
 
-    Additional Parameters
-    ---------------------
+    Parameters
+    ----------
     edge_length_fac : float, default: 0.05
-        Tetrahedral edge length as a function of bounding box diagional. The
-        default ideal edge length is bb/20 (bounding box divided by 20).
-    optimize : bool
+        Tetrahedral edge length as a function of bounding box diagonal. The
+        default ideal edge length is ``bb/20`` (bounding box divided by
+        20). Ignored when ``edge_length_abs`` is input.
+    edge_length_abs : float, optional
+        Absolute ideal edge length. When input ``edge_length_fac`` is ignored.
+    optimize : bool, default: True
         Improve the minimum scaled Jacobean for each cell. This leads to higher
-        cell quality at the expense of computation time.
+        cell quality at the expense of computation time. Optimization level is
+        dependent on ``stop_energy`` and ``num_opt_iter``.
+    simplify : bool, default: True
+        Simplfiy the input mesh surface before tetrahedralization.
+    epsilon : float, default 1e-3
+        Envelop size, specifying the maximum distance of the output surface
+        from the input surface, relative to the bounding box size.
+    stop_energy : float, default: 10.0
+        The mesh optimization stops when the conformal AMIPS energy reaches
+        ``stop_energy``.
+    coarsen : bool, default: False
+        Coarsen the output as much as possible, while maintaining the mesh
+        quality.
+    num_threads : int, default: 0
+        Set number of threads used. 0 (default) uses all available cores.
+    num_opt_iter : int, default: 80
+        Maximum number of optimization iterations if ``optimize=True``.
+    loglevel : int, default: 6
+        Set log level (0 = most verbose, 6 = minimal output).
+    quiet : bool, default: False
+        Disable all output. Overrides ``loglevel``.
+
 
 
 License and Acknowledgments
 ***************************
 
-This project relies on ``fTetWild`` and credits go to the original authors for
+This project relies on ``fTetWild`` and credit goes to the original authors for
 their efficient C++ library for tetrahedral meshing. That work is licensed
 under the Mozilla Public License v2.0.