Merge pull request devitocodes#2399 from devitocodes/heuristic-int32

compiler: Default to index-mode=int32

devito/core/operator.py

@@ -115,10 +115,10 @@ class BasicOperator(Operator):
     stencil-like data accesses.
     """
 
-    INDEX_MODE = "int64"
+    INDEX_MODE = "int32"
     """
-    The type of the expression used to compute array indices. Either `int64`
-    (default) or `int32`.
+    The type of the expression used to compute array indices. Either `int32`
+    (default) or `int64`.
     """
 
     ERRCTL = None

devito/types/dense.py

@@ -866,10 +866,11 @@ def _arg_check(self, args, intervals, **kwargs):
         if args.options['index-mode'] == 'int32' and \
            args.options['linearize'] and \
            data.size - 1 >= np.iinfo(np.int32).max:
-            raise InvalidArgument("`%s`, with its %d elements, may be too big for "
-                                  "int32 pointer arithmetic, which might cause an "
-                                  "overflow. Use the 'index-mode=int64' option"
-                                  % (self, data.size))
+            raise InvalidArgument("`%s`, with its %d elements, is too big for "
+                                  "int32 pointer arithmetic. Consider using the "
+                                  "'index-mode=int64' option, the save=Buffer(..) "
+                                  "API (TimeFunction only), or domain "
+                                  "decomposition via MPI" % (self.name, data.size))
 
     def _arg_finalize(self, args, alias=None):
         key = alias or self

tests/test_linearize.py

@@ -185,7 +185,7 @@ def test_codegen_quality0(mode):
 
     exprs = FindNodes(Expression).visit(op)
     assert len(exprs) == 6
-    assert all('const long' in str(i) for i in exprs[:-2])
+    assert all('const int' in str(i) for i in exprs[:-2])
 
     # Only four access macros necessary, namely `uL0`, `bufL0`, `bufL1`
     # for the efunc args
@@ -207,8 +207,8 @@ def test_codegen_quality1():
     # 11 expressions in total are expected, 8 of which are for the linearized accesses
     exprs = FindNodes(Expression).visit(op)
     assert len(exprs) == 11
-    assert all('const long' in str(i) for i in exprs[:-3])
-    assert all('const long' not in str(i) for i in exprs[-3:])
+    assert all('const int' in str(i) for i in exprs[:-3])
+    assert all('const int' not in str(i) for i in exprs[-3:])
 
     # Only two access macros necessary, namely `uL0` and `r1L0` (the other five
     # obviously are _POSIX_C_SOURCE, MIN, MAX, START, STOP)