fix tiling constraints for Dense and DW

Author: marchioa

Deeploy/Targets/Neureka/TileConstraints/NeurekaDenseConstraint.py

@@ -219,9 +219,8 @@ def serializeTilingSolution(
             for absoluteCube in absoluteOutputCubes:
                 COffset, CSize = absoluteCube.absoluteOffset[-1], absoluteCube.rectangle.dims[-1]
                 # WeightCube = HyperRectangle((COffset, 0, 0), (CSize, weightShape[-2], weightShape[-1]))
-                WeightCube = HyperRectangle(
-                    (COffset, 0, 0, 0),
-                    (CSize, weightShape[-3], weightShape[-2], weightShape[-1]))
+                WeightCube = HyperRectangle((COffset, 0, 0, 0),
+                                            (CSize, weightShape[-3], weightShape[-2], weightShape[-1]))
                 replacements['weight_addr_offset'].append(calculateFlatOffsetInBytes(WeightCube, weightBuffer))
         else:
             inputWeightBaseOffsets, outputWeightBaseOffsets = cls.extractBaseAddr(tilingSolution, targetMemLevel,
@@ -231,7 +230,8 @@ def serializeTilingSolution(
 
             for cube, load in zip(outputCubes, inputLoadSchedule):
                 COffset, CSize = cube.offset[-1], cube.dims[-1]
-                load['weight'] = HyperRectangle((COffset, 0, 0), (CSize, weightShape[-2], weightShape[-1]))
+                load['weight'] = HyperRectangle((COffset, 0, 0, 0),
+                                                (CSize, weightShape[-3], weightShape[-2], weightShape[-1]))
 
         tilingSchedule = TilingSchedule(inputBaseOffsets, outputBaseOffsets, inputLoadSchedule, outputLoadSchedule)
         variableReplacementSchedule = VariableReplacementScheme(replacements, replacementTypes)

Deeploy/Targets/Neureka/TileConstraints/NeurekaDepthwiseConstraint.py

@@ -49,11 +49,7 @@ def addGeometricalConstraint(tilerModel: TilerModel, parseDict: Dict, ctxt: Netw
         tilerModel.addConstraint(outputBatchVar == inputBatchVar)
         tilerModel.addConstraint(outputChannelVar == inputChannelVar)
 
-        weightBuffer = ctxt.lookup(weightBufferName)
-        if hasattr(weightBuffer, "_memoryLevel") and weightBuffer._memoryLevel == "WeightMemory_SRAM":
-            tilerModel.addConstraint(weightOutChannelVar == weightOutChannelVar.Max())
-        else:
-            tilerModel.addConstraint(weightOutChannelVar == outputChannelVar)
+        tilerModel.addConstraint(weightOutChannelVar == weightOutChannelVar.Max())
 
         tilerModel.addConstraint(inputHeightVar >= 3)
         tilerModel.addConstraint(inputWidthVar >= 3)
@@ -214,10 +210,8 @@ def serializeTilingSolution(
             replacementTypes['weight_addr_offset'] = PointerClass(uint32_t)
             for absoluteCube in absoluteOutputCubes:
                 COffset, CSize = absoluteCube.absoluteOffset[-1], absoluteCube.rectangle.dims[-1]
-                # WeightCube = HyperRectangle((COffset, 0, 0), (CSize, weightShape[-2], weightShape[-1]))
-                WeightCube = HyperRectangle(
-                    (COffset, 0, 0, 0),
-                    (CSize, weightShape[-3], weightShape[-2], weightShape[-1]))
+                WeightCube = HyperRectangle((COffset, 0, 0, 0),
+                                            (CSize, weightShape[-3], weightShape[-2], weightShape[-1]))
                 replacements['weight_addr_offset'].append(calculateFlatOffsetInBytes(WeightCube, weightBuffer))
         else:
             inputWeightBaseOffsets, outputWeightBaseOffsets = cls.extractBaseAddr(tilingSolution, targetMemLevel,
@@ -226,8 +220,7 @@ def serializeTilingSolution(
             outputBaseOffsets.update(outputWeightBaseOffsets)
 
             for cube, load in zip(outputCubes, inputLoadSchedule):
-                COffset, CSize = cube.offset[-1], cube.dims[-1]
-                load['weight'] = HyperRectangle((COffset, 0, 0), (CSize, weightShape[-2], weightShape[-1]))
+                load['weight'] = HyperRectangle((0,) * len(weightShape), tuple(weightShape))
 
         tilingSchedule = TilingSchedule(inputBaseOffsets, outputBaseOffsets, inputLoadSchedule, outputLoadSchedule)
         variableReplacementSchedule = VariableReplacementScheme(replacements, replacementTypes)