You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by mb...@apache.org on 2016/09/29 21:30:50 UTC

incubator-systemml git commit: [SYSTEMML-964] Revert of data output stream handling for frames

Repository: incubator-systemml
Updated Branches:
  refs/heads/master 91118def5 -> 2e5600f38


[SYSTEMML-964] Revert of data output stream handling for frames

Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/2e5600f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/2e5600f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/2e5600f3

Branch: refs/heads/master
Commit: 2e5600f38faa8a14f8b4ec1e6dc00d86b30455d7
Parents: 91118de
Author: Matthias Boehm <mb...@us.ibm.com>
Authored: Thu Sep 29 14:13:36 2016 -0700
Committer: Matthias Boehm <mb...@us.ibm.com>
Committed: Thu Sep 29 14:13:36 2016 -0700

----------------------------------------------------------------------
 .../sysml/runtime/instructions/spark/data/PartitionedBlock.java  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/2e5600f3/src/main/java/org/apache/sysml/runtime/instructions/spark/data/PartitionedBlock.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/instructions/spark/data/PartitionedBlock.java b/src/main/java/org/apache/sysml/runtime/instructions/spark/data/PartitionedBlock.java
index b18f32a..4982d14 100644
--- a/src/main/java/org/apache/sysml/runtime/instructions/spark/data/PartitionedBlock.java
+++ b/src/main/java/org/apache/sysml/runtime/instructions/spark/data/PartitionedBlock.java
@@ -325,9 +325,7 @@ public class PartitionedBlock<T extends CacheBlock> implements Externalizable
 	public void writeExternal(ObjectOutput os) 
 		throws IOException
 	{
-		if( os instanceof ObjectOutputStream 
-				&& CacheBlockFactory.getCode(_partBlocks[0]) == 0) {// Apply only for MatrixBlock at this point as a temporary workaround
-																	// We will generalize this code by adding UTF functionality to support Frame 
+		if( os instanceof ObjectOutputStream ) {
 			//fast serialize of dense/sparse blocks
 			ObjectOutputStream oos = (ObjectOutputStream)os;
 			FastBufferedDataOutputStream fos = new FastBufferedDataOutputStream(oos);