Fix invalidArguments to take kwargs and out into account (pytorch#397)

marszhuo · Jan 5, 2017 · 0e345aa · 0e345aa
1 parent c976dd3
commit 0e345aa
Show file tree

Hide file tree

Showing 11 changed files with 353 additions and 105 deletions.
diff --git a/tools/cwrap/plugins/CuDNNPlugin.py b/tools/cwrap/plugins/CuDNNPlugin.py
@@ -52,7 +52,7 @@ class CuDNNPlugin(CWrapPlugin):
     $options
     }
 
-    THPUtils_invalidArguments(args, "$readable_name", $num_options, $expected_args);
+    THPUtils_invalidArguments(args, kwargs, "$readable_name", $num_options, $expected_args);
     return NULL;
     END_HANDLE_TH_ERRORS
 }

diff --git a/tools/cwrap/plugins/StandaloneExtension.py b/tools/cwrap/plugins/StandaloneExtension.py
@@ -70,7 +70,7 @@ class StandaloneExtension(CWrapPlugin):
   int __argcount = args ? PyTuple_Size(args) : 0;
     $options
   } else {
-    THPUtils_invalidArguments(args, "$name", 1, $expected_args);
+    THPUtils_invalidArguments(args, NULL, "$name", 1, $expected_args);
     return NULL;
   }
   END_HANDLE_TH_ERRORS

diff --git a/tools/cwrap/plugins/THPPlugin.py b/tools/cwrap/plugins/THPPlugin.py
@@ -105,7 +105,7 @@ class THPPlugin(CWrapPlugin):
     $options
     }
 
-    THPUtils_invalidArguments(args, "$readable_name", $num_options, $expected_args);
+    THPUtils_invalidArguments(args, kwargs, "$readable_name", $num_options, $expected_args);
     return NULL;
     END_HANDLE_TH_ERRORS
 }
@@ -200,6 +200,18 @@ def format_args(args, var_args=False):
                            for arg in args
                            if not arg.get('ignore_check', False)
                            and not arg.get('output')]
+            output_args = list(filter(lambda a: a.get('output'), args))
+            if output_args:
+                if len(output_args) > 1:
+                    out_type = 'tuple['
+                    out_type += ', '.join(
+                            self.TYPE_NAMES[arg['type']] for arg in output_args)
+                    out_type += ']'
+                    option_desc += ['#' + out_type + ' out']
+                else:
+                    arg = output_args[0]
+                    option_desc += ['#' + self.TYPE_NAMES[arg['type']] + ' out']
+
             if option_desc:
                 return '({})'.format(', '.join(option_desc))
             else:

diff --git a/torch/csrc/autograd/function.cpp b/torch/csrc/autograd/function.cpp
@@ -682,7 +682,7 @@ PyObject * THPFunction_do_backward(THPFunction *self, PyObject *args)
     PyObject *raw_grad_output = PyTuple_GET_ITEM(args, 0);
     PyObject *retain_variables = PyTuple_GET_ITEM(args, 1);
     if (!PyTuple_Check(raw_grad_output) || !PyBool_Check(retain_variables)) {
-      THPUtils_invalidArguments(args, "_do_backward", 1, "(tuple, bool)");
+      THPUtils_invalidArguments(args, NULL, "_do_backward", 1, "(tuple, bool)");
       return NULL;
     }
 

diff --git a/torch/csrc/generic/Storage.cpp b/torch/csrc/generic/Storage.cpp
@@ -151,7 +151,7 @@ static PyObject * THPStorage_(pynew)(PyTypeObject *type, PyObject *args, PyObjec
   }
 
 invalid_arguments:
