Skip to content

Commit 4708374

Browse files
committed
Merge branch 'master' into runtime
2 parents 4e6aec1 + 5bb3b0e commit 4708374

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

setup.py

+6
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,12 @@ def remove_tmp(taichi_dir):
6464

6565

6666
class EggInfo(egg_info):
67+
def finalize_options(self, *args, **kwargs):
68+
if '' not in self.distribution.package_dir:
69+
# XXX: skbuild loses the root package dir
70+
self.distribution.package_dir[''] = package_dir
71+
return super().finalize_options(*args, **kwargs)
72+
6773
def run(self):
6874
taichi_dir = os.path.join(package_dir, 'taichi')
6975
remove_tmp(taichi_dir)

taichi/transforms/lower_ast.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ class LowerAST : public IRVisitor {
156156
stmts->insert(
157157
std::make_unique<WhileControlStmt>(new_while->mask, cond_stmt),
158158
fctx.stmts.size());
159-
stmt->insert_before_me(std::make_unique<AllocaStmt>(PrimitiveType::i32));
160159
auto &&const_stmt =
161160
std::make_unique<ConstStmt>(TypedConstant((int32)0xFFFFFFFF));
162161
auto const_stmt_ptr = const_stmt.get();

0 commit comments

Comments
 (0)