Fix cwrap option filtering

Author: apaszke

tools/cwrap/plugins/KwargsPlugin.py

@@ -4,7 +4,9 @@
 class KwargsPlugin(CWrapPlugin):
 
     ACCESSOR_TEMPLATE = Template('(__tuplecount > $idx ? PyTuple_GET_ITEM(args, $idx) : __kw_$name)')
+    KWARG_ONLY_ACCESSOR_TEMPLATE = Template('__kw_$name')
     CHECK_TEMPLATE = Template('(__tuplecount > $idx || __kw_$name) && $code')
+    KWARG_ONLY_CHECK_TEMPLATE = Template('__kw_$name && $code')
     WRAPPER_TEMPLATE = Template("""
     $declarations
     if (kwargs) {
@@ -24,13 +26,18 @@ def process_declarations(self, declarations):
         return declarations
 
     def get_arg_accessor(self, arg, option):
-        if not arg.get('no_kwargs'):
-            return self.ACCESSOR_TEMPLATE.substitute(idx=arg['idx'], name=arg['name'])
+        if arg.get('no_kwargs'):
+            return
+        if arg.get('kwarg_only'):
+            return self.KWARG_ONLY_ACCESSOR_TEMPLATE.substitute(name=arg['name'])
+        return self.ACCESSOR_TEMPLATE.substitute(idx=arg['idx'], name=arg['name'])
 
     def process_single_check(self, code, arg, arg_accessor):
-        if not arg.get('no_kwargs'):
-            return self.CHECK_TEMPLATE.substitute(idx=arg['idx'], name=arg['name'], code=code)
-        return code
+        if arg.get('no_kwargs'):
+            return code
+        if arg.get('kwarg_only'):
+            return self.KWARG_ONLY_CHECK_TEMPLATE.substitute(name=arg['name'], code=code)
+        return self.CHECK_TEMPLATE.substitute(idx=arg['idx'], name=arg['name'], code=code)
 
     def process_wrapper(self, code, declaration):
         if declaration.get('no_kwargs'):

tools/cwrap/plugins/OptionalArguments.py

@@ -22,18 +22,37 @@ def process_declarations(self, declarations):
                             # PyYAML interprets NULL as None...
                             arg['name'] = 'NULL' if arg['default'] is None else arg['default']
                     new_options.append(option_copy)
-            declaration['options'] = self.filter_unique_options(declaration['options'] + new_options)
+            declaration['options'] = self.filter_unique_options(new_options)
         return declarations
 
     def filter_unique_options(self, options):
-        def signature(option):
-            return '#'.join(arg['type'] for arg in option['arguments'] if not 'ignore_check' in arg or not arg['ignore_check'])
+        def signature(option, kwarg_only_count):
+            if kwarg_only_count == 0:
+                kwarg_only_count = None
+            else:
+                kwarg_only_count = -kwarg_only_count
+            arg_signature = '#'.join(
+                    arg['type']
+                    for arg in option['arguments'][:kwarg_only_count]
+                    if not arg.get('ignore_check'))
+            if kwarg_only_count is None:
+                return arg_signature
+            kwarg_only_signature = '#'.join(
+                    arg['name'] + '#' + arg['type']
+                    for arg in option['arguments'][kwarg_only_count:]
+                    if not arg.get('ignore_check'))
+            return arg_signature + "#-#" + kwarg_only_signature
         seen_signatures = set()
         unique = []
         for option in options:
-            sig = signature(option)
-            if sig not in seen_signatures:
-                unique.append(option)
-                seen_signatures.add(sig)
+            for num_kwarg_only in range(0, len(option['arguments'])+1):
+                sig = signature(option, num_kwarg_only)
+                if sig not in seen_signatures:
+                    if num_kwarg_only > 0:
+                        for arg in option['arguments'][-num_kwarg_only:]:
+                            arg['kwarg_only'] = True
+                    unique.append(option)
+                    seen_signatures.add(sig)
+                    break
         return unique
 

tools/cwrap/plugins/THPPlugin.py

@@ -291,7 +291,7 @@ def generate_out_options(self, declaration):
                         arg['no_kwargs'] = True
                         arg['no_idx'] = True
                 new_options.append(option_copy)
-        declaration['options'] = self.filter_unique_options(new_options)
+        declaration['options'] = new_options
 
     def process_declarations(self, declarations):
         new_declarations = []
@@ -344,9 +344,6 @@ def has_output_args(declaration):
                 for arg in option['arguments']:
                     if arg['name'] == 'self':
                         arg['ignore_check'] = True
-            # TODO: we can probably allow duplicate signatures once we implement
-            # keyword arguments
-            declaration['options'] = self.filter_unique_options(declaration['options'])
 
 
         declarations = [d for d in declarations if not d.get('only_stateless', False)]
@@ -368,21 +365,6 @@ def make_stateless(self, declaration):
                     arg['name'] = 'source'
         return declaration
 
-    def filter_unique_options(self, options):
-        def signature(option):
-            return '#'.join(
-                    arg['type'] + str(arg.get('output', False))
-                    for arg in option['arguments']
-                    if not arg.get('ignore_check'))
-        seen_signatures = set()
-        unique = []
-        for option in options:
-            sig = signature(option)
-            if sig not in seen_signatures:
-                unique.append(option)
-                seen_signatures.add(sig)
-        return unique
-
     def declare_methods(self, stateless, sparse):
         tensor_methods = ''
         for declaration in (self.declarations if not stateless else self.stateless_declarations):