Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Lang] Add support for keyword arguments #4794

Merged
merged 9 commits into from
Apr 21, 2022
12 changes: 8 additions & 4 deletions python/taichi/lang/kernel_impl.py
Original file line number Diff line number Diff line change
@@ -151,13 +151,15 @@ def _process_args(self, args, kwargs):
for i, arg in enumerate(self.arguments):
if key == arg.name:
if i < len_args:
raise TaichiSyntaxError(f"Multiple values for argument '{key}'.")
raise TaichiSyntaxError(
f"Multiple values for argument '{key}'.")
ret[i] = value
break

for i, arg in enumerate(ret):
if arg is inspect.Parameter.empty:
raise TaichiSyntaxError(f"Parameter '{self.arguments[i].name}' missing.")
raise TaichiSyntaxError(
f"Parameter '{self.arguments[i].name}' missing.")

return ret

@@ -294,7 +296,8 @@ def extract_arguments(self):
raise TaichiSyntaxError(
f'Invalid type annotation (argument {i}) of Taichi function: {annotation}'
)
self.arguments.append(KernelArgument(annotation, param.name, param.default))
self.arguments.append(
KernelArgument(annotation, param.name, param.default))


class TaichiCallableTemplateMapper:
@@ -466,7 +469,8 @@ def extract_arguments(self):
raise TaichiSyntaxError(
f'Invalid type annotation (argument {i}) of Taichi kernel: {annotation}'
)
self.arguments.append(KernelArgument(annotation, param.name, param.default))
self.arguments.append(
KernelArgument(annotation, param.name, param.default))

def materialize(self, key=None, args=None, arg_features=None):
if key is None:
4 changes: 2 additions & 2 deletions tests/python/test_argument.py
Original file line number Diff line number Diff line change
@@ -124,6 +124,6 @@ def foo(a, b, c=3):
def duplicate():
foo(1, a=3, b=3)

with pytest.raises(ti.TaichiSyntaxError, match="Multiple values for argument 'a'"):
with pytest.raises(ti.TaichiSyntaxError,
match="Multiple values for argument 'a'"):
duplicate()