New high-level Python API

.gitignore

@@ -13,3 +13,4 @@ build/
 *.os
 *.a
 *.so
+pydoc/_build

README.md

@@ -68,10 +68,7 @@ After building the executables, you can run two simple test runs as follows:
 
 To build the Python extension, run
 
-    python setup.py build
-    sudo python setup.py install
-
-(this is currently broken)
+    pip install .
 
 # Documentation / Examples
 
@@ -165,9 +162,10 @@ storage format.
 
 # Python API
 
-The `clstm.i` file implements a simple Python interface to clstm, plus
-a wrapper that makes an INetwork mostly a replacement for the lstm.py
-implementation from ocropy.
+The source code includes a Python interface to clstm (via Cython). Currently
+it only exposes the `CLSTMOCR` class for OCR training and prediction.
+To install it, just make sure you have the above dependencies and
+Cython (>=0.23) installed and run `pip install .`.
 
 # Comand Line Drivers
 

_clstm.pxd

@@ -0,0 +1,81 @@
+from cpython.ref cimport PyObject
+from libc.stddef cimport wchar_t
+from libcpp.vector cimport vector
+from libcpp.string cimport string
+from libcpp.memory cimport shared_ptr
+
+
+cdef extern from "<string>" namespace "std":
+    cppclass wstring:
+        cppclass iterator:
+            iterator()
+            wchar_t* operator*()
+            iterator(iterator &)
+            iterator operator++()
+            iterator operator--()
+            iterator operator==(iterator)
+            iterator operator!=(iterator)
+        iterator begin()
+        iterator end()
+
+
+cdef extern from "pyextra_defs.h":
+    cdef Py_ssize_t Unicode_AsWideChar(PyObject* ustr, Py_ssize_t length,
+                                       wchar_t* wchars)
+
+
+cdef extern from "pstring.h":
+    wstring utf8_to_utf32(string s)
+
+
+cdef extern from "clstm.h":
+    cdef double levenshtein[A, B](A a, B b)
+
+
+cdef extern from "clstm.h" namespace "ocropus":
+    cdef cppclass Assoc:
+        Assoc()
+        Assoc(string &s)
+        bint contains(string &key, bint parent = true)
+        string get(string &key)
+        string get(string &key, string default)
+        void set(string &key, string value)
+
+    cdef cppclass INetwork:
+        Assoc attr
+
+    ctypedef shared_ptr[INetwork] Network
+
+
+cdef extern from "tensor.h" namespace "ocropus":
+    cppclass TensorMap2:
+        pass
+
+    cdef cppclass Tensor2:
+        int dims[2]
+        float *ptr
+        void resize(int i, int j)
+        void put(float val, int i, int j)
+        float get(int i, int j)
+        TensorMap2 map()
+
+cdef extern from "clstmhl.h" namespace "ocropus":
+    struct CharPrediction:
+        int i
+        int x
+        wchar_t c
+        float p
+
+    # NOTE: The content of `codec` should be the utf-32 characters that the
+    #       network is supposed to learn, encoded as integers
+    cppclass CLSTMOCR:
+        int target_height
+        Network net
+        bint maybe_load(string &fname)
+        bint maybe_save(string &fname)
+        void createBidi(vector[int] codec, int nhidden)
+        void setLearningRate(float learning_rate, float momentum)
+        string train_utf8(TensorMap2 imgdata, string &target)
+        string predict_utf8(TensorMap2 imgdata)
+        void predict(vector[CharPrediction] &preds, TensorMap2 imgdata)
+        string aligned_utf8()