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] MatrixField refactor 9/n: Allow dynamic index of matrix field when real_matrix=True #6194

Merged
merged 2 commits into from
Sep 29, 2022
Merged

[Lang] MatrixField refactor 9/n: Allow dynamic index of matrix field when real_matrix=True #6194

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
9af3f1f
[Lang] Allow dynamic index of matrix field when real_matrix=True
strongoier Sep 28, 2022
415c89a
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 28, 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
34 changes: 27 additions & 7 deletions taichi/transforms/lower_matrix_ptr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,34 @@ class LowerMatrixPtr : public BasicStmtVisitor {

void visit(MatrixPtrStmt *stmt) override {
if (stmt->origin->is<MatrixOfGlobalPtrStmt>()) {
TI_ASSERT(stmt->offset->is<ConstStmt>());
auto origin = stmt->origin->as<MatrixOfGlobalPtrStmt>();
auto offset = stmt->offset->as<ConstStmt>();
auto lowered = std::make_unique<GlobalPtrStmt>(
origin->snodes[offset->val.val_int()], origin->indices);
stmt->replace_usages_with(lowered.get());
modifier.insert_before(stmt, std::move(lowered));
modifier.erase(stmt);
if (stmt->offset->is<ConstStmt>()) {
auto offset = stmt->offset->as<ConstStmt>();
auto lowered = std::make_unique<GlobalPtrStmt>(
origin->snodes[offset->val.val_int()], origin->indices);
stmt->replace_usages_with(lowered.get());
modifier.insert_before(stmt, std::move(lowered));
modifier.erase(stmt);
} else {
TI_ASSERT_INFO(
origin->dynamic_indexable,
"Element of the MatrixField is not dynamic indexable.\n{}",
stmt->tb);
auto stride = std::make_unique<ConstStmt>(
TypedConstant(origin->dynamic_index_stride));
auto offset = std::make_unique<BinaryOpStmt>(
BinaryOpType::mul, stmt->offset, stride.get());
auto ptr_base =
std::make_unique<GlobalPtrStmt>(origin->snodes[0], origin->indices);
auto lowered =
std::make_unique<MatrixPtrStmt>(ptr_base.get(), offset.get());
stmt->replace_usages_with(lowered.get());
modifier.insert_before(stmt, std::move(stride));
modifier.insert_before(stmt, std::move(offset));
modifier.insert_before(stmt, std::move(ptr_base));
modifier.insert_before(stmt, std::move(lowered));
modifier.erase(stmt);
}
}
}

Expand Down
19 changes: 15 additions & 4 deletions tests/python/test_matrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,7 @@ def func2(b: ti.types.ndarray(element_dim=1)):
assert v[3][9] == 9


@test_utils.test(require=ti.extension.dynamic_index,
dynamic_index=True,
debug=True)
def test_matrix_non_constant_index():
def _test_matrix_non_constant_index():
m = ti.Matrix.field(2, 2, ti.i32, 5)
v = ti.Vector.field(10, ti.i32, 5)

Expand Down Expand Up @@ -248,6 +245,20 @@ def func4(k: ti.i32):
func4(10)


@test_utils.test(require=ti.extension.dynamic_index,
dynamic_index=True,
debug=True)
def test_matrix_non_constant_index():
_test_matrix_non_constant_index()


@test_utils.test(require=ti.extension.dynamic_index,
real_matrix=True,
jim19930609 marked this conversation as resolved.
Show resolved Hide resolved
debug=True)
def test_matrix_non_constant_index_real_matrix():
_test_matrix_non_constant_index()


def _test_matrix_constant_index():
m = ti.Matrix.field(2, 2, ti.i32, 5)

Expand Down