Merge pull request #502 from nouiz/epd

NEWS.txt

@@ -27,6 +27,8 @@ New Features
  * debugprint new param stop_on_name=[False, True]. If True, we don't print
    anything below an intermediate variable that has a name. Defaults to False.
  * debugprint does not print anymore the "|" symbol in a column after the last input.
+ * If you use Enthought Python Distribution (EPD) now we use its blas
+   implementation by default.
 
 Sparse Sandbox Addition (Not reviewed/documented/tested, but used by some people)
  * They are all in the theano.sparse.sandbox.sp2 module

theano/compile/profilemode.py

@@ -471,7 +471,7 @@ class ProfileMode(Mode):
                 ftot=tot*100/local_time
                 if nb_call==0:
                     continue
-                if a[1] in apply_cimpl:
+                if apply_cimpl.get(a[1], False):
                     msg = '*'
                 else:
                     msg = ' '

theano/tensor/blas.py

@@ -123,7 +123,7 @@ optimization is `local_gemm_to_gemv`.
 
 """
 
-import logging, copy, os
+import logging, copy, os, sys
 
 import numpy
 import numpy.distutils
@@ -301,6 +301,11 @@ ger_destructive = Ger(destructive=True)
 
 def default_blas_ldflags():
     try:
+        # If we are in a EPD installation, mkl is available
+        if "EPD" in sys.version:
+            return ' '.join(
+                ['-L%s' % os.path.join(sys.prefix, "lib")] +
+                ['-l%s' % l for l in numpy.distutils.__config__.blas_opt_info['libraries']])
         #if numpy was linked with library that are not installed, we can't reuse them.
         if all(not os.path.exists(dir) for dir in numpy.distutils.__config__.blas_opt_info['library_dirs']):
             return "-lblas"