Refactor2023: Remove Program::current_callable (fixed bugs)

taichi-dev · Dec 7, 2022 · fdd230f · fdd230f
1 parent a4852af
commit fdd230f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/python/taichi/lang/misc.py b/python/taichi/lang/misc.py
@@ -696,8 +696,7 @@ def global_thread_idx():
         >>>
         test()
     """
-    return impl.get_runtime().prog.current_ast_builder(
-    ).insert_thread_idx_expr()
+    return impl.get_runtime().compiling_callable.ast_builder().insert_thread_idx_expr()
 
 
 def mesh_patch_idx():

diff --git a/python/taichi/lang/simt/block.py b/python/taichi/lang/simt/block.py
@@ -34,7 +34,7 @@ def thread_idx():
 def global_thread_idx():
     arch = impl.get_runtime().prog.config().arch
     if arch == _ti_core.cuda:
-        return impl.get_runtime().prog.current_ast_builder(
+        return impl.get_runtime().compiling_callable.ast_builder(
         ).insert_thread_idx_expr()
     if impl.get_runtime().prog.config().arch == _ti_core.vulkan:
         return impl.call_internal("vkGlobalThreadIdx",

diff --git a/python/taichi/lang/source_builder.py b/python/taichi/lang/source_builder.py
@@ -123,7 +123,7 @@ def from_source(cls, source_code, compile_fn=None):
 
     def __getattr__(self, item):
         def bitcode_func_call_wrapper(*args):
-            impl.get_runtime().prog.current_ast_builder(
+            impl.get_runtime().compiling_callable.ast_builder(
             ).insert_external_func_call(0, '', self.bc, item,
                                         make_expr_group(args),
                                         make_expr_group([]))
@@ -134,7 +134,7 @@ def bitcode_func_call_wrapper(*args):
         def external_func_call_wrapper(args=[], outputs=[]):
             func_addr = ctypes.cast(self.so.__getattr__(item),
                                     ctypes.c_void_p).value
-            impl.get_runtime().prog.current_ast_builder(
+            impl.get_runtime().compiling_callable.ast_builder(
             ).insert_external_func_call(func_addr, '', '', '',
                                         make_expr_group(args),
                                         make_expr_group(outputs))