Merge pull request #132 from r9y9/fix-bandmat

Add unittests for bandmat and remove unused misc module

nnmnkwii/paramgen/_bandmat/testhelp.py

@@ -0,0 +1,79 @@
+"""Helper functions for testing."""
+
+# Copyright 2013, 2014, 2015, 2016, 2017, 2018 Matt Shannon
+
+# This file is part of bandmat.
+# See `License` for details of license and warranty.
+
+import numpy as np
+from numpy.random import randn
+
+
+def assert_allclose(
+    actual, desired, rtol=1e-7, atol=1e-14, msg="items not almost equal"
+):
+    if np.shape(actual) != np.shape(desired):
+        raise AssertionError(
+            "%s (wrong shape)\n ACTUAL:  %r\n DESIRED: %r" % (msg, actual, desired)
+        )
+    if not np.allclose(actual, desired, rtol, atol):
+        abs_err = np.abs(actual - desired)
+        rel_err = np.abs((actual - desired) / desired)
+        raise AssertionError(
+            "%s\n ACTUAL:\n%r\n DESIRED:\n%r\n"
+            " ABS ERR: %r (max %s)\n REL ERR: %r (max %s)"
+            % (msg, actual, desired, abs_err, np.max(abs_err), rel_err, np.max(rel_err))
+        )
+
+
+def assert_allequal(actual, desired, msg="items not equal"):
+    if np.shape(actual) != np.shape(desired):
+        raise AssertionError(
+            "%s (wrong shape)\n ACTUAL:  %r\n DESIRED: %r" % (msg, actual, desired)
+        )
+    if not np.all(actual == desired):
+        raise AssertionError("%s\n ACTUAL:\n%r\n DESIRED:\n%r" % (msg, actual, desired))
+
+
+def randomize_extra_entries(lo, u, mat_rect):
+    """Randomizes the extra entries of a rectangular matrix.
+
+    See the docstring for `band_c` for the definition of extra entries.
+
+    N.B. in-place, i.e. mutates `mat_rect`.
+    """
+    assert lo >= 0
+    assert u >= 0
+    assert mat_rect.shape[0] == lo + u + 1
+
+    size = mat_rect.shape[1]
+
+    for offset in range(1, u + 1):
+        mat_rect[u - offset, 0 : min(offset, size)] = randn()
+    for offset in range(1, lo + 1):
+        mat_rect[u + offset, max(size - offset, 0) : size] = randn()
+
+
+def randomize_extra_entries_bm(mat_bm):
+    if mat_bm.transposed:
+        randomize_extra_entries(mat_bm.u, mat_bm.l, mat_bm.data)
+    else:
+        randomize_extra_entries(mat_bm.l, mat_bm.u, mat_bm.data)
+
+
+def get_array_mem(*arrays):
+    """Returns a representation of the memory layout of an array.
+
+    This is intended to be used to check whether the memory used by a given
+    numpy array, or how this memory is mapped into the logical indices of the
+    tensor it represents, changes between two points in time.
+
+    Example usage:
+    >>> import numpy as np
+    >>> x = np.array([2.0, 3.0, 4.0])
+    >>> array_mem = get_array_mem(x)
+    >>> # some potentially complicated operation
+    >>> x *= 2.0
+    >>> assert get_array_mem(x) == array_mem
+    """
+    return [array.__array_interface__ for array in arrays]

pyproject.toml

@@ -24,3 +24,8 @@ mypy_ignore_packages=["nnmnkwii.paramgen._bandmat.*", "nnmnkwii.frontend.*"]
 
 [[tool.pysen.lint.mypy_targets]]
 paths = ["nnmnkwii", "tests"]
+
+[tool.pysen.lint.source]
+excludes = [
+  "tests/bandmat",
+]

setup.py

@@ -108,7 +108,6 @@ def run(self):
         ("nnmnkwii", "paramgen", "_bandmat", "core"),
         ("nnmnkwii", "paramgen", "_bandmat", "tensor"),
         ("nnmnkwii", "paramgen", "_bandmat", "linalg"),
-        ("nnmnkwii", "paramgen", "_bandmat", "misc"),
         ("nnmnkwii", "paramgen", "_bandmat", "overlap"),
     ]
     ext_modules.extend(