MatMul constraint fix

Author: diaconuccalin

Deeploy/Targets/PULPOpen/TileConstraints/MatMulTileConstraint.py

@@ -53,6 +53,18 @@ def addGeometricalConstraint(tilerModel: TilerModel, parseDict: Dict, ctxt: Netw
                                                               dimIdx = (tensorsShapeLenOutput - 1))
 
         # ===== ADD CONSTRAINTS =====
+        #   Add batch constraints
+        if (bufferA.shape[:-2] == bufferB.shape[:-2]):
+            for idx in range(tensorsShapeLenA - 2):
+                tilerModel.addConstraint(
+                    tilerModel.getTensorDimVar(tensorName = outputBuffer.name, dimIdx = tensorsShapeLenOutput - 3 - idx)
+                    == tilerModel.getTensorDimVar(tensorName = bufferA.name, dimIdx = tensorsShapeLenA - 3 - idx))
+
+            for idx in range(tensorsShapeLenB - 2):
+                tilerModel.addConstraint(
+                    tilerModel.getTensorDimVar(tensorName = outputBuffer.name, dimIdx = tensorsShapeLenOutput - 3 - idx)
+                    == tilerModel.getTensorDimVar(tensorName = bufferB.name, dimIdx = tensorsShapeLenB - 3 - idx))
+
         #   Add GEMM geometrical constraints
         tilerModel.addConstraint(outputMatrixFirstDimVar == AMatrixFirstDimVar)
         tilerModel.addConstraint(outputMatrixSecondDimVar == BMatrixSecondDimVar)

Deeploy/Targets/PULPOpen/TileConstraints/ReduceMeanConstraint.py

@@ -62,13 +62,11 @@ def addGeometricalConstraint(tilerModel: TilerModel, parseDict: Dict, ctxt: Netw
 
     @staticmethod
     def addPolicyConstraint(tilerModel: TilerModel, parseDict: Dict, ctxt: NetworkContext) -> TilerModel:
-        # TODO
         return tilerModel
 
     @staticmethod
     def constructSymbolicNodeRep(tilerModel: TilerModel, parseDict: Dict,
                                  ctxt: NetworkContext) -> Dict[str, Union[int, IntVar]]:
-        # TODO
         symbolicParseDict = parseDict.copy()
 
         return symbolicParseDict

Deeploy/Targets/PULPOpen/TileConstraints/SliceConstraint.py

@@ -59,13 +59,11 @@ def addGeometricalConstraint(tilerModel: TilerModel, parseDict: Dict, ctxt: Netw
 
     @staticmethod
     def addPolicyConstraint(tilerModel: TilerModel, parseDict: Dict, ctxt: NetworkContext) -> TilerModel:
-        # TODO
         return tilerModel
 
     @staticmethod
     def constructSymbolicNodeRep(tilerModel: TilerModel, parseDict: Dict,
                                  ctxt: NetworkContext) -> Dict[str, Union[int, IntVar]]:
-        # TODO
         symbolicParseDict = parseDict.copy()
 
         return symbolicParseDict