Merge branch 'master' into mesh

docs/lang/articles/misc/internal.md

@@ -330,7 +330,7 @@ a = ti.field(ti.f32, shape=(128, 32, 8))
 b = ti.field(ti.f32)
 ti.root.dense(ti.j, 32).dense(ti.i, 16).place(b)
 
-ti.get_runtime().materialize()
+ti.lang.impl.get_runtime().materialize() # This is an internal api for dev, we don't make sure it is stable for user.
 
 mapping_a = a.snode().physical_index_position()
 

misc/benchmark_rebuild_graph.py

@@ -1,3 +1,5 @@
+from taichi.lang import impl
+
 import taichi as ti
 
 ti.init(arch=ti.cuda, async_mode=True)
@@ -23,4 +25,4 @@ def foo():
 for i in range(1000):
     foo()
 
-ti.get_runtime().prog.benchmark_rebuild_graph()
+impl.get_runtime().prog.benchmark_rebuild_graph()

python/taichi/__init__.py

@@ -1,6 +1,8 @@
+import sys
+
 from taichi._funcs import *
+from taichi._lib import core as _ti_core
 from taichi._logging import *
-from taichi._misc import *
 from taichi.lang import *  # pylint: disable=W0622 # TODO(archibate): It's `taichi.lang.core` overriding `taichi.core`
 from taichi.tools import *
 from taichi.tools.patterns import taichi_logo
@@ -15,4 +17,27 @@
 from taichi import aot  # isort:skip
 from taichi._testing import *  # isort:skip
 
+__deprecated_names__ = {'SOA': 'Layout.SOA', 'AOS': 'Layout.AOS'}
+
+if sys.version_info.minor < 7:
+    for name, alter in __deprecated_names__.items():
+        exec(f'{name} = {alter}')
+else:
+
+    def __getattr__(attr):
+        if attr in __deprecated_names__:
+            warning(
+                f'ti.{attr} is deprecated. Please use ti.{__deprecated_names__[attr]} instead.',
+                DeprecationWarning,
+                stacklevel=2)
+            exec(f'{attr} = {__deprecated_names__[attr]}')
+            return locals()[attr]
+        raise AttributeError(f"module '{__name__}' has no attribute '{attr}'")
+
+
+__version__ = (_ti_core.get_version_major(), _ti_core.get_version_minor(),
+               _ti_core.get_version_patch())
+
+del sys
+del _ti_core
 __all__ = ['ad', 'lang', 'tools', 'ui', 'profiler']

python/taichi/examples/algorithm/print_offset.py

@@ -1,3 +1,5 @@
+from taichi.lang import impl
+
 import taichi as ti
 
 ti.init(arch=ti.cpu, print_ir=True)
@@ -19,7 +21,7 @@ def fill():
 fill()
 print(a.to_numpy())
 
-ti.get_runtime().prog.visualize_layout('layout.pdf')
+impl.get_runtime().prog.visualize_layout('layout.pdf')
 
 gui = ti.GUI('layout', res=(256, 512), background_color=0xFFFFFF)
 

python/taichi/lang/__init__.py

@@ -1,6 +1,7 @@
 import atexit
 import datetime
 import functools
+import inspect
 import json
 import os
 import platform
@@ -24,15 +25,9 @@
                                    TaichiSyntaxError, TaichiTypeError)
 from taichi.lang.expr import Expr, make_expr_group
 from taichi.lang.field import Field, ScalarField
-from taichi.lang.impl import (axes, begin_frontend_if,
-                              begin_frontend_struct_for, call_internal,
-                              current_cfg, deactivate_all_snodes, expr_init,
-                              expr_init_func, expr_init_list, field,
-                              get_runtime, grouped,
-                              insert_expr_stmt_if_ti_func, ndarray, one, root,
-                              static, static_assert, static_print, stop_grad,
-                              subscript, ti_assert, ti_float, ti_format,
-                              ti_int, ti_print, zero)
+from taichi.lang.impl import (axes, deactivate_all_snodes, field, grouped,
+                              ndarray, one, root, static, static_assert,
+                              static_print, stop_grad, zero)
 from taichi.lang.kernel_impl import (KernelArgError, KernelDefError,
                                      data_oriented, func, kernel, pyfunc)
 from taichi.lang.matrix import *
@@ -57,8 +52,6 @@
 
 from taichi import _logging
 
-runtime = impl.get_runtime()
-
 i = axes(0)
 j = axes(1)
 k = axes(2)
@@ -785,7 +778,7 @@ def Tape(loss, clear_gradients=True):
     from taichi._kernels import clear_loss  # pylint: disable=C0415
     clear_loss(loss)
 
-    return runtime.get_tape(loss)
+    return impl.get_runtime().get_tape(loss)
 
 
 def clear_all_gradients():
@@ -1061,4 +1054,8 @@ def get_host_arch_list():
     return [_ti_core.host_arch()]
 
 
-__all__ = [s for s in dir() if not s.startswith('_')]
+__all__ = [
+    s for s in dir()
+    if not s.startswith('_') and not inspect.ismodule(globals()[s])
+    or s in ['tape', 'sort']
+]

python/taichi/lang/impl.py

@@ -904,3 +904,9 @@ def mesh_relation_access(mesh, from_index, to_element_type):
     if isinstance(mesh, MeshInstance):
         return MeshRelationAccessProxy(mesh, from_index, to_element_type)
     raise RuntimeError("Relation access should be with a mesh instance!")
+
+
+__all__ = [
+    'axes', 'deactivate_all_snodes', 'field', 'grouped', 'ndarray', 'one',
+    'root', 'static', 'static_assert', 'static_print', 'stop_grad', 'zero'
+]

tests/python/test_ad_if.py

@@ -1,3 +1,5 @@
+from taichi.lang import impl
+
 import taichi as ti
 
 
@@ -235,6 +237,6 @@ def func():
 def test_stack():
     @ti.kernel
     def func():
-        ti.call_internal("test_stack")
+        impl.call_internal("test_stack")
 
     func()

tests/python/test_ast_refactor.py

@@ -1,6 +1,7 @@
 import numpy as np
 import pytest
 from taichi._testing import approx
+from taichi.lang import impl
 from taichi.lang.util import has_pytorch
 
 import taichi as ti
@@ -13,7 +14,7 @@ def foo(x: ti.i32, y: ti.i32, a: ti.template()):
         a[0] = x + y
         a[1] = x - y
         a[2] = x * y
-        a[3] = ti.ti_float(x) / y
+        a[3] = impl.ti_float(x) / y
         a[4] = x // y
         a[5] = x % y
         a[6] = x**y
@@ -688,7 +689,7 @@ def bar(x: ti.template()):
             return ti.Matrix([[1, 0], [0, 1]])
 
     def fibonacci(x):
-        return ti.subscript(bar(x), 1, 0)
+        return impl.subscript(bar(x), 1, 0)
 
     @ti.kernel
     def foo(x: ti.template()) -> ti.i32:
@@ -780,7 +781,7 @@ def bar(x: tc.template()):
             return tc.Matrix([[1, 0], [0, 1]])
 
     def fibonacci(x):
-        return tc.subscript(bar(x), 1, 0)
+        return impl.subscript(bar(x), 1, 0)
 
     @tc.kernel
     def foo(x: tc.template()) -> tc.i32:

tests/python/test_clear_all_gradients.py

@@ -1,3 +1,5 @@
+from taichi.lang import impl
+
 import taichi as ti
 
 
@@ -23,7 +25,7 @@ def test_clear_all_gradients():
             w.grad[i, j] = 6
 
     ti.clear_all_gradients()
-    assert ti.get_runtime().get_num_compiled_functions() == 3
+    assert impl.get_runtime().get_num_compiled_functions() == 3
 
     assert x.grad[None] == 0
     for i in range(n):
@@ -34,4 +36,4 @@ def test_clear_all_gradients():
 
     ti.clear_all_gradients()
     # No more kernel compilation
-    assert ti.get_runtime().get_num_compiled_functions() == 3
+    assert impl.get_runtime().get_num_compiled_functions() == 3

tests/python/test_compare.py

@@ -1,4 +1,5 @@
 import pytest
+from taichi.lang import impl
 
 import taichi as ti
 
@@ -106,7 +107,7 @@ def why_this_foo_fail(n):
         return ti.atomic_add(b[None], n)
 
     def foo(n):
-        return ti.atomic_add(ti.subscript(b, None), n)
+        return ti.atomic_add(impl.subscript(b, None), n)
 
     @ti.kernel
     def func():

tests/python/test_cuda_internals.py

@@ -1,3 +1,5 @@
+from taichi.lang import impl
+
 import taichi as ti
 
 # TODO: these are not really tests...
@@ -8,7 +10,7 @@ def test_do_nothing():
     @ti.kernel
     def test():
         for i in range(10):
-            ti.call_internal("do_nothing")
+            impl.call_internal("do_nothing")
 
     test()
 
@@ -19,7 +21,7 @@ def test_active_mask():
     def test():
         for i in range(48):
             if i % 2 == 0:
-                ti.call_internal("test_active_mask")
+                impl.call_internal("test_active_mask")
 
     test()
 
@@ -29,6 +31,6 @@ def test_shfl_down():
     @ti.kernel
     def test():
         for i in range(32):
-            ti.call_internal("test_shfl")
+            impl.call_internal("test_shfl")
 
     test()

tests/python/test_div.py

@@ -1,3 +1,5 @@
+from taichi.lang import impl
+
 import taichi as ti
 
 
@@ -58,7 +60,7 @@ def test_true_div():
 
 @ti.test()
 def test_div_default_ip():
-    ti.get_runtime().set_default_ip(ti.i64)
+    impl.get_runtime().set_default_ip(ti.i64)
     z = ti.field(ti.f32, shape=())
 
     @ti.kernel

tests/python/test_field.py

@@ -3,6 +3,7 @@
 '''
 
 import pytest
+from taichi.lang import impl
 
 import taichi as ti
 
@@ -121,7 +122,7 @@ def test_default_fp(dtype):
 
     x = ti.Vector.field(2, float, ())
 
-    assert x.dtype == ti.get_runtime().default_fp
+    assert x.dtype == impl.get_runtime().default_fp
 
 
 @pytest.mark.parametrize('dtype', [ti.i32, ti.i64])
@@ -130,7 +131,7 @@ def test_default_ip(dtype):
 
     x = ti.Vector.field(2, int, ())
 
-    assert x.dtype == ti.get_runtime().default_ip
+    assert x.dtype == impl.get_runtime().default_ip
 
 
 @ti.test()

tests/python/test_internal_func.py

@@ -1,5 +1,7 @@
 import time
 
+from taichi.lang import impl
+
 import taichi as ti
 
 
@@ -8,7 +10,7 @@ def test_basic():
     @ti.kernel
     def test():
         for _ in range(10):
-            ti.call_internal("do_nothing")
+            impl.call_internal("do_nothing")
 
     test()
 
@@ -19,7 +21,7 @@ def test_host_polling():
 
     @ti.kernel
     def test():
-        ti.call_internal("refresh_counter")
+        impl.call_internal("refresh_counter")
 
     for i in range(10):
         print('updating tail to', i)
@@ -31,7 +33,7 @@ def test():
 def test_list_manager():
     @ti.kernel
     def test():
-        ti.call_internal("test_list_manager")
+        impl.call_internal("test_list_manager")
 
     test()
     test()
@@ -41,7 +43,7 @@ def test():
 def test_node_manager():
     @ti.kernel
     def test():
-        ti.call_internal("test_node_allocator")
+        impl.call_internal("test_node_allocator")
 
     test()
     test()
@@ -51,7 +53,7 @@ def test():
 def test_node_manager_gc():
     @ti.kernel
     def test_cpu():
-        ti.call_internal("test_node_allocator_gc_cpu")
+        impl.call_internal("test_node_allocator_gc_cpu")
 
     test_cpu()
 
@@ -60,7 +62,7 @@ def test_cpu():
 def test_return():
     @ti.kernel
     def test_cpu():
-        ret = ti.call_internal("test_internal_func_args", 1.0, 2.0, 3)
+        ret = impl.call_internal("test_internal_func_args", 1.0, 2.0, 3)
         assert ret == 9
 
     test_cpu()