Slice op fixes

Author: diaconuccalin

Deeploy/Targets/Generic/Parsers.py

@@ -143,7 +143,10 @@ def parseNodeCtxt(self,
         if len(node.inputs) <= 4:
             values = np.ones((self.operatorRepresentation['dims']), dtype = np.int64)
             stepsTensor = gs.Constant(f'{node.name}_Steps_Tensor', values = values)
+
             ctxt.hoistConstant(stepsTensor)
+            ctxt.addUser(stepsTensor.name, node)
+
             node.inputs.append(stepsTensor)
 
         self.operatorRepresentation['starts'] = node.inputs[1].name

Deeploy/Targets/PULPOpen/TileConstraints/SliceConstraint.py

@@ -113,36 +113,25 @@ def serializeTilingSolution(
         # Prepare replacement lists for the elements inside the operator representation,
         # for the cubes to be computed further down in this function
 
-        # ~~~~~ SEE ISSUE #134: https://github.com/pulp-platform/Deeploy/issues/134 ~~~~~
-        # Freeze tiling input and output tiling for now
+        # Build replacementTypes based on the actual number of dimensions
+        data_in_shape_type = [PointerClass(uint16_t) for _ in range(len(operatorRepresentation['data_in_shape']))]
+        data_out_shape_type = [PointerClass(uint16_t) for _ in range(len(operatorRepresentation['data_out_shape']))]
+
         replacements = {
-            # "data_in_shape": [],
-            # "data_out_shape": [],
-            # "starts": [[
-            #     0,
-            # ] * len(operatorRepresentation['axes'])] * len(outputCubes),
-            # "ends": [],
+            "data_in_shape": [],
+            "data_out_shape": [],
+            "starts": [],
+            "ends": [],
             "data_in_size": [],
         }
 
         replacementTypes = {
-            # "data_in_shape": [
-            #     PointerClass(uint16_t),
-            #     PointerClass(uint16_t),
-            #     PointerClass(uint16_t),
-            #     PointerClass(uint16_t)
-            # ],
-            # "data_out_shape": [
-            #     PointerClass(uint16_t),
-            #     PointerClass(uint16_t),
-            #     PointerClass(uint16_t),
-            #     PointerClass(uint16_t)
-            # ],
-            # "starts": PointerClass(uint16_t),
-            # "ends": PointerClass(uint16_t),
+            "data_in_shape": data_in_shape_type,
+            "data_out_shape": data_out_shape_type,
+            "starts": PointerClass(uint16_t),
+            "ends": PointerClass(uint16_t),
             "data_in_size": PointerClass(uint16_t),
         }
-        # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
         # Prepare loading schedule lists
         inputLoadSchedule = []
@@ -152,20 +141,18 @@ def serializeTilingSolution(
             # Compute input cube
             in_cube = SliceTileConstraint.computeInputCubeFromOutputCube(out_cube, parseDict = operatorRepresentation)
 
-            # Compute new ends for replacement
+            # Compute new starts and ends for replacement
+            new_starts = list()
             new_ends = list()
             for ax in operatorRepresentation['axes']:
+                new_starts.append(in_cube.offset[ax])
                 new_ends.append(in_cube.offset[ax] + in_cube.dims[ax])
 
-            # Append replacement elements
-
-            # ~~~~~ SEE ISSUE #134: https://github.com/pulp-platform/Deeploy/issues/134 ~~~~~
-            # Freeze tiling input and output tiling for now
-            # replacements["data_in_shape"].append(list(in_cube.dims).copy())
-            # replacements["data_out_shape"].append(list(out_cube.dims).copy())
-            # replacements["ends"].append(new_ends)
-            # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
+            # Append replacement elements (using tuples so they can be hashed by minimizeVariableReplacement)
+            replacements["data_in_shape"].append(tuple(in_cube.dims))
+            replacements["data_out_shape"].append(tuple(out_cube.dims))
+            replacements["starts"].append(tuple(new_starts))
+            replacements["ends"].append(tuple(new_ends))
             replacements["data_in_size"].append(int(np.prod(in_cube.dims)))
 
             # Append new cubes