-  THPUtils_invalidArguments(args, THPStorageStr " constructor", 6,
+  THPUtils_invalidArguments(args, kwargs, THPStorageStr " constructor", 6,
           "no arguments",
           "(int size)",
           "(Sequence data)",

diff --git a/torch/csrc/generic/StorageSharing.cpp b/torch/csrc/generic/StorageSharing.cpp
@@ -109,7 +109,8 @@ static PyObject * THPStorage_(newSharedFilename)(PyObject *_unused, PyObject *ar
   PyObject *_object_handle = PyTuple_GET_ITEM(args, 1);
   PyObject *_size = PyTuple_GET_ITEM(args, 2);
   if (!THPUtils_checkBytes(_manager_handle) || !THPUtils_checkBytes(_object_handle) || !THPUtils_checkLong(_size)) {
-    THPUtils_invalidArguments(args, "_new_shared in file system mode", 1, "a handle (string/bytes) and storage size (int)");
+    THPUtils_invalidArguments(args, NULL, "_new_shared in file system mode", 1,
+        "a handle (string/bytes) and storage size (int)");
     return NULL;
   }
   const char *manager_handle = THPUtils_bytesAsString(_manager_handle);
@@ -163,7 +164,8 @@ static PyObject * THPStorage_(newSharedFd)(PyObject *_unused, PyObject *args)
   PyObject *_tmp_fd = PyTuple_GET_ITEM(args, 0);
   PyObject *_size = PyTuple_GET_ITEM(args, 1);
   if (!THPUtils_checkLong(_tmp_fd) || !THPUtils_checkLong(_size)) {
-    THPUtils_invalidArguments(args, "_new_shared in file descriptor mode", 1, "a file descriptor (int) and storage size (int)");
+    THPUtils_invalidArguments(args, NULL, "_new_shared in file descriptor mode",
+        1, "a file descriptor (int) and storage size (int)");
     return NULL;
   }
   int fd;
@@ -233,7 +235,7 @@ static PyObject * THPStorage_(newSharedCuda)(PyObject *_unused, PyObject *args)
   if (!(THPUtils_checkLong(_device) && THPUtils_checkLong(_size)
       && (_handle == Py_None || PyBytes_Check(_handle))
       && THPUtils_checkLong(_offset) && THPUtils_checkLong(_view_size))) {
-    THPUtils_invalidArguments(args, "_new_shared in CUDA mode", 1,
+    THPUtils_invalidArguments(args, NULL, "_new_shared in CUDA mode", 1,
         "(int device, bytes handle, int storage_size, int offset, int view_size");
     return NULL;
   }
@@ -357,7 +359,7 @@ static PyObject * THPStorage_(newView)(THPStorage *self, PyObject *args)
   HANDLE_TH_ERRORS
   if (PyTuple_Size(args) != 2 || !THPUtils_checkLong(PyTuple_GET_ITEM(args, 0))
       || ! THPUtils_checkLong(PyTuple_GET_ITEM(args, 1))) {
-    THPUtils_invalidArguments(args, "_new_view", 1, "(int offset, int size)");
+    THPUtils_invalidArguments(args, NULL, "_new_view", 1, "(int offset, int size)");
     return NULL;
   }
   long offset = THPUtils_unpackLong(PyTuple_GET_ITEM(args, 0));

diff --git a/torch/csrc/generic/Tensor.cpp b/torch/csrc/generic/Tensor.cpp
@@ -382,7 +382,7 @@ static PyObject * THPTensor_(pynew)(PyTypeObject *type, PyObject *args, PyObject
     return (PyObject *)self.release();
   }
 
-  THPUtils_invalidArguments(args, THPTensorStr " constructor", 6,
+  THPUtils_invalidArguments(args, kwargs, THPTensorStr " constructor", 6,
           "no arguments",
           "(int ...)",
           "(" THPTensorStr " viewed_tensor)",

diff --git a/torch/csrc/generic/methods/Tensor.cwrap b/torch/csrc/generic/methods/Tensor.cwrap
@@ -240,7 +240,7 @@ PyObject * THPTensor_(size)(PyObject *self, PyObject *args, PyObject *kwargs)
     return PyInt_FromLong(THTensor_(size)(LIBRARY_STATE tensor, dim));
   }
 
-  THPUtils_invalidArguments(args, "size", 2, "(int dim)", "no arguments");
+  THPUtils_invalidArguments(args, kwargs, "size", 2, "(int dim)", "no arguments");
   return NULL;
   END_HANDLE_TH_ERRORS
 }
@@ -280,7 +280,7 @@ PyObject * THPTensor_(stride)(PyObject *self, PyObject *args, PyObject *kwargs)
     return PyInt_FromLong(THTensor_(stride)(LIBRARY_STATE tensor, dim));
   }
 
-  THPUtils_invalidArguments(args, "stride", 2, "(int dim)", "no arguments");
+  THPUtils_invalidArguments(args, kwargs, "stride", 2, "(int dim)", "no arguments");
   return NULL;
   END_HANDLE_TH_ERRORS
 }
@@ -650,9 +650,9 @@ static PyObject * THPTensor_stateless_(cat)(THPTensor *_unused, PyObject *args)
   return (PyObject*)result.release();
 
 invalid_arguments:
-  THPUtils_invalidArguments(args, "cat", 2,
-      "(sequence tensors)",
-      "(sequence tensors, int dim)");
+  THPUtils_invalidArguments(args, NULL, "cat", 2,
+      "(sequence[" THPTensorStr "] tensors)",
+      "(sequence[" THPTensorStr "] tensors, int dim)");
   return NULL;
   END_HANDLE_TH_ERRORS
 }

diff --git a/torch/csrc/generic/methods/TensorSerialization.cwrap b/torch/csrc/generic/methods/TensorSerialization.cwrap
@@ -6,7 +6,7 @@
 PyObject * THPTensor_(writeMetadata)(THPTensor *self, PyObject *args)
 {
   if (!args || PyTuple_Size(args) != 1) {
-    THPUtils_invalidArguments(args, "_write_metadata", 1, "a single file object");
+    THPUtils_invalidArguments(args, NULL, "_write_metadata", 1, "a single file object");
     return NULL;
   }
   int fd = PyObject_AsFileDescriptor(PyTuple_GET_ITEM(args, 0));
@@ -28,7 +28,8 @@ PyObject * THPTensor_(newWithMetadataFile)(PyObject *_null, PyObject *args)
 {
   if (!args || PyTuple_Size(args) != 2 ||
         !THPStorage_(Check)(PyTuple_GET_ITEM(args, 1))) {
-    THPUtils_invalidArguments(args, "_new_with_metadata_file", 1, "single file object and a storage object");
+    THPUtils_invalidArguments(args, NULL, "_new_with_metadata_file", 1,
+        "single file object and a storage object");
     return NULL;
   }
   int fd = PyObject_AsFileDescriptor(PyTuple_GET_ITEM(args, 0));