Merge pull request #4084 from matt-graham/cudnn_paths_fix

theano/gof/cmodule.py

@@ -2122,8 +2122,8 @@ class GCC_compiler(Compiler):
             preargs = list(preargs)
 
         include_dirs = include_dirs + std_include_dirs()
-        libs = std_libs() + libs
-        lib_dirs = std_lib_dirs() + lib_dirs
+        libs = libs + std_libs()
+        lib_dirs = lib_dirs + std_lib_dirs()
 
         cppfilename = os.path.join(location, 'mod.cpp')
         with open(cppfilename, 'w') as cppfile:

theano/sandbox/cuda/__init__.py

@@ -355,9 +355,15 @@ class DnnVersion(GpuOp):
     def c_headers(self):
         return ['cudnn.h']
 
+    def c_header_dirs(self):
+        return [config.dnn.include_path]
+
     def c_libraries(self):
         return ['cudnn']
 
+    def c_lib_dirs(self):
+        return [config.dnn.library_path]
+
     def c_support_code(self):
         return """
 #if PY_MAJOR_VERSION >= 3

theano/sandbox/cuda/dnn.py

@@ -86,11 +86,14 @@ class DnnBase(GpuOp, COp):
         return ['cudnn.h', 'cudnn_helper.h']
 
     def c_header_dirs(self):
-        return [os.path.dirname(__file__)]
+        return [os.path.dirname(__file__), config.dnn.include_path]
 
     def c_libraries(self):
         return ['cudnn']
 
+    def c_lib_dirs(self):
+        return [config.dnn.library_path]
+
 
 class GpuDnnConvDesc(GpuOp):
     """
@@ -107,11 +110,14 @@ class GpuDnnConvDesc(GpuOp):
         return ['cudnn.h', 'cudnn_helper.h']
 
     def c_header_dirs(self):
-        return [os.path.dirname(__file__)]
+        return [os.path.dirname(__file__), config.dnn.include_path]
 
     def c_libraries(self):
         return ['cudnn']
 
+    def c_lib_dirs(self):
+        return [config.dnn.library_path]
+
     def c_compiler(self):
         return NVCC_compiler
 
@@ -1256,11 +1262,14 @@ class GpuDnnPoolDesc(GpuOp):
         return ['cudnn.h', 'cudnn_helper.h']
 
     def c_header_dirs(self):
-        return [os.path.dirname(__file__)]
+        return [os.path.dirname(__file__), config.dnn.include_path]
 
     def c_libraries(self):
         return ['cudnn']
 
+    def c_lib_dirs(self):
+        return [config.dnn.library_path]
+
     def c_compiler(self):
         return NVCC_compiler
 

theano/sandbox/cuda/nvcc_compiler.py

@@ -214,11 +214,11 @@ class NVCC_compiler(Compiler):
         if os.path.abspath(os.path.split(__file__)[0]) not in include_dirs:
             include_dirs.append(os.path.abspath(os.path.split(__file__)[0]))
 
-        libs = std_libs() + libs
+        libs = libs + std_libs()
         if 'cudart' not in libs:
             libs.append('cudart')
 
-        lib_dirs = std_lib_dirs() + lib_dirs
+        lib_dirs = lib_dirs + std_lib_dirs()
         if any(ld == os.path.join(cuda_root, 'lib') or
                ld == os.path.join(cuda_root, 'lib64') for ld in lib_dirs):
             warnings.warn("You have the cuda library directory in your "