merged

__init__.py

 
 import gof
+import base_tensor
+import tensor
+import sparse
+import compile
+import gradient
+import opt
+
 from base_tensor import *
 from tensor import *
 from compile import *
-#from sparse import *
 from opt import *
 from gradient import *
 

gof/result.py

@@ -56,7 +56,9 @@ class ResultBase(object):
     __slots__ = ['_role', '_data', 'state', '_name', '_hash_id']
 
     def __init__(self, role=None, name=None):
-        self._role = role
+        self._role = None
+        if role is not None:
+            self.role = role
         self._data = [None]
         self.state = Empty
         self.name = name
@@ -98,6 +100,9 @@ class ResultBase(object):
             if _index != index:
                 raise ValueError("Result %s was already mapped to a different index." % self)
             return # because _owner is owner and _index == index
+        #TODO: this doesn't work because many bits of code set the role before
+        # owner.outputs.  Op.__init__ should do this I think. -JSB
+        #assert owner.outputs[index] is self
         self._role = role
 
     role = property(__get_role, __set_role)
@@ -331,6 +336,9 @@ class PythonResult(ResultBase):
         rval.data = copy.copy(self.data)
         return rval
 
-    
+def python_result(data, **kwargs):
+    rval = PythonResult(**kwargs)
+    rval.data = data
+    return rval
 
 

tensor.py

@@ -367,6 +367,11 @@ class Gemm(_Op):
     nout=1
     E_rank = 'gemm only works for rank 2'
     E_scalar = 'gemm requires scalar argument'
+    def __init__(self, *args, **kwargs):
+        z, a, x, y, b = args
+        if z in args[1:]:
+            raise ValueError('argument z not unique in argument list', args)
+        _Op.__init__(self, *args, **kwargs)
     def destroy_map(self):
         return {self.out:[self.inputs[0]]}
     def propagate_broadcastable(self, bz, ba, bx, by, bb):