merge

theano/compile/profilemode.py

 import time, atexit, copy
 
-from theano.gof.link import WrapLinkerMany
+from theano.gof.link import WrapLinker
 from theano.gof.cutils import run_cthunk
 from theano.compile.mode import Mode, register_mode, predefined_modes, predefined_linkers, predefined_optimizers, default_linker, default_optimizer
 from theano.gof.cc import OpWiseCLinker
@@ -84,7 +84,7 @@ class ProfileMode(Mode):
         if isinstance(linker, str) or linker is None:
             linker = predefined_linkers[linker]
 
-        linker = WrapLinkerMany([linker], [blah])
+        linker = WrapLinker([linker], blah)
             
         self.linker = linker
         if isinstance(optimizer, str) or optimizer is None:

theano/misc/safe_asarray.py

@@ -18,18 +18,22 @@ def _asarray(a, dtype=None, order=None):
 
     Currently, this issue has only been causing trouble when the target
     data type is 'int32', on some computers. As a result, this is the only
-    situation where we do more than a simple call to ``numpy.asarray``. If it
-    turns out that a similar problem can occur for more data type, this
+    situation where we may do more than a simple call to ``numpy.asarray``. If
+    it turns out that a similar problem can occur for more data type, this
     function should be updated accordingly.
 
     This function's name starts with a '_' to indicate that it is meant to be
     used internally. It is imported so as to be available directly through
         theano._asarray
     """
+    dtype = numpy.dtype(dtype)  # Convert into dtype object.
     rval = numpy.asarray(a, dtype=dtype, order=order)
-    if dtype is numpy.int32 or dtype == 'int32':
-        # Make sure the type is properly set to the correct type.
-        return rval.view(dtype=numpy.int32)
+    numpy_int32 = numpy.dtype(numpy.int32)
+    if (dtype is numpy_int32 and rval.dtype is not numpy_int32):
+        # Enfore the numpy.int32 dtype.
+        return rval.view(dtype=numpy_int32)
     else:
         # Using ``numpy.asarray`` should work just fine.
+        # Debug assert if we want to detect other failure cases (untested):
+        # assert rval.dtype is dtype
         return rval