Merge pull request #3208 from okuta/fix-nan-check

Fix nan check
chainer · Aug 23, 2017 · 265e910 · 265e910
2 parents 1d00f3a + ff41355
commit 265e910
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/chainer/variable.py b/chainer/variable.py
@@ -929,11 +929,12 @@ def get_grad(node):
                     if gx is None:
                         continue
                     gx_data = gx.data
-                    cuda.get_device_from_array(gx_data).use()
-                    if cuda.get_array_module(gx_data).isnan(gx_data).any():
-                        msg = ('NaN is detected on backward computation of '
-                               '{}'.format(func.label))
-                        raise RuntimeError(msg)
+                    if gx_data.dtype.kind == 'f':
+                        cuda.get_device_from_array(gx_data).use()
+                        if cuda.get_array_module(gx_data).isnan(gx_data).any():
+                            raise RuntimeError(
+                                'NaN is detected on backward computation of '
+                                '{}'.format(func.label))
 
             if not retain_grad:
                 for y in outputs:

diff --git a/tests/chainer_tests/test_variable.py b/tests/chainer_tests/test_variable.py
@@ -1146,6 +1146,21 @@ def test_traceback_cpu(self):
     def test_traceback_gpu(self):
         self.check_traceback(cuda.to_gpu(self.x))
 
+    def test_raise(self):
+        x = np.array([1], np.float32)
+        x = chainer.Variable(x)
+        y = F.identity(x)
+        y.grad = np.array([np.nan], np.float32)
+        with self.assertRaises(RuntimeError):
+            y.backward()
+
+    def test_int(self):
+        x = np.array([1], np.int)
+        x = chainer.Variable(x)
+        y = F.identity(x)
+        y.grad = np.array([0], np.int)
+        y.backward()
+
 
 @testing.parameterize(*testing.product({
     'in_shape': [(4, 3, 2)],