Merge

theano/configdefaults.py

@@ -65,10 +65,6 @@ AddConfigVar('gpuelemwise.sync',
         "when true, wait that the gpu fct finished and check it error code.",
         BoolParam(True))
 
-AddConfigVar('cmodule.mac_framework_link',
-        "If set to true, breaks certain mac installations with the infamous Bus Error",
-        BoolParam(False))
-
 AddConfigVar('traceback.limit',
              "The number of stack to trace. -1 mean all.",
              IntParam(5))

theano/gof/cc.py

@@ -30,6 +30,13 @@ from compilelock import get_lock, release_lock
 
 import cmodule
 
+from theano.configparser import TheanoConfigParser, AddConfigVar, EnumStr, StrParam, IntParam, FloatParam, BoolParam
+
+AddConfigVar('gcc.cxxflags',
+        "Extra compiler flags for gcc",
+        StrParam(""))
+
+
 import logging
 _logger=logging.getLogger("theano.gof.cc")
 def info(*args):
@@ -840,6 +847,12 @@ class CLinker(link.Linker):
         if compile_args is not None: sig.append(tuple(compile_args))
         if libraries is not None: sig.append(tuple(libraries))
 
+        # technically this should only be appended for gcc-compiled Ops
+        # and the flags of other compilers should be inserted here... but it's not clear how to
+        # do this.
+        if config.gcc.cxxflags:
+            sig.append(config.gcc.cxxflags)
+
         def in_sig(i, topological_pos, i_idx):
             # assert that every input to every node is one of'
             # - an env input

theano/gof/cmodule.py

@@ -7,6 +7,12 @@ import numpy.distutils #TODO: TensorType should handle this
 
 import compilelock # we will abuse the lockfile mechanism when reading and writing the registry
 
+from theano.configparser import TheanoConfigParser, AddConfigVar, EnumStr, StrParam, IntParam, FloatParam, BoolParam
+AddConfigVar('cmodule.mac_framework_link',
+        "If set to true, breaks certain mac installations with the infamous Bus Error",
+        BoolParam(False))
+
+
 _logger=logging.getLogger("theano.gof.cmodule")
 _logger.setLevel(logging.WARN)
 
@@ -693,6 +699,7 @@ def gcc_module_compile_str(module_name, src_code, location=None, include_dirs=[]
         cmd.extend(p for p in preargs if not p.startswith('-O'))
     else:
         cmd.extend(preargs)
+    cmd.extend(config.gcc.cxxflags.split(' '))
     cmd.extend('-I%s'%idir for idir in include_dirs)
     cmd.extend(['-o',lib_filename]) 
     cmd.append(cppfilename)