Mask if swap_operands is True.

Author: gsvgit

cfpq_matrix/matrix_to_optimized_adapter.py

@@ -37,30 +37,24 @@ def to_unoptimized(self) -> Matrix:
         return self.base
 
     def mxm(self, other: Matrix, op: Semiring, mask: Matrix, swap_operands: bool = False) -> Matrix:
-        #   return (
-        #    other.mxm(self.base, op)
-        #    if swap_operands
-        #    else self.base.mxm(other, op)
-        #).new(self.dtype)
         if swap_operands:
             if not mask is None:
-                #print("Mask applied, swap operands") 
-                #result = Matrix(self.dtype,nrows=other.shape[0],ncols=self.shape[1])
+                #print("It would be nice to apply mask in swap operands") 
+                print("Mask applied, swap operands.")
+                result = Matrix(self.dtype,nrows=other.shape[0],ncols=self.shape[1])
                 #mask_t = Matrix(mask.dtype, ncols=mask.ncols, nrows=mask.nrows)
                 #mask_t << mask.T 
                 #result(~mask) << other.mxm(self.base, op)
-                #result(~mask) << other.mxm(self.base, op).new(self.dtype)
-                #return result
-                return other.mxm(self.base, op).new(self.dtype)
+                result(~mask) << other.mxm(self.base, op).new(self.dtype)
+                return result
+                #return other.mxm(self.base, op).new(self.dtype)
             else: return other.mxm(self.base, op).new(self.dtype)
         else:
             if not mask is None:
-                print("Mask applied")
+                print("Mask applied.")
                 result = Matrix(self.dtype,nrows=self.shape[0],ncols=other.shape[1])
-                #result(~mask) << self.base.mxm(other, op)
                 result(~mask) << self.base.mxm(other, op).new(self.dtype)
                 return result
-                #return self.base.mxm(other, op).new(self.dtype)
             else: return self.base.mxm(other, op).new(self.dtype)
 
 

cfpq_model/label_decomposed_graph.py

@@ -262,16 +262,19 @@ def mxm(
             if swap_operands:
                 rhs1, rhs2 = rhs2, rhs1
             if rhs1 in self.matrices and rhs2 in other.matrices:
-                #if lhs in self.matrices: 
-                #    print ("!!! Mask: ")
-                #    print(self.matrices[lhs])
-                #    print("-------------------")
-                #    print(self.matrices[rhs1].shape)
-                #    print(other.matrices[rhs2].shape)
+                if swap_operands:
+                    mask = (accum.matrices[lhs].to_mask() 
+                            if lhs in accum.matrices and other.matrices[rhs2].shape == self.matrices[rhs1].shape 
+                            else None)
+                else:
+                    mask = (self.matrices[lhs].to_mask() 
+                            if lhs in self.matrices and other.matrices[rhs2].shape == self.matrices[rhs1].shape 
+                            else None)
+
                 mxm = self.matrices[rhs1].mxm(
                     other.matrices[rhs2],
                     swap_operands=swap_operands,
-                    mask=(self.matrices[lhs].to_mask() if lhs in self.matrices  and other.matrices[rhs2].shape == self.matrices[rhs1].shape else None),   #Matrix(dtype=self.matrices[rhs1].dtype, nrows=self.matrices[rhs1].nrows, ncols = self.matrices[rhs2].ncols)),
+                    mask=mask,
                     op=op,
                 )
                 accum.iadd_by_symbol(lhs, mxm, op.monoid)