moving and renaming cuda and nvcc config variables

theano/configdefaults.py

@@ -145,10 +145,6 @@ AddConfigVar('op.set_flops',
         BoolParam(False),
         in_c_key=False)
 
-AddConfigVar('nvcc.fastmath',
-        "",
-        BoolParam(False))
-
 AddConfigVar('gpuelemwise.sync',
         "when true, wait that the gpu fct finished and check it error code.",
         BoolParam(True))

theano/sandbox/cuda/__init__.py

 import atexit, logging, os, stat, sys
 from theano.compile import optdb
-from theano import config
 from theano.gof.cmodule import get_lib_extension
+from theano.configparser import config, AddConfigVar, StrParam
 import nvcc_compiler
 
 _logger_name = 'theano.sandbox.cuda'
@@ -20,6 +20,22 @@ def debug(*msg):
     _logger.debug('DEBUG (%s): %s'% ( _logger_name,
         ' '.join(str(m) for m in msg)))
 
+AddConfigVar('cuda.root',
+        """directory with bin/, lib/, include/ for cuda utilities.
+        This directory is included via -L and -rpath when linking dynamically
+        compiled modules.  If AUTO, if nvcc is in the path, it will use one of
+        this parent directory.  Otherwise /usr/local/cuda.  Leave empty to
+        prevent extra linker directives.
+        Default: environment variable "CUDA_ROOT" or else "AUTO".
+        """,
+        StrParam(os.getenv('CUDA_ROOT', "AUTO")))
+
+if config.cuda.root == "AUTO":
+    # set nvcc_path correctly and get the version
+    nvcc_compiler.set_cuda_root()
+
+#is_nvcc_available called here to initialize global vars in nvcc_compiler module
+nvcc_compiler.is_nvcc_available()
 
 # Compile cuda_ndarray.cu
 # This need that nvcc (part of cuda) is installed. If it is not, a warning is

theano/sandbox/cuda/nvcc_compiler.py

@@ -7,20 +7,7 @@ import commands
 _logger=logging.getLogger("theano.sandbox.cuda.nvcc_compiler")
 _logger.setLevel(logging.WARN)
 
-from theano.configparser import config, AddConfigVar, StrParam
-
-AddConfigVar('nvcc.compiler_bindir',
-        "If defined, nvcc compiler driver will seek g++ and gcc in this directory",
-        StrParam(""))
-
-AddConfigVar('nvcc.flags',
-        "Extra compiler flags for nvcc",
-        StrParam(""))
-
-AddConfigVar('cuda.root',
-        "The directory with bin/, lib/, include/ for cuda utilities. Used to put this directory of nvidia lib in the compiled libraire. Usefull when people forget to update there LD_LIBRARY_PATH and LIBRARY_PATH environment variable. If AUTO, if nvcc is in the path, it will use one of this parent directory. Otherwise /usr/local/cuda. If empty, won't appen the directory in the compiled library",
-        StrParam(os.getenv('CUDA_ROOT', "AUTO")))
-
+from theano.configparser import config, AddConfigVar, StrParam, BoolParam
 
 def error(*args):
     #sys.stderr.write('ERROR:'+ ' '.join(str(a) for a in args)+'\n')
@@ -35,6 +22,18 @@ def debug(*args):
     #sys.stderr.write('DEBUG:'+ ' '.join(str(a) for a in args)+'\n')
     _logger.debug("DEBUG: "+' '.join(str(a) for a in args))
 
+AddConfigVar('nvcc.compiler_bindir',
+        "If defined, nvcc compiler driver will seek g++ and gcc in this directory",
+        StrParam(""))
+
+AddConfigVar('nvcc.flags',
+        "Extra compiler flags for nvcc",
+        StrParam(""))
+
+AddConfigVar('nvcc.fastmath',
+        "",
+        BoolParam(False))
+
 nvcc_path = 'nvcc'
 nvcc_version = None
 def is_nvcc_available():
@@ -66,11 +65,6 @@ def set_cuda_root():
             config.cuda.root = os.path.split(dir)[0]
             return
 
-if config.cuda.root == "AUTO":
-    set_cuda_root()
-
-is_nvcc_available()#to set nvcc_path correctly and get the version
-
 rpath_defaults = []
 def add_standard_rpath(rpath):
     rpath_defaults.append(rpath)