#2244 Fix more issues processing LFRic trunk (it now compiles and run…

… gungho, but threading is in the wrong loop)

src/psyclone/domain/lfric/lfric_constants.py

@@ -193,6 +193,8 @@ def __init__(self):
                                   # coloured loop
               "ntilecolours",     # the number of colours in a
                                   # coloured tiled loop
+              "last_edge_tile_per_colour",
+              "last_edge_cell_per_coloured_tile",
               "ncells",           # the number of owned cells
               "ndofs",            # the number of owned dofs
               "nannexed"]         # the number of owned dofs

src/psyclone/domain/lfric/lfric_loop.py

@@ -468,10 +468,22 @@ def _upper_bound_fortran(self):
             if Config.get().distributed_memory:
                 return (f"{self._mesh_name}%get_last_halo_tile_per_colour("
                         f"{halo_index})")
+            raise GenerationError(
+                "'last_halo_tile_per_colour' is not a valid loop upper bound "
+                "for non-distributed-memory code")
         if self._upper_bound_name == "last_halo_cell_per_colour_and_tile":
             if Config.get().distributed_memory:
                 return (f"{self._mesh_name}%get_last_halo_cell_per_colour_and"
                         f"_tile({halo_index})")
+            raise GenerationError(
+                "'last_halo_cell_per_colour_and_tile' is not a valid loop "
+                "upper bound for non-distributed-memory code")
+        if self._upper_bound_name == "last_edge_tile_per_colour":
+            raise GenerationError(
+                "FIXME: 'last_egde_tile_per_colour'")
+        if self._upper_bound_name == "last_edge_tile_per_colour":
+            raise GenerationError(
+                "FIXME: 'last_edge_cell_per_coloured_tile")
 
         if self._upper_bound_name == "ncolour":
             # Loop over cells of a particular colour when DM is disabled.

src/psyclone/dynamo0p3.py

@@ -764,8 +764,8 @@ def initialise(self, parent):
         # it now, rather than when this class was first constructed.
         need_colour_limits = False
         need_colour_halo_limits = False
-        need_tilecolour_limits = False
-        need_tilecolour_halo_limits = False
+        # need_tilecolour_limits = False
+        # need_tilecolour_halo_limits = False
         for call in self._calls:
             if call.is_coloured() and not call.is_intergrid:
 
@@ -774,12 +774,14 @@ def initialise(self, parent):
                             const.HALO_ACCESS_LOOP_BOUNDS)
                 if has_halo:
                     if is_tiled:
-                        need_tilecolour_halo_limits = True
+                        # need_tilecolour_halo_limits = True
+                        pass
                     else:
                         need_colour_halo_limits = True
                 else:
                     if is_tiled:
-                        need_tilecolour_limits = True
+                        # need_tilecolour_limits = True
+                        pass
                     else:
                         need_colour_limits = True
 
@@ -849,6 +851,7 @@ def initialise(self, parent):
         #     rhs = f"{mesh}%get_last_edge_cell_per_colour_and_tile()"
         #     parent.add(AssignGen(parent, lhs=lhs, rhs=rhs))
 
+
 class DynReferenceElement(LFRicCollection):
     '''
     Holds all information on the properties of the Reference Element
@@ -2156,23 +2159,29 @@ def colourmap_init(self):
                 # Array holding the last cell of a given colour.
                 if (Config.get().distributed_memory and
                         not call.all_updates_are_writes):
-                    # This will require a loop into the halo and so the array is
-                    # 2D (indexed by colour *and* halo depth).
+                    # This will require a loop into the halo and so the array
+                    # is 2D (indexed by colour *and* halo depth).
                     base_name = "last_halo_tile_per_colour_" + carg_name
-                    last_tile = self._schedule.symbol_table.find_or_create_array(
-                        base_name, 2, ScalarType.Intrinsic.INTEGER, tag=base_name)
-                    base_name = "last_halo_cell_per_colour_and_tile_" + carg_name
-                    last_cell_tile = self._schedule.symbol_table.find_or_create_array(
-                        base_name, 3, ScalarType.Intrinsic.INTEGER, tag=base_name)
+                    last_tile = sym_tab.find_or_create_array(
+                        base_name, 2, ScalarType.Intrinsic.INTEGER,
+                        tag=base_name)
+                    base_name = ("last_halo_cell_per_colour_and_tile_" +
+                                 carg_name)
+                    last_cell_tile = sym_tab.find_or_create_array(
+                        base_name, 3, ScalarType.Intrinsic.INTEGER,
+                        tag=base_name)
                 else:
-                    # Array holding the last edge cell of a given colour. Just 1D
-                    # as indexed by colour only.
+                    # Array holding the last edge cell of a given colour. Just
+                    # 1D as indexed by colour only.
                     base_name = "last_edge_tile_all_colours_" + carg_name
-                    last_tile = self._schedule.symbol_table.find_or_create_array(
-                        base_name, 1, ScalarType.Intrinsic.INTEGER, tag=base_name)
-                    base_name = "last_edge_cell_all_colours_and_tiles_" + carg_name
-                    last_cell_tile = self._schedule.symbol_table.find_or_create_array(
-                        base_name, 2, ScalarType.Intrinsic.INTEGER, tag=base_name)
+                    last_tile = sym_tab.find_or_create_array(
+                        base_name, 1, ScalarType.Intrinsic.INTEGER,
+                        tag=base_name)
+                    base_name = ("last_edge_cell_all_colours_and_tiles_"
+                                 + carg_name)
+                    last_cell_tile = sym_tab.find_or_create_array(
+                        base_name, 2, ScalarType.Intrinsic.INTEGER,
+                        tag=base_name)
                 # Add these symbols into the dictionary entry for this
                 # inter-grid kernel
                 call._intergrid_ref.set_tilecolour_info(
@@ -2188,17 +2197,19 @@ def colourmap_init(self):
                 # Array holding the last cell of a given colour.
                 if (Config.get().distributed_memory and
                         not call.all_updates_are_writes):
-                    # This will require a loop into the halo and so the array is
-                    # 2D (indexed by colour *and* halo depth).
+                    # This will require a loop into the halo and so the array
+                    # is 2D (indexed by colour *and* halo depth).
                     base_name = "last_halo_cell_all_colours_" + carg_name
-                    last_cell = self._schedule.symbol_table.find_or_create_array(
-                        base_name, 2, ScalarType.Intrinsic.INTEGER, tag=base_name)
+                    last_cell = sym_tab.find_or_create_array(
+                        base_name, 2, ScalarType.Intrinsic.INTEGER,
+                        tag=base_name)
                 else:
-                    # Array holding the last edge cell of a given colour. Just 1D
-                    # as indexed by colour only.
+                    # Array holding the last edge cell of a given colour. Just
+                    # 1D as indexed by colour only.
                     base_name = "last_edge_cell_all_colours_" + carg_name
-                    last_cell = self._schedule.symbol_table.find_or_create_array(
-                        base_name, 1, ScalarType.Intrinsic.INTEGER, tag=base_name)
+                    last_cell = sym_tab.find_or_create_array(
+                        base_name, 1, ScalarType.Intrinsic.INTEGER,
+                        tag=base_name)
                 # Add these symbols into the dictionary entry for this
                 # inter-grid kernel
                 call._intergrid_ref.set_colour_info(colour_map, ncolours,
@@ -2458,8 +2469,14 @@ def initialise(self, parent):
                 parent.add(CommentGen(parent, " Get the tilecolourmap"))
                 parent.add(CommentGen(parent, ""))
                 # Look-up variable names for colourmap and number of colours
+                ntilecolours = self._schedule.symbol_table.find_or_create_tag(
+                    "ntilecolour").name
                 colour_map = self._schedule.symbol_table.find_or_create_tag(
                     "tmap").name
+                # Get the number of colourtiles
+                parent.add(AssignGen(
+                    parent, lhs=ntilecolours,
+                    rhs=f"{mesh_name}%get_ntilecolours()"))
                 # Get the colour map
                 parent.add(AssignGen(
                     parent, pointer=True, lhs=colour_map,
@@ -2585,12 +2602,14 @@ def initialise(self, parent):
             # Colour map for the coarse mesh (if required)
             if dig.tilecolourmap_symbol:
                 # Number of colours
-                parent.add(AssignGen(parent, lhs=dig.ntilecolours_var_symbol.name,
+                parent.add(AssignGen(parent,
+                                     lhs=dig.ntilecolours_var_symbol.name,
                                      rhs=coarse_mesh + "%get_ntilecolours()"))
                 # Colour map itself
                 parent.add(AssignGen(parent, lhs=dig.tilecolourmap_symbol.name,
                                      pointer=True,
-                                     rhs=coarse_mesh + "%get_coloured_tiling_map()"))
+                                     rhs=(coarse_mesh +
+                                          "%get_coloured_tiling_map()")))
                 # Last halo/edge cell per colour.
                 # sym = dig.last_cell_tile_var_symbol
                 # if len(sym.datatype.shape) == 2:
@@ -2725,13 +2744,6 @@ def ncolours_var_symbol(self):
         '''
         return self._ncolours_var_symbol
 
-    @property
-    def ntilecolours_var_symbol(self):
-        ''':returns: the symbol for storing the number of colours.
-        :rtype: :py:class:`psyclone.psyir.symbols.Symbol`
-        '''
-        return self._ntilecolours_var_symbol
-
     @property
     def last_cell_var_symbol(self):
         ''':returns: the last halo/edge cell variable.
@@ -4961,7 +4973,9 @@ def _compute_from_field(self, field):
             else:
                 # loop redundant computation is to the maximum depth
                 self._max_depth = True
-        elif loop.upper_bound_name == "ncolour":
+        elif loop.upper_bound_name in ("ncolour",
+                                       "last_edge_tile_per_colour",
+                                       "last_edge_cell_per_coloured_tile"):
             # Loop is coloured but does not access the halo.
             pass
         elif loop.upper_bound_name in ["ncells", "nannexed"]:

src/psyclone/tests/domain/lfric/transformations/dynamo0p3_transformations_test.py

@@ -278,10 +278,10 @@ def test_colour_trans_tiled(tmpdir, dist_mem):
     else:
         assert """
       do colour = loop0_start, loop0_stop, 1
-        do tile = loop1_start, mesh%get_last_halo_tile_per_colour4\
-(colour,max_halo_depth_mesh), 1
+        do tile = loop1_start, mesh%get_last_halo_tile_per_colour\
+(colour,1), 1
           do cell = loop2_start, mesh%get_last_halo_cell_per_colour_and_tile\
-(colour,tile,max_halo_depth_mesh), 1
+(colour,tile,1), 1
         """ in gen
 
 

src/psyclone/transformations.py

@@ -812,7 +812,8 @@ def validate(self, node, options=None):
         # colouring.
         const = LFRicConstants()
         if node.field_space.orig_name not in const.VALID_DISCONTINUOUS_NAMES:
-            if node.loop_type not in ('colour', 'colourtiles') and node.has_inc_arg():
+            if (node.loop_type not in ('colour', 'colourtiles')
+                    and node.has_inc_arg()):
                 raise TransformationError(
                     f"Error in {self.name} transformation. The kernel has an "
                     f"argument with INC access but the loop is of type "
@@ -1242,7 +1243,6 @@ def _create_colours_loop(self, node):
 
         return colours_loop
 
-
     def _create_tiled_colours_loops(self, node):
         '''
         Creates a nested loop (colours, and cells of a given colour) which
@@ -1279,8 +1279,7 @@ def _create_tiled_colours_loops(self, node):
             colour_loop.set_upper_bound("last_halo_tile_per_colour", index)
         else:
             # No halo access.
-            colour_loop.set_upper_bound("ncolour")
-            # colour_loop.set_upper_bound("error")
+            colour_loop.set_upper_bound("last_edge_tile_per_colour")
 
         # Add this loop as a child of our loop over colours
         colours_loop.loop_body.addchild(colour_loop)
@@ -1302,7 +1301,7 @@ def _create_tiled_colours_loops(self, node):
                                       index)
         else:
             # No halo access.
-            tile_loop.set_upper_bound("ncells")
+            tile_loop.set_upper_bound("last_edge_cell_per_coloured_tile")
 
         # Add this loop as a child of our loop over colours
         colour_loop.loop_body.addchild(tile_loop)