Merge pull request #5550 from nouiz/davidbau-nanguardfix

theano/compile/nanguardmode.py

@@ -23,6 +23,37 @@ except ImportError:
 logger = logging.getLogger("theano.compile.nanguardmode")
 
 
+def _is_numeric_value(arr, var):
+    """
+    Checks a variable against non-numeric types such as types, slices,
+    empty arrays, and None, that need not be checked for NaN and Inf values.
+
+    Parameters
+    ----------
+    arr : the data of that correspond to any Theano Variable
+    var : The corresponding Theano variable
+
+    Returns
+    -------
+    is_non_numeric : bool
+        `True` the value is non-numeric.
+
+    """
+    if isinstance(arr, theano.gof.type._cdata_type):
+        return False
+    elif isinstance(arr, np.random.mtrand.RandomState):
+        return False
+    elif var and getattr(var.tag, 'is_rng', False):
+        return False
+    elif isinstance(arr, slice):
+        return False
+    elif arr is None:
+        return False
+    elif arr.size == 0:
+        return False
+    return True
+
+
 def flatten(l):
     """
     Turns a nested graph of lists/tuples/other objects into a list of objects.
@@ -74,16 +105,7 @@ def contains_nan(arr, node=None, var=None):
     construction of a boolean array with the same shape as the input array.
 
     """
-    # This should be a whitelist instead of a blacklist
-    if isinstance(arr, theano.gof.type._cdata_type):
-        return False
-    elif isinstance(arr, np.random.mtrand.RandomState):
-        return False
-    elif var and getattr(var.tag, 'is_rng', False):
-        return False
-    elif isinstance(arr, slice):
-        return False
-    elif arr.size == 0:
+    if not _is_numeric_value(arr, var):
         return False
     elif cuda.cuda_available and isinstance(arr, cuda.CudaNdarray):
         if (node and hasattr(theano.sandbox, 'rng_mrg') and
@@ -126,15 +148,7 @@ def contains_inf(arr, node=None, var=None):
     boolean array with the same shape as the input array.
 
     """
-    if isinstance(arr, theano.gof.type._cdata_type):
-        return False
-    elif isinstance(arr, np.random.mtrand.RandomState):
-        return False
-    elif var and getattr(var.tag, 'is_rng', False):
-        return False
-    elif isinstance(arr, slice):
-        return False
-    elif arr.size == 0:
+    if not _is_numeric_value(arr, var):
         return False
     elif cuda.cuda_available and isinstance(arr, cuda.CudaNdarray):
         if (node and hasattr(theano.sandbox, 'rng_mrg') and
@@ -288,13 +302,7 @@ class NanGuardMode(Mode):
                     error = True
             if big_is_error:
                 err = False
-                if isinstance(value, theano.gof.type._cdata_type):
-                    err = False
-                elif isinstance(value, np.random.mtrand.RandomState):
-                    err = False
-                elif isinstance(value, slice):
-                    err = False
-                elif value.size == 0:
+                if not _is_numeric_value(value, var):
                     err = False
                 elif cuda.cuda_available and isinstance(value, cuda.CudaNdarray):
                     compile_gpu_func(False, False, True)

theano/compile/tests/test_nanguardmode.py

@@ -56,7 +56,7 @@ def test_NanGuardMode():
         np.asarray(1e20).astype(theano.config.floatX), (3, 4, 5))
 
     x = T.tensor3()
-    y = x[:, T.arange(2), T.arange(2)]
+    y = x[:, T.arange(2), T.arange(2), None]
     fun = theano.function(
         [x], y,
         mode=NanGuardMode(nan_is_error=True, inf_is_error=True)