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.

Sign up for GitHub

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 real matrix args on real function #6522

Merged
merged 2 commits into from
Nov 7, 2022
Merged

[lang] Add support for real matrix args on real function #6522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fec3ca0
[lang] Add support for real matrix args on real function
lin-hitonami Nov 4, 2022
d5f1905
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Nov 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions python/taichi/lang/kernel_impl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,12 @@ def func_call_rvalue(self, key, args):
elif isinstance(anno, primitive_types.RefType):
non_template_args.append(
_ti_core.make_reference(args[i].ptr))
elif impl.current_cfg().real_matrix and isinstance(
args[i], impl.Expr) and args[i].ptr.is_tensor():
non_template_args.extend([
Expr(x) for x in impl.get_runtime().prog.
current_ast_builder().expand_expr([args[i].ptr])
])
else:
non_template_args.append(args[i])
non_template_args = impl.make_expr_group(non_template_args,
Expand Down
27 changes: 21 additions & 6 deletions tests/python/test_function.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,15 +445,30 @@ def test_func_matrix_arg_real_matrix():
_test_func_matrix_arg()


@test_utils.test(arch=[ti.cpu, ti.cuda])
def test_real_func_matrix_arg():
def _test_real_func_matrix_arg():
@ti.experimental.real_func
def mat_arg(a: ti.math.mat2) -> float:
return a[0, 0] + a[0, 1] + a[1, 0] + a[1, 1]
def mat_arg(a: ti.math.mat2, b: ti.math.vec2) -> float:
return a[0, 0] + a[0, 1] + a[1, 0] + a[1, 1] + b[0] + b[1]

b = ti.Vector.field(n=2, dtype=float, shape=())
b[()][0] = 5
b[()][1] = 6

@ti.kernel
def foo() -> float:
a = ti.math.mat2(1, 2, 3, 4)
return mat_arg(a)
return mat_arg(a, b[()])

assert foo() == pytest.approx(21)


@test_utils.test(arch=[ti.cpu, ti.cuda])
def test_real_func_matrix_arg():
_test_real_func_matrix_arg()


assert foo() == pytest.approx(10)
@test_utils.test(arch=[ti.cpu, ti.cuda],
real_matrix=True,
real_matrix_scalarize=True)
def test_real_func_matrix_arg_real_matrix():
_test_real_func_matrix_arg()