No masks for block matrices.

Author: gsvgit

cfpq_matrix/block/block_matrix.py

@@ -35,8 +35,6 @@ def __init__(self, base: OptimizedMatrix, block_matrix_space: BlockMatrixSpace):
     def mxm(self, other: Matrix, op: Semiring, mask:Matrix, swap_operands: bool = False) -> Matrix:
         if self.block_matrix_space.is_single_cell(other.shape):
             return self.base.mxm(other, op, mask, swap_operands=swap_operands)
-        if not mask is None:
-            mask = self.block_matrix_space.repeat_into_hyper_column(mask)
         return self.base.mxm(
             self.block_matrix_space.hyper_rotate(
                 other,
@@ -45,7 +43,7 @@ def mxm(self, other: Matrix, op: Semiring, mask:Matrix, swap_operands: bool = Fa
                 else BlockMatrixOrientation.HORIZONTAL
             ),
             op=op,
-            mask=mask,
+            mask=None,
             swap_operands=swap_operands,
         )
 
@@ -90,22 +88,20 @@ def _force_init_orientation(
         return self.matrices[desired_orientation]
 
     def mxm(self, other: Matrix, op: Semiring, mask:Matrix, swap_operands: bool = False) -> Matrix:
-        if self.block_matrix_space.is_single_cell(other.shape):
-            if not mask is None:
-                mask = self.block_matrix_space.hyper_rotate(self.block_matrix_space.repeat_into_hyper_column(mask),BlockMatrixOrientation.HORIZONTAL)
+        if self.block_matrix_space.is_single_cell(other.shape):            
             return self._force_init_orientation(
                 BlockMatrixOrientation.HORIZONTAL
                 if swap_operands
                 else BlockMatrixOrientation.VERTICAL
-            ).mxm(other, op, mask, swap_operands=swap_operands)
+            ).mxm(other, op, None, swap_operands=swap_operands)
         return self._force_init_orientation(
             BlockMatrixOrientation.VERTICAL
             if swap_operands
             else BlockMatrixOrientation.HORIZONTAL
         ).mxm(
             self.block_matrix_space.to_block_diag_matrix(other),
             op=op,
-            mask=mask,
+            mask=None,
             swap_operands=swap_operands
         )
 

cfpq_model/label_decomposed_graph.py

@@ -264,7 +264,7 @@ def mxm(
             if rhs1 in self.matrices and rhs2 in other.matrices:
                 #if swap_operands:
                 mask = (accum.matrices[lhs].to_mask() 
-                        if lhs in accum.matrices #and other.matrices[rhs2].shape == self.matrices[rhs1].shape 
+                        if lhs in accum.matrices and other.matrices[rhs2].shape == self.matrices[rhs1].shape 
                         else None)
                 #else:
                 #    mask = (self.matrices[lhs].to_mask()