[SYSTEMDS-3172] Cleanup new MCSC sparse block, new tests

Closes #2049.
apache · Jul 14, 2024 · e6eebb9 · e6eebb9
1 parent f81b76d
commit e6eebb9
Show file tree

Hide file tree

Showing 16 changed files with 776 additions and 459 deletions.
diff --git a/src/main/java/org/apache/sysds/runtime/data/SparseBlockCOO.java b/src/main/java/org/apache/sysds/runtime/data/SparseBlockCOO.java
@@ -312,15 +312,15 @@ public int size(int r) {
 	public long size(int rl, int ru) {
 		return pos(ru) - pos(rl);
 	}
-	
+
 	@Override
 	public long size(int rl, int ru, int cl, int cu) {
 		long nnz = 0;
-		for(int i=rl; i<ru; i++)
-			if( !isEmpty(i) ) {
+		for(int i = rl; i < ru; i++)
+			if(!isEmpty(i)) {
 				int start = internPosFIndexGTE(i, cl);
-				int end = internPosFIndexGTE(i, cu);
-				nnz += (start!=-1) ? (end-start) : 0;
+				int end = internPosFIndexLTE(i, cu - 1);
+				nnz += (start != -1 && end != -1) ? (end - start + 1) : 0;
 			}
 		return nnz;
 	}

diff --git a/src/main/java/org/apache/sysds/runtime/data/SparseBlockCSR.java b/src/main/java/org/apache/sysds/runtime/data/SparseBlockCSR.java
@@ -437,11 +437,11 @@ public long size(int rl, int ru) {
 	@Override
 	public long size(int rl, int ru, int cl, int cu) {
 		long nnz = 0;
-		for(int i=rl; i<ru; i++)
-			if( !isEmpty(i) ) {
+		for(int i = rl; i < ru; i++)
+			if(!isEmpty(i)) {
 				int start = internPosFIndexGTE(i, cl);
-				int end = internPosFIndexGTE(i, cu);
-				nnz += (start!=-1) ? (end-start) : 0;
+				int end = internPosFIndexLTE(i, cu - 1);
+				nnz += (start != -1 && end != -1) ? (end - start + 1) : 0;
 			}
 		return nnz;
 	}

diff --git a/src/main/java/org/apache/sysds/runtime/data/SparseBlockFactory.java b/src/main/java/org/apache/sysds/runtime/data/SparseBlockFactory.java
@@ -48,7 +48,12 @@ public static SparseBlock createSparseBlock(SparseBlock.Type type, SparseRow row
 		return ret;
 	}
 
-	public static SparseBlock copySparseBlock( SparseBlock.Type type, SparseBlock sblock, boolean forceCopy )
+	public static SparseBlock copySparseBlock(SparseBlock.Type type, SparseBlock sblock, boolean forceCopy) {
+		//Call this method in case 'type' is row format
+		return copySparseBlock(type, sblock, forceCopy, 1000); // Default clen value
+	}
+
+	public static SparseBlock copySparseBlock( SparseBlock.Type type, SparseBlock sblock, boolean forceCopy , int clen)
 	{
 		//sanity check for empty inputs
 		if( sblock == null )
@@ -65,7 +70,7 @@ public static SparseBlock copySparseBlock( SparseBlock.Type type, SparseBlock sb
 			case CSR: return new SparseBlockCSR(sblock);
 			case COO: return new SparseBlockCOO(sblock);
 			case DCSR: return new SparseBlockDCSR(sblock);
-			case MCSC: return new SparseBlockMCSC(sblock);
+			case MCSC: return new SparseBlockMCSC(sblock, clen);
 			default:
 				throw new RuntimeException("Unexpected sparse block type: "+type.toString());
 		}