Stop removing amdlibm when compiling with NVCC and make sure to not add it in the first place.

theano/gof/cc.py

@@ -1456,19 +1456,6 @@ class CLinker(link.Linker):
         libs = self.libraries()
         preargs = self.compile_args()
         compiler_name = c_compiler.__name__
-        if compiler_name == 'NVCC_compiler' and config.lib.amdlibm:
-            # This lib does not work correctly with nvcc in device code.
-            # and newer version of g++ as 4.5.1.
-            # example of errors: "/usr/lib/gcc/x86_64-redhat-linux/4.5.1/
-            #                     include/mmintrin.h(49): error: identifier
-            #                     "__builtin_ia32_emms" is undefined"
-
-            if '<amdlibm.h>' in mod.includes:
-                mod.includes.remove('<amdlibm.h>')
-            if '-DREPLACE_WITH_AMDLIBM' in preargs:
-                preargs.remove('-DREPLACE_WITH_AMDLIBM')
-            if 'amdlibm' in libs:
-                libs.remove('amdlibm')
         # We want to compute the code without the lock
         src_code = mod.code()
         get_lock()

theano/scalar/basic.py

@@ -201,24 +201,24 @@ class Scalar(Type):
     def values_eq_approx(self, a, b, tolerance=1e-4):
         return abs(a - b) <= ((abs(a) + abs(b)) * tolerance)
 
-    def c_headers(self):
+    def c_headers(self, c_compiler):
         l = ['<math.h>']
         # These includes are needed by Scalar and TensorType,
         # we declare them here and they will be re-used by TensorType
         l.append('<numpy/arrayobject.h>')
         l.append('<numpy/arrayscalars.h>')
-        if config.lib.amdlibm:
+        if config.lib.amdlibm and c_compiler.supports_amdlibm:
             l += ['<amdlibm.h>']
         return l
 
-    def c_libraries(self):
+    def c_libraries(self, c_compiler):
         l = []
-        if config.lib.amdlibm:
+        if config.lib.amdlibm and c_compiler.supports_amdlibm:
             l += ['amdlibm']
         return l
 
-    def c_compile_args(self):
-        if config.lib.amdlibm:
+    def c_compile_args(self, c_compiler):
+        if config.lib.amdlibm and c_compiler.supports_amdlibm:
             return ['-DREPLACE_WITH_AMDLIBM']
         else:
             return []