Fix errors due to changes in Mako upstream.

.github/workflows/tests.yml

@@ -44,6 +44,7 @@ jobs:
           python -m pip install https://github.com/pypr/compyle/zipball/master
           python -m pip install -r requirements.txt
           python -m pip install -e ".[dev]"
+          python -m pip list
       # Cache auto-generated code. Cache key changes every month.
       # Thanks https://stackoverflow.com/a/60942437
       - name: Get month to use as cache key.

pysph/base/gpu_nnps_helper.py

@@ -42,13 +42,11 @@ def __init__(self, tpl_filename, backend=None, use_double=False,
         c_type:
             c_type to use. Overrides use_double
         """
-        disable_unicode = False if sys.version_info.major > 2 else True
 
         self.src_tpl = Template(
             filename=os.path.join(
                 os.path.dirname(os.path.realpath(__file__)),
                 tpl_filename),
-            disable_unicode=disable_unicode,
         )
         self.data_t = "double" if use_double else "float"
 
@@ -59,7 +57,6 @@ def __init__(self, tpl_filename, backend=None, use_double=False,
             filename=os.path.join(
                 os.path.dirname(os.path.realpath(__file__)),
                 "gpu_helper_functions.mako"),
-            disable_unicode=disable_unicode
         )
 
         helper_preamble = helper_tpl.get_def("get_helpers").render(

pysph/base/tree/point_tree.py

@@ -15,9 +15,6 @@
 
 from mako.template import Template
 
-# For Mako
-disable_unicode = False if sys.version_info.major > 2 else True
-
 
 class IncompatibleTreesException(Exception):
     pass
@@ -116,7 +113,7 @@ def _get_macros_preamble(c_type, sorted, dim):
 
         return res;
     }
-    """, disable_unicode=disable_unicode).render(data_t=c_type, sorted=sorted,
+    """).render(data_t=c_type, sorted=sorted,
                                                  dim=dim)
     return result
 
@@ -129,7 +126,7 @@ def _get_node_bound_kernel_parameters(dim, data_t, xvars):
         ${data_t} xmin[${dim}] = {${', '.join(['INFINITY'] * dim)}};
         ${data_t} xmax[${dim}] = {${', '.join(['-INFINITY'] * dim)}};
         ${data_t} hmax = 0;
-        """, disable_unicode=disable_unicode).render(dim=dim, data_t=data_t)
+        """).render(dim=dim, data_t=data_t)
 
     result['args'] = Template(
         r"""int *pids,
@@ -141,7 +138,7 @@ def _get_node_bound_kernel_parameters(dim, data_t, xvars):
         ${data_t}${dim} *node_xmin,
         ${data_t}${dim} *node_xmax,
         ${data_t} *node_hmax
-        """, disable_unicode=disable_unicode).render(dim=dim,
+        """).render(dim=dim,
                                                      data_t=data_t,
                                                      xvars=xvars)
 
@@ -155,7 +152,7 @@ def _get_node_bound_kernel_parameters(dim, data_t, xvars):
         % endfor
         hmax = fmax(h[pid] * radius_scale, hmax);
         }
-        """, disable_unicode=disable_unicode).render(dim=dim, xvars=xvars)
+        """).render(dim=dim, xvars=xvars)
 
     result['node_operation'] = Template(
         r"""
@@ -170,7 +167,7 @@ def _get_node_bound_kernel_parameters(dim, data_t, xvars):
             % endfor
             hmax = fmax(hmax, node_hmax[child_offset + ${i}]);
         % endfor
-        """, disable_unicode=disable_unicode).render(dim=dim)
+        """).render(dim=dim)
 
     result['output_expr'] = Template(
         """
@@ -179,7 +176,7 @@ def _get_node_bound_kernel_parameters(dim, data_t, xvars):
             node_xmax[node_idx].s${d} = xmax[${d}];
         % endfor
         node_hmax[node_idx] = hmax;
-        """, disable_unicode=disable_unicode).render(dim=dim)
+        """).render(dim=dim)
 
     return result
 
@@ -202,8 +199,7 @@ def _get_leaf_neighbor_kernel_parameters(data_t, dim, args, setup, operation,
             node_hmax1 = node_hmax_dst[cid_dst];
 
             %(setup)s;
-            """ % dict(setup=setup),
-                          disable_unicode=disable_unicode).render(
+            """ % dict(setup=setup)).render(
             data_t=data_t, dim=dim),
         'node_operation': Template("""
             node_xmin2 = node_xmin_src[cid_src];
@@ -216,7 +212,7 @@ def _get_leaf_neighbor_kernel_parameters(data_t, dim, args, setup, operation,
                 flag = 0;
                 break;
             }
-            """, disable_unicode=disable_unicode).render(data_t=data_t),
+            """).render(data_t=data_t),
         'leaf_operation': Template("""
             node_xmin2 = node_xmin_src[cid_src];
             node_xmax2 = node_xmax_src[cid_src];
@@ -228,17 +224,14 @@ def _get_leaf_neighbor_kernel_parameters(data_t, dim, args, setup, operation,
                                 node_xmin2, node_xmax2)) {
                 %(operation)s;
             }
-            """ % dict(operation=operation),
-                                   disable_unicode=disable_unicode).render(),
+            """ % dict(operation=operation)).render(),
         'output_expr': output_expr,
         'args': Template("""
             ${data_t}${dim} *node_xmin_src, ${data_t}${dim} *node_xmax_src,
             ${data_t} *node_hmax_src,
             ${data_t}${dim} *node_xmin_dst, ${data_t}${dim} *node_xmax_dst,
             ${data_t} *node_hmax_dst,
-            """ + args, disable_unicode=disable_unicode).render(data_t=data_t,
-                                                                dim=dim)
-
+            """ + args).render(data_t=data_t, dim=dim)
     }
     return result
 

pysph/sph/acceleration_nnps_helper.py

@@ -1,7 +1,6 @@
 import sys
 from mako.template import Template
 
-disable_unicode = False if sys.version_info.major > 2 else True
 
 NNPS_TEMPLATE = r"""
 
@@ -140,7 +139,7 @@ def _generate_nnps_code(sorted, wgs, setup, loop, vars, types,
     # need to be fixed throughout the simulation since
     # currently this function is only called at the start of
     # the simulation.
-    return Template(NNPS_TEMPLATE, disable_unicode=disable_unicode).render(
+    return Template(NNPS_TEMPLATE).render(
         data_t=data_t, sorted=sorted, wgs=wgs, setup=setup, loop_code=loop,
         vars=vars, types=types
     )