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

Jump to bottom

[autodiff] Fix the type of cmp statements in autodiff #8452

Merged
merged 2 commits into from
Dec 26, 2023
Merged

[autodiff] Fix the type of cmp statements in autodiff #8452

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
b913040
[autodiff] Fix the type of cmp statements in autodiff
lin-hitonami Dec 26, 2023
3077ad5
remove debug
lin-hitonami Dec 26, 2023
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
9 changes: 5 additions & 4 deletions taichi/ir/control_flow_graph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -867,10 +867,11 @@ bool CFGNode::dead_store_elimination(bool after_lower_access) {
!may_contain_variable(killed_in_this_node, load_ptr)) {
// Only perform identical load elimination within a CFGNode.
auto next_load_stmt = live_load_in_this_node[load_ptr];
TI_ASSERT(irpass::analysis::same_statements(stmt, next_load_stmt));
next_load_stmt->replace_usages_with(stmt);
erase(block->locate(next_load_stmt));
modified = true;
if (irpass::analysis::same_statements(stmt, next_load_stmt)) {
next_load_stmt->replace_usages_with(stmt);
erase(block->locate(next_load_stmt));
modified = true;
}
}

update_container_with_alias(tensor_to_matrix_ptrs_map,
Expand Down
14 changes: 9 additions & 5 deletions taichi/transforms/auto_diff.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,10 +643,11 @@ class RegulateTensorTypedStatements : public BasicStmtVisitor {

auto matrix_index = Stmt::make<MatrixInitStmt>(index_values);
matrix_index->ret_type = index_tensor_type;

auto cmp_tensor_type = TypeFactory::get_instance().get_tensor_type(
tensor_shape, PrimitiveType::u1);
auto matrix_eq = Stmt::make<BinaryOpStmt>(
BinaryOpType::cmp_eq, matrix_offset.get(), matrix_index.get());
matrix_eq->ret_type = index_tensor_type;
matrix_eq->ret_type = cmp_tensor_type;

auto orig_value = Stmt::make<Load>(orig_stmt);
orig_value->ret_type = tensor_type;
Expand Down Expand Up @@ -843,9 +844,11 @@ class ReplaceLocalVarWithStacks : public BasicStmtVisitor {
auto matrix_index = Stmt::make<MatrixInitStmt>(index_values);
matrix_index->ret_type = index_tensor_type;

auto cmp_tensor_type = TypeFactory::get_instance().get_tensor_type(
tensor_shape, PrimitiveType::u1);
auto matrix_eq = Stmt::make<BinaryOpStmt>(
BinaryOpType::cmp_eq, matrix_offset.get(), matrix_index.get());
matrix_eq->ret_type = index_tensor_type;
matrix_eq->ret_type = cmp_tensor_type;

auto matrix_alloca_value =
Stmt::make<AdStackLoadTopStmt>(stack_top_stmt->stack);
Expand Down Expand Up @@ -1817,11 +1820,12 @@ class MakeAdjoint : public ADTransform {

auto offset_matrix_init_stmt = insert<MatrixInitStmt>(offset_values);
offset_matrix_init_stmt->ret_type = index_tensor_type;

auto cmp_tensor_type = TypeFactory::get_instance().get_tensor_type(
tensor_shape, PrimitiveType::u1);
auto bin_eq_stmt =
insert<BinaryOpStmt>(BinaryOpType::cmp_eq, offset_matrix_init_stmt,
indices_matrix_init_stmt);
bin_eq_stmt->ret_type = index_tensor_type;
bin_eq_stmt->ret_type = cmp_tensor_type;

auto select_stmt = insert<TernaryOpStmt>(
TernaryOpType::select, bin_eq_stmt, stmt_adj_matrix_init_stmt,
Expand Down
Loading