Merge pull request #2689 from devitocodes/byref-aesthetics

compiler: Avoid generating parentheses when not needed

Author: mloubout

devito/ir/cgen/printer.py

@@ -16,6 +16,7 @@
 from devito import configuration
 from devito.arch.compiler import AOMPCompiler
 from devito.symbolics.inspection import has_integer_args, sympy_dtype
+from devito.symbolics.queries import q_leaf
 from devito.types.basic import AbstractFunction
 from devito.tools import ctypes_to_cstr, dtype_to_ctype, ctypes_vector_mapper
 
@@ -364,7 +365,7 @@ def _print_InlineIf(self, expr):
     def _print_UnaryOp(self, expr, op=None, parenthesize=False):
         op = op or expr._op
         base = self._print(expr.base)
-        if not expr.base.is_Symbol or parenthesize:
+        if not q_leaf(expr.base) or parenthesize:
             base = f'({base})'
         return f'{op}{base}'
 

devito/symbolics/queries.py

@@ -37,9 +37,12 @@ def q_comp_acc(expr):
 
 
 def q_leaf(expr):
-    return (expr.is_Atom or
-            expr.is_Indexed or
-            isinstance(expr, extra_leaves))
+    try:
+        return (expr.is_Atom or
+                expr.is_Indexed or
+                isinstance(expr, extra_leaves))
+    except AttributeError:
+        return False
 
 
 def q_indexed(expr):

examples/mpi/overview.ipynb

@@ -490,14 +490,14 @@
        "  float *restrict bufs_vec __attribute__ ((aligned (64)));\n",
        "  posix_memalign((void**)(&bufs_vec),64,sizeof(float)*(long)y_size*(long)x_size);\n",
        "\n",
-       "  MPI_Irecv(bufs_vec,x_size*y_size,MPI_FLOAT,fromrank,13,comm,&(rrecv));\n",
+       "  MPI_Irecv(bufs_vec,x_size*y_size,MPI_FLOAT,fromrank,13,comm,&rrecv);\n",
        "  if (torank != MPI_PROC_NULL)\n",
        "  {\n",
        "    gather0(bufg_vec,x_size,y_size,u_vec,ogtime,ogx,ogy);\n",
        "  }\n",
-       "  MPI_Isend(bufg_vec,x_size*y_size,MPI_FLOAT,torank,13,comm,&(rsend));\n",
-       "  MPI_Wait(&(rsend),MPI_STATUS_IGNORE);\n",
-       "  MPI_Wait(&(rrecv),MPI_STATUS_IGNORE);\n",
+       "  MPI_Isend(bufg_vec,x_size*y_size,MPI_FLOAT,torank,13,comm,&rsend);\n",
+       "  MPI_Wait(&rsend,MPI_STATUS_IGNORE);\n",
+       "  MPI_Wait(&rrecv,MPI_STATUS_IGNORE);\n",
        "  if (fromrank != MPI_PROC_NULL)\n",
        "  {\n",
        "    scatter0(bufs_vec,x_size,y_size,u_vec,ostime,osx,osy);\n",

examples/performance/00_overview.ipynb

@@ -1198,7 +1198,7 @@
       "  #pragma omp parallel num_threads(nthreads)\n",
       "  {\n",
       "    const int tid = omp_get_thread_num();\n",
-      "    posix_memalign((void**)(&(pr2_vec[tid])),64,sizeof(float)*(long)z_size*(4 + (long)y0_blk0_size));\n",
+      "    posix_memalign((void**)(&pr2_vec[tid]),64,sizeof(float)*(long)z_size*(4 + (long)y0_blk0_size));\n",
       "  }\n",
       "\n",
       "  float (*restrict f)[f_vec->size[1]][f_vec->size[2]] __attribute__ ((aligned (64))) = (float (*)[f_vec->size[1]][f_vec->size[2]]) f_vec->data;\n",
@@ -1489,7 +1489,7 @@
       "  #pragma omp parallel num_threads(nthreads)\n",
       "  {\n",
       "    const int tid = omp_get_thread_num();\n",
-      "    posix_memalign((void**)(&(pr2_vec[tid])),64,sizeof(float)*(long)z_size*(4 + (long)y_size));\n",
+      "    posix_memalign((void**)(&pr2_vec[tid]),64,sizeof(float)*(long)z_size*(4 + (long)y_size));\n",
       "  }\n",
       "\n",
       "  float (*restrict f)[f_vec->size[1]][f_vec->size[2]] __attribute__ ((aligned (64))) = (float (*)[f_vec->size[1]][f_vec->size[2]]) f_vec->data;\n",

tests/test_iet.py

@@ -288,7 +288,7 @@ def _C_free(self):
 static void foo()
 {
   cudaStream_t stream;
-  cudaStreamCreate(&(stream));
+  cudaStreamCreate(&stream);
 
   foo(stream);