Remove duplicate code in the PULPOpen reshape template

Author: diaconuccalin

Deeploy/Targets/Generic/Templates/ReshapeTemplate.py

@@ -7,7 +7,7 @@
 from Deeploy.DeeployTypes import NetworkContext, NodeTemplate, OperatorRepresentation, VariableBuffer
 
 
-class _ReshapeTemplate(NodeTemplate):
+class _GenericReshapeTemplate(NodeTemplate):
 
     def __init__(self, templateStr):
         super().__init__(templateStr)
@@ -25,8 +25,10 @@ def alignToContext(self, ctxt: NetworkContext,
             ctxt.globalObjects[operatorRepresentation["shape"]]._deploy = False
             ctxt.globalObjects[operatorRepresentation["shape"]]._live = False
 
+        # Get buffers
         bufferIn = ctxt.lookup(operatorRepresentation['data_in'])
         assert isinstance(bufferIn, VariableBuffer)
+
         bufferOut = ctxt.lookup(operatorRepresentation['data_out'])
         assert isinstance(bufferOut, VariableBuffer)
 
@@ -37,7 +39,7 @@ def alignToContext(self, ctxt: NetworkContext,
         return ctxt, operatorRepresentation, []
 
 
-referenceTemplate = _ReshapeTemplate("""
+referenceTemplate = _GenericReshapeTemplate("""
 // Reshape (Name: ${nodeName}, Op: ${nodeOp})
 SINGLE_CORE ${data_out} = ${data_in};
 """)

Deeploy/Targets/PULPOpen/Templates/ReshapeTemplate.py

@@ -25,26 +25,19 @@
 
 from typing import Dict, List, Tuple
 
-from Deeploy.DeeployTypes import NetworkContext, NodeTemplate, OperatorRepresentation, VariableBuffer
+from Deeploy.DeeployTypes import NetworkContext, OperatorRepresentation, VariableBuffer
+from Deeploy.Targets.Generic.Templates.ReshapeTemplate import _GenericReshapeTemplate
 
 
-class _ReshapeTemplate(NodeTemplate):
+class _ReshapeTemplate(_GenericReshapeTemplate):
 
     def __init__(self, templateStr):
         super().__init__(templateStr)
 
     def alignToContext(self, ctxt: NetworkContext,
                        operatorRepresentation: OperatorRepresentation) -> Tuple[NetworkContext, Dict, List[str]]:
 
-        # SCHEREMO: Selectively mark 'indices' dead, since we don't need them
-        if 'indices' in operatorRepresentation.keys():
-            ctxt.globalObjects[operatorRepresentation['indices']]._deploy = False
-            ctxt.globalObjects[operatorRepresentation['indices']]._live = False
-
-        # Same for "shape"
-        if "shape" in operatorRepresentation.keys():
-            ctxt.globalObjects[operatorRepresentation["shape"]]._deploy = False
-            ctxt.globalObjects[operatorRepresentation["shape"]]._live = False
+        ctxt, operatorRepresentation, _ = super().alignToContext(ctxt, operatorRepresentation)
 
         # Get buffers
         bufferIn = ctxt.lookup(operatorRepresentation['data_in'])
@@ -53,10 +46,6 @@ def alignToContext(self, ctxt: NetworkContext,
         bufferOut = ctxt.lookup(operatorRepresentation['data_out'])
         assert isinstance(bufferOut, VariableBuffer)
 
-        # Link aliases to each buffer
-        bufferIn.aliases.add(bufferOut.name)
-        bufferOut.aliases.add(bufferIn.name)
-
         # Linking required for tiling
         bufferOut._alias = bufferIn.name