Merge pull request #85 from lucasb-eyer/init-array-shortcut

Init array shortcut

Author: lucasb-eyer

DeepFried2/Param.py

@@ -6,11 +6,16 @@ class Param(object):
 
     def __init__(self, shape, init, fan=None, name=None, learn=True, decay=True, dtype=df.floatX, **kw):
         self.init = init
-        self.shape = shape
+        self.shape = (shape,) if _np.isscalar(shape) else tuple(shape)
         self.fan = fan
         self.decay = decay
 
-        val = init(self.shape, self.fan).astype(dtype)
+        # Support a useful shortcut for initializing with an array-like:
+        # TODO: It would be nicer to use Python's buffer-interface.
+        if hasattr(init, 'shape') and hasattr(init, 'dtype'):
+            self.init = df.init.array(init)
+
+        val = self.init(self.shape, self.fan).astype(dtype)
         self.param = df.th.shared(val, name=name, **kw)
 
         if learn: