Merge pull request ocropus-archive#274 from tmbdev/native-cleanup

Native cleanup

README.md

@@ -150,7 +150,3 @@ retrain models as better recognizers become available.
 After making CLSTM a full replacement for `ocropus-rtrain`/`ocropus-rpred`, the
 next step will be to replace the binarization, text/image segmentation, and layout 
 analysis in OCRopus with trainable 2D LSTM models.
-
-## Solution for clang
-
-[Read README_OSX.md](README_OSX.md)

ocrolib/__init__.py

@@ -1,7 +1,9 @@
 __all__ = [
-    "binnednn","cairoextras","common","components","dbtables",
-    "fgen","gmmtree","gtkyield","hocr","lang","native",
-    "mlp","multiclass","default","lineest"
+    "common",
+    "hocr",
+    "lang",
+    "default",
+    "lineest",
 ]
 
 ################################################################

ocrolib/common.py

@@ -767,37 +767,6 @@ def ustrg2unicode(u,lig=ligatures.lig):
                 result += "<%d>"%value
     return result
 
-### code for instantiation native components
-
-def pyconstruct(s):
-    """Constructs a Python object from a constructor, an expression
-    of the form x.y.z.name(args).  This ensures that x.y.z is imported.
-    In the future, more forms of syntax may be accepted."""
-    env = {}
-    if "(" not in s:
-        s += "()"
-    path = s[:s.find("(")]
-    if "." in path:
-        module = path[:path.rfind(".")]
-        print("import", module)
-        exec "import "+module in env
-    return eval(s,env)
-
-def mkpython(name):
-    """Tries to instantiate a Python class.  Gives an error if it looks
-    like a Python class but can't be instantiated.  Returns None if it
-    doesn't look like a Python class."""
-    if name is None or len(name)==0:
-        return None
-    elif type(name) is not str:
-        return name()
-    elif name[0]=="=":
-        return pyconstruct(name[1:])
-    elif "(" in name or "." in name:
-        return pyconstruct(name)
-    else:
-        return None
-
 ################################################################
 ### loading and saving components
 ################################################################

ocrolib/lstm.py

@@ -91,17 +91,6 @@ def sumouter(us,vs,lo=-1.0,hi=1.0,out=None):
         result += outer(clip(u,lo,hi),v)
     return result
 
-def sumprod(us,vs,lo=-1.0,hi=1.0,out=None):
-    """Sum the element-wise products of the `us` and `vs`.
-    Values are clipped into the range `[lo,hi]`.
-    This is mainly used for computing weight updates
-    in logistic regression layers."""
-    assert len(us[0])==len(vs[0])
-    result = out or zeros(len(us[0]))
-    for u,v in zip(us,vs):
-        result += clip(u,lo,hi)*v
-    return result
-
 class Network:
     """General interface for networks. This mainly adds convenience
     functions for `predict` and `train`.