Looks like it is a bad idea to rotate the mask.

Author: gsvgit

cfpq_matrix/block/block_matrix.py

@@ -33,10 +33,6 @@ def __init__(self, base: OptimizedMatrix, block_matrix_space: BlockMatrixSpace):
         super().__init__(base, block_matrix_space)
 
     def mxm(self, other: Matrix, op: Semiring, mask: Matrix, swap_operands: bool = False) -> Matrix:
-        print ("Self shape")
-        print (self.shape)
-        print ("Other shape")
-        print (other.shape)
         if self.block_matrix_space.is_single_cell(other.shape):
             return self.base.mxm(other, op, mask, swap_operands=swap_operands)        
         return self.base.mxm(            
@@ -98,11 +94,12 @@ def mxm(self, other: Matrix, op: Semiring, mask:Matrix, swap_operands: bool = Fa
                 if swap_operands
                 else BlockMatrixOrientation.VERTICAL
             ).mxm(other, op, None, swap_operands=swap_operands)
-        mask = (self.block_matrix_space.hyper_rotate(
-                mask,
-                BlockMatrixOrientation.VERTICAL
-                if swap_operands
-                else BlockMatrixOrientation.HORIZONTAL)) if not mask is None  else mask
+        mask = None
+        #(self.block_matrix_space.hyper_rotate(
+        #        mask,
+        #        BlockMatrixOrientation.VERTICAL
+        #        if swap_operands
+        #        else BlockMatrixOrientation.HORIZONTAL)) if not mask is None  else mask
         return self._force_init_orientation(
             BlockMatrixOrientation.VERTICAL
             if swap_operands

cfpq_matrix/matrix_to_optimized_adapter.py

@@ -39,14 +39,14 @@ def to_unoptimized(self) -> Matrix:
     def mxm(self, other: Matrix, op: Semiring, mask: Matrix, swap_operands: bool = False) -> Matrix:
         if swap_operands:
             if not mask is None:
-                print("Mask applied, swap operands.")
+                print("Mask applied, swap operands.\n-------\n")
                 result = Matrix(self.dtype,nrows=other.shape[0],ncols=self.shape[1])
                 result(~mask.S) << other.mxm(self.base, op).new(self.dtype)
                 return result
             else: return other.mxm(self.base, op).new(self.dtype)
         else:
             if not mask is None:
-                print("Mask applied.")
+                print("Mask applied.\n-------\n")
                 result = Matrix(self.dtype,nrows=self.shape[0],ncols=other.shape[1])
                 result(~mask.S) << self.base.mxm(other, op).new(self.dtype)
                 return result

cfpq_model/label_decomposed_graph.py

@@ -262,11 +262,6 @@ def mxm(
             if swap_operands:
                 rhs1, rhs2 = rhs2, rhs1
             if rhs1 in self.matrices and rhs2 in other.matrices:
-
-                if lhs in accum.matrices:
-                    print("Mask shape")
-                    print(accum.matrices[lhs].shape)                
-
                 matrix_for_mask = max(((accum.matrices[lhs]
                                            if lhs in accum.matrices
                                            else None),
@@ -278,6 +273,12 @@ def mxm(
                                            else None)), key = lambda m: m.nvals if not m is None else -1)
                 mask = matrix_for_mask if isinstance(matrix_for_mask, Matrix) or matrix_for_mask is None else matrix_for_mask.to_mask()
 
+                if not mask is None:
+                    print("Mask shape:")
+                    print(mask.shape)
+                    print ("Mask nnz:")
+                    print(mask.nvals)
+
                 mxm = self.matrices[rhs1].mxm(
                     other.matrices[rhs2],
                     swap_operands=swap_operands,