tinycwrap 0.0.4__tar.gz → 0.0.5__tar.gz

{tinycwrap-0.0.4 → tinycwrap-0.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tinycwrap
-Version: 0.0.4
+Version: 0.0.5
 Summary: Lightweight C-to-Python wrapper generator using CFFI and NumPy
 Author: TinyCWrap Contributors
 Requires-Python: >=3.9

{tinycwrap-0.0.4 → tinycwrap-0.0.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tinycwrap"
-version = "0.0.4"
+version = "0.0.5"
 description = "Lightweight C-to-Python wrapper generator using CFFI and NumPy"
 readme = "README.md"
 requires-python = ">=3.9"

tinycwrap-0.0.4/tests/test_examples.py → tinycwrap-0.0.5/tests/test_kernels.py

@@ -14,9 +14,9 @@ def cm():
 
 
 def test_dot(cm):
-    x = np.arange(10, dtype=np.float64)
-    y = np.ones_like(x)
-    assert cm.dot(x, y, len_x=len(x)) == np.sum(x * y)
+    x = np.array([1.0, 2.0, 3.0], dtype=np.float64)
+    y = np.array([4.0, 5.0, 6.0], dtype=np.float64)
+    assert cm.dot(x, y, len_x=len(x)) == np.dot(x, y)
 
 
 def test_scale_auto_output(cm):

{tinycwrap-0.0.4 → tinycwrap-0.0.5}/tests/test_path.py

@@ -52,3 +52,7 @@ def test_repr_pointer_array(cp):
     repr_str = repr(path)
     assert "segments=<segments* 0x" in repr_str
     assert "len_segments=2" in repr_str
+
+def test_post_contract(cp):
+    segments, len_segments = cp.geom2d_segments_from_rectellipse(1,2,3,4)
+    assert segments.shape == (4,)

{tinycwrap-0.0.4 → tinycwrap-0.0.5}/tinycwrap/__init__.py

@@ -6,6 +6,6 @@ from .cmodule import CModule
 try:
     __version__ = version("tinycwrap")
 except PackageNotFoundError:
-    __version__ = "0.0.4"
+    __version__ = "0.0.5"
 
 __all__ = ["CModule", "__version__"]

{tinycwrap-0.0.4 → tinycwrap-0.0.5}/tinycwrap/cmodule.py

@@ -381,24 +381,22 @@ class CModule:
             fspec.doc = doc
             contracts = []
             for line in doc.splitlines():
-                if "Contract:" in line or "Post-Contract:" in line:
-                    after = (
-                        line.split("Contract:", 1)[1]
-                        if "Contract:" in line
-                        else line.split("Post-Contract:", 1)[1]
-                    )
-                    is_post = "Post-Contract" in line
-                    for part in after.split(";"):
-                        part = part.strip()
-                        if not part:
-                            continue
-                        mlen = re.match(r"len\((\w+)\)\s*=\s*(.+)", part)
-                        if not mlen:
-                            mlen = re.match(r"(\w+)\s*=\s*(.+)", part)
-                        if mlen:
-                            target = mlen.group(1)
-                            expr = mlen.group(2).strip()
-                            contracts.append((target, expr, is_post))
+                m_contract = re.search(r"(post-)?contract:\s*(.*)", line, flags=re.IGNORECASE)
+                if not m_contract:
+                    continue
+                is_post = m_contract.group(1) is not None
+                after = m_contract.group(2)
+                for part in after.split(";"):
+                    part = part.strip()
+                    if not part:
+                        continue
+                    mlen = re.match(r"len\((\w+)\)\s*=\s*(.+)", part)
+                    if not mlen:
+                        mlen = re.match(r"(\w+)\s*=\s*(.+)", part)
+                    if mlen:
+                        target = mlen.group(1)
+                        expr = mlen.group(2).strip()
+                        contracts.append((target, expr, is_post))
             fspec.contracts = contracts or None
 
     def _mark_length_params_from_contracts(self):
@@ -496,7 +494,15 @@ class CModule:
                             target_dtype = _struct_dtypes.get(f.base_type)
                             provided = kwargs.get(f.name)
                             if provided is not None and target_dtype is not None:
-                                arr = np.ascontiguousarray(provided, dtype=target_dtype)
+                                try:
+                                    arr = np.ascontiguousarray(provided, dtype=target_dtype)
+                                except ValueError:
+                                    if hasattr(provided, "_data"):
+                                        arr = np.ascontiguousarray(provided._data, dtype=target_dtype)
+                                    elif isinstance(provided, (list, tuple)) and provided and hasattr(provided[0], "_data"):
+                                        arr = np.ascontiguousarray([p._data for p in provided], dtype=target_dtype)
+                                    else:
+                                        raise
                                 children[f.name] = arr
                                 data[f.name] = arr.ctypes.data
                                 if len_field in dtype.names and len_field not in kwargs:

{tinycwrap-0.0.4 → tinycwrap-0.0.5}/tinycwrap.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tinycwrap
-Version: 0.0.4
+Version: 0.0.5
 Summary: Lightweight C-to-Python wrapper generator using CFFI and NumPy
 Author: TinyCWrap Contributors
 Requires-Python: >=3.9

{tinycwrap-0.0.4 → tinycwrap-0.0.5}/tinycwrap.egg-info/SOURCES.txt

@@ -1,7 +1,7 @@
 README.md
 pyproject.toml
-tests/test_examples.py
 tests/test_geom.py
+tests/test_kernels.py
 tests/test_path.py
 tinycwrap/__init__.py
 tinycwrap/cmodule.py