Enable short_circuit_operators by default

taichi-dev · Jan 7, 2022 · e17f818 · e17f818
1 parent ec54b89
commit e17f818
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/python/taichi/lang/__init__.py b/python/taichi/lang/__init__.py
@@ -398,7 +398,7 @@ def __init__(self):
         self.log_level = 'info'
         self.gdb_trigger = False
         self.experimental_real_function = False
-        self.short_circuit_operators = False
+        self.short_circuit_operators = True
         self.ndarray_use_torch = False
 
 

diff --git a/tests/python/test_bit_array_vectorization.py b/tests/python/test_bit_array_vectorization.py
@@ -145,8 +145,7 @@ def evolve_vectorized(x: ti.template(), y: ti.template()):
             num_active_neighbors += ti.cast(x[i + 1, j - 1], ti.u32)
             num_active_neighbors += ti.cast(x[i + 1, j], ti.u32)
             num_active_neighbors += ti.cast(x[i + 1, j + 1], ti.u32)
-            y[i, j] = (num_active_neighbors == 3) or (num_active_neighbors == 2
-                                                      and x[i, j] == 1)
+            y[i, j] = (num_active_neighbors == 3) | ((num_active_neighbors == 2) & (x[i, j] == 1))
 
     @ti.kernel
     def evolve_naive(x: ti.template(), y: ti.template()):