merge

theano/compile/module.py

@@ -120,8 +120,8 @@ class Component(object):
         Makes an instance of this Component using the mode provided
         and taking the containers in the memo dictionary.
 
-        A Component which builds nothing, such as External or
-        Temporary, may return None.
+        A Component which builds nothing, such as External, may return
+        None.
         """
         raise NotImplementedError
 
@@ -250,7 +250,6 @@ class External(_RComponent):
         return rval
 
 
-
 class Member(_RComponent):
     """
     Member represents a Result which is a state of a Composite. That

theano/scalar/basic.py

@@ -747,6 +747,7 @@ class Composite(ScalarOp):
 
     def __init__(self, inputs, outputs):
         env = Env(*gof.graph.clone(inputs, outputs))
+        gof.MergeOptimizer().optimize(env)
         inputs, outputs = env.inputs, env.outputs
 
         for node in env.nodes:

theano/tensor/basic.py

@@ -214,6 +214,9 @@ class Tensor(Type):
         except KeyError:
             raise TypeError("Unsupported dtype for %s: %s" % (self.__class__.__name__, self.dtype))
 
+    def to_scalar_type(self):
+        return scal.Scalar(dtype = self.dtype)
+
     def __eq__(self, other):
         """Compare True iff other is the same kind of Tensor"""
         return type(self) == type(other) and other.dtype == self.dtype and other.broadcastable == self.broadcastable

theano/tensor/elemwise.py

@@ -600,6 +600,14 @@ class Elemwise(Op):
         code = "\n".join(self._c_all(node, name, inames, onames, sub))
         return code
 
+# def elemwise_to_scal(env):
+#     mapping = {}
+#     inputs = []
+#     outputs = []
+#     for node in env.io_toposort():
+#         if not isinstance(node.op, Elemwise):
+#             raise TypeError('All ops in the graph must be Elemwise.')
+
 
 
 ################