fixed support code in cc, added support code for complex numbers in base_tensor

base_tensor.py

@@ -166,6 +166,27 @@ class BaseTensor(ResultBase):
     def c_libraries(self):
         return []
 
+    def c_support_code(cls):
+        operator_template = """
+            me operator %(op)s(me y) {
+                me ret;
+                ret.real = this->real %(op)s y.real;
+                ret.imag = this->imag %(op)s y.imag;
+                return ret;
+            }
+        """        
+        template = """
+        struct theano_complex%(nbits)s : public npy_complex%(nbits)s
+        {
+            typedef theano_complex%(nbits)s me;
+            typedef npy_complex%(nbits)s base;
+
+            %(operators)s
+        };
+        """
+        d = dict(operators = "\n".join([operator_template % dict(op=op) for op in ["+", "-", "*", "/"]]))
+        return template % dict(d, nbits = 64) + template % dict(d, nbits = 128)
+
 
     ############################
     # Tensor specific attributes

gof/cc.py

@@ -395,9 +395,9 @@ class CLinker(Linker):
             return self.tasks[failure_code - n]
     
     def support_code(self):
-        ret = ""
+        ret = set()
         for x in self.results + self.op_order:
-            try: ret += x.c_support_code()
+            try: ret.add(x.c_support_code())
             except AbstractFunctionError: pass
         return ret
 
@@ -501,7 +501,10 @@ class CLinker(Linker):
             }
             """ % dict(struct_name = self.struct_name)
 
-            instantiate.customize.add_support_code(self.support_code() + self.struct_code + static)
+            instantiate.customize.add_support_code(self.struct_code)
+            instantiate.customize.add_support_code(static)
+            for support_code in self.support_code():
+                instantiate.customize.add_support_code(support_code)
             instantiate.customize.add_extra_compile_arg("-w")
             for arg in self.compile_args():
                 instantiate.customize.add_extra_compile_arg(arg)