[skip ci] revert append in BWARE commit

Author: Baunsgaard

src/main/java/org/apache/sysds/runtime/matrix/data/MatrixBlock.java

@@ -3748,90 +3748,80 @@ public MatrixBlock append(MatrixBlock[] that, MatrixBlock result, boolean cbind)
 		else
 			result.reset(m, n, sp, nnz);
 
-		if( !result.sparse && nnz!=0 ) 
-			return appendDense(that, result, cbind, nnz, shallowCopy, m, n);
-		else if(nnz != 0) 
-			return appendSparse(that, result, cbind, nnz, shallowCopy);
-		
-		
-		//update meta data
-		result.nonZeros = nnz;
-		return result;
-	}
-
-	private MatrixBlock appendDense(MatrixBlock[] that, MatrixBlock result, boolean cbind, long nnz, boolean shallowCopy,
-		int m, int n) {
-		if(cbind) {
-			DenseBlock resd = result.allocateBlock().getDenseBlock();
-			MatrixBlock[] in = ArrayUtils.addAll(new MatrixBlock[] {this}, that);
-
-			for(int i = 0; i < m; i++) {
-				for(int k = 0, off = 0; k < in.length; off += in[k].clen, k++) {
-					if(in[k].isEmptyBlock(false))
-						continue;
-					if(in[k].sparse) {
-						SparseBlock src = in[k].sparseBlock;
-						if(src.isEmpty(i))
+		//core append operation
+		//copy left and right input into output
+		if( !result.sparse && nnz!=0 ) //DENSE
+		{
+			if( cbind ) {
+				DenseBlock resd = result.allocateBlock().getDenseBlock();
+				MatrixBlock[] in = ArrayUtils.addAll(new MatrixBlock[]{this}, that);
+				
+				for( int i=0; i<m; i++ ) {
+					for( int k=0, off=0; k<in.length; off+=in[k].clen, k++ ) {
+						if( in[k].isEmptyBlock(false) )
 							continue;
-						int srcpos = src.pos(i);
-						int srclen = src.size(i);
-						int[] srcix = src.indexes(i);
-						double[] srcval = src.values(i);
-						double[] resval = resd.values(i);
-						int resix = resd.pos(i, off);
-						for(int j = srcpos; j < srcpos + srclen; j++)
-							resval[resix + srcix[j]] = srcval[j];
-					}
-					else {
-						DenseBlock src = in[k].getDenseBlock();
-						double[] srcval = src.values(i);
-						double[] resval = resd.values(i);
-						System.arraycopy(srcval, src.pos(i), resval, resd.pos(i, off), in[k].clen);
+						if( in[k].sparse ) {
+							SparseBlock src = in[k].sparseBlock;
+							if( src.isEmpty(i) )
+								continue;
+							int srcpos = src.pos(i);
+							int srclen = src.size(i);
+							int[] srcix = src.indexes(i);
+							double[] srcval = src.values(i);
+							double[] resval = resd.values(i);
+							int resix = resd.pos(i, off);
+							for (int j=srcpos; j<srcpos+srclen; j++)
+								resval[resix+srcix[j]] = srcval[j];
+						}
+						else {
+							DenseBlock src = in[k].getDenseBlock();
+							double[] srcval = src.values(i);
+							double[] resval = resd.values(i);
+							System.arraycopy(srcval, src.pos(i),
+								resval, resd.pos(i, off), in[k].clen);
+						}
 					}
 				}
 			}
-		}
-		else { // rbind
-			result.copy(0, rlen - 1, 0, n - 1, this, false);
-			for(int i = 0, off = rlen; i < that.length; i++) {
-				result.copy(off, off + that[i].rlen - 1, 0, n - 1, that[i], false);
-				off += that[i].rlen;
+			else { //rbind
+				result.copy(0, rlen-1, 0, n-1, this, false);
+				for(int i=0, off=rlen; i<that.length; i++) {
+					result.copy(off, off+that[i].rlen-1, 0, n-1, that[i], false);
+					off += that[i].rlen;
+				}
 			}
 		}
-
-		result.nonZeros = nnz;
-		return result;
-	}
-
-	private MatrixBlock appendSparse(MatrixBlock[] that, MatrixBlock result, boolean cbind, long nnz,
-		boolean shallowCopy) {
-		// adjust sparse rows if required
-		result.allocateSparseRowsBlock();
-		// allocate sparse rows once for cbind
-		if(cbind && nnz > rlen && !shallowCopy && result.getSparseBlock() instanceof SparseBlockMCSR) {
-			final SparseBlock sblock = result.getSparseBlock();
-			// for each row calculate how many non zeros are pressent.
-			for(int i = 0; i < result.rlen; i++)
-				sblock.allocate(i, computeNNzRow(that, i));
-
-		}
-
-		// core append operation
-		// we can always append this directly to offset 0.0 in both cbind and rbind.
-		result.appendToSparse(this, 0, 0, !shallowCopy);
-		if(cbind) {
-			for(int i = 0, off = clen; i < that.length; i++) {
-				result.appendToSparse(that[i], 0, off);
-				off += that[i].clen;
+		//SPARSE
+		else if(nnz != 0) {
+			//adjust sparse rows if required
+			result.allocateSparseRowsBlock();
+			//allocate sparse rows once for cbind
+			if( cbind && nnz > rlen && !shallowCopy && result.getSparseBlock() instanceof SparseBlockMCSR ) {
+				final SparseBlock sblock = result.getSparseBlock();
+				// for each row calculate how many non zeros are pressent.
+				for( int i=0; i<result.rlen; i++ ) 
+					sblock.allocate(i, computeNNzRow(that, i));
+				
 			}
-		}
-		else { // rbind
-			for(int i = 0, off = rlen; i < that.length; i++) {
-				result.appendToSparse(that[i], off, 0);
-				off += that[i].rlen;
+			
+			//core append operation
+			// we can always append this directly to offset 0.0 in both cbind and rbind.
+			result.appendToSparse(this, 0, 0, !shallowCopy);
+			if( cbind ) {
+				for(int i=0, off=clen; i<that.length; i++) {
+					result.appendToSparse(that[i], 0, off);
+					off += that[i].clen;
+				}
+			}
+			else { //rbind
+				for(int i=0, off=rlen; i<that.length; i++) {
+					result.appendToSparse(that[i], off, 0);
+					off += that[i].rlen;
+				}
 			}
 		}
-
+		
+		//update meta data
 		result.nonZeros = nnz;
 		return result;
 	}