raise an error

chainer · Sep 11, 2017 · 1a053f1 · 1a053f1
1 parent 0310d2f
commit 1a053f1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/chainer/functions/array/spatial_transformer_grid.py b/chainer/functions/array/spatial_transformer_grid.py
@@ -3,9 +3,9 @@
 import chainer
 from chainer import cuda
 from chainer import function
+from chainer.utils import argument
 from chainer.utils import type_check
 
-
 if cuda.cudnn_enabled:
     cudnn = cuda.cudnn
     libcudnn = cudnn.cudnn
@@ -112,7 +112,7 @@ def _backward(self, inputs, grad_outputs):
         return gtheta,
 
 
-def spatial_transformer_grid(theta, output_shape):
+def spatial_transformer_grid(theta, output_shape, **kwargs):
     """2D Spatial Transformer grid.
 
     This function generates coordinates of the points sampled from an image
@@ -160,4 +160,10 @@ def spatial_transformer_grid(theta, output_shape):
         the upper-left corner of the input image.
 
     """
+    argument.check_unexpected_kwargs(
+        kwargs, use_cudnn="The argument \"use_cudnn\" is not "
+        "supported anymore. "
+        "Use chainer.using_config('use_cudnn', value) "
+        "context where value can be `always`, `never`, or `auto`.")
+    argument.assert_kwargs_empty(kwargs)
     return SpatialTransformerGrid(output_shape)(theta)
diff --git a/chainer/functions/array/spatial_transformer_sampler.py b/chainer/functions/array/spatial_transformer_sampler.py
@@ -3,6 +3,7 @@
 import chainer
 from chainer import cuda
 from chainer import function
+from chainer.utils import argument
 from chainer.utils import type_check
 
 
@@ -248,7 +249,7 @@ def _backward(self, inputs, grad_outputs):
         return gx, ggrid
 
 
-def spatial_transformer_sampler(x, grid):
+def spatial_transformer_sampler(x, grid, **kwargs):
     """2D Spatial Transformer sampler.
 
     This is a differentiable image sampler. With a set of sampling points
@@ -299,4 +300,10 @@ def spatial_transformer_sampler(x, grid):
             :math:`(n, c_I, h_O, w_O)`.
 
     """
+    argument.check_unexpected_kwargs(
+        kwargs, use_cudnn="The argument \"use_cudnn\" is not "
+        "supported anymore. "
+        "Use chainer.using_config('use_cudnn', value) "
+        "context where value can be `always`, `never`, or `auto`.")
+    argument.assert_kwargs_empty(kwargs)
     return SpatialTransformerSampler()(x, grid)