Merge pull request #6025 from nouiz/nanguardmode_int

theano/compile/nanguardmode.py

@@ -106,6 +106,8 @@ def contains_nan(arr, node=None, var=None):
     """
     if not _is_numeric_value(arr, var):
         return False
+    elif getattr(arr, 'dtype', '') in T.discrete_dtypes:
+        return False
     elif pygpu_available and isinstance(arr, GpuArray):
         return np.isnan(f_gpua_min(arr.reshape(arr.size)))
 
@@ -139,6 +141,8 @@ def contains_inf(arr, node=None, var=None):
     """
     if not _is_numeric_value(arr, var):
         return False
+    elif getattr(arr, 'dtype', '') in T.discrete_dtypes:
+        return False
     elif pygpu_available and isinstance(arr, GpuArray):
         return (np.isinf(f_gpua_min(arr.reshape(arr.size))) or
                 np.isinf(f_gpua_max(arr.reshape(arr.size))))

theano/gpuarray/tests/test_misc.py

+# Test that normaly could be outside gpuarray, to have all gpuarray
+# tests in the same directory, we put them here.
+from __future__ import absolute_import, print_function, division
+
+import numpy as np
+
+import theano
+from theano import tensor
+from theano.compile.nanguardmode import NanGuardMode
+
+from .config import mode_with_gpu
+
+
+def test_nan_guard_mode():
+    # Also test that abs uint* and bool have c code.
+    for dtype in ['uint8', 'int64', 'bool']:
+        x = tensor.vector(dtype=dtype)
+        y = x + 1
+        mode = NanGuardMode(nan_is_error=True,
+                            optimizer=mode_with_gpu.optimizer)
+        f = theano.function([x], y, mode=mode)
+        d = np.asarray([23, 7]).astype(dtype)
+        assert np.allclose(f(d), d + 1)

theano/scalar/basic.py

@@ -2420,6 +2420,11 @@ class Abs(UnaryScalarOp):
             return "%(z)s = fabs(%(x)s);" % locals()
         if type in complex_types:
             return "%(z)s = sqrt(%(x)s.real*%(x)s.real + %(x)s.imag*%(x)s.imag);" % locals()
+        if node.outputs[0].type == bool:
+            return "%(z)s = (%(x)s) ? 1 : 0;" % locals()
+        if type in uint_types:
+            # uint are always already absolute value.
+            return "%(z)s = %(x)s;" % locals()
         raise NotImplementedError('type not supported', type)
 abs_ = Abs(same_out)