merge with upstream

taichi-dev · Feb 26, 2020 · e793657 · e793657
2 parents 62e0a24 + 3d5f157
commit e793657
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/taichi/profiler.cpp b/taichi/profiler.cpp
@@ -149,7 +149,7 @@ class CUDAProfiler : public ProfilerBase {
 }  // namespace
 
 std::unique_ptr<ProfilerBase> make_profiler(Arch arch) {
-  if (arch == Arch::x64 || arch == Arch::metal || arch == Arch::opengl) {
+  if (arch == Arch::x64 || arch == Arch::arm64 || arch == Arch::metal || arch == Arch::opengl) {
     return std::make_unique<DefaultProfiler>(arch);
   } else if (arch == Arch::cuda) {
     return std::make_unique<CUDAProfiler>();

diff --git a/test_abs.py b/test_abs.py
@@ -1,18 +1,15 @@
 import taichi as ti
 
-
 @ti.all_archs
 def test_abs():
   x = ti.var(ti.f32)
   y = ti.var(ti.f32)
 
   N = 16
 
-  @ti.layout
-  def place():
-    ti.root.dense(ti.i, N).place(x)
-    ti.root.dense(ti.i, N).place(y)
-    ti.root.lazy_grad()
+  ti.root.dense(ti.i, N).place(x)
+  ti.root.dense(ti.i, N).place(y)
+  ti.root.lazy_grad()
 
   @ti.kernel
   def func():
@@ -36,5 +33,3 @@ def sgn(x):
   for i in range(N):
     assert x[i] == abs(y[i])
     assert y.grad[i] == sgn(y[i])
-
-test_abs()