Repository: incubator-systemml Updated Branches: refs/heads/master 783b14c93 -> 3e048be8c
[HOTFIX][SYSTEMML-556] Fix output info handling of external formats Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/3e048be8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/3e048be8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/3e048be8 Branch: refs/heads/master Commit: 3e048be8c557890e5972acdbf61451d1c0a66b6b Parents: 783b14c Author: Matthias Boehm <[email protected]> Authored: Sat Jun 25 15:39:11 2016 -0700 Committer: Matthias Boehm <[email protected]> Committed: Sat Jun 25 15:39:44 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/sysml/runtime/matrix/data/OutputInfo.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/3e048be8/src/main/java/org/apache/sysml/runtime/matrix/data/OutputInfo.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/sysml/runtime/matrix/data/OutputInfo.java b/src/main/java/org/apache/sysml/runtime/matrix/data/OutputInfo.java index 3efbee3..3e3db29 100644 --- a/src/main/java/org/apache/sysml/runtime/matrix/data/OutputInfo.java +++ b/src/main/java/org/apache/sysml/runtime/matrix/data/OutputInfo.java @@ -145,10 +145,8 @@ public class OutputInfo implements Serializable * * @param oinfo * @return - * @throws DMLRuntimeException */ public static String outputInfoToStringExternal(OutputInfo oinfo) - throws DMLRuntimeException { if( oinfo == OutputInfo.TextCellOutputInfo ) return DataExpression.FORMAT_TYPE_VALUE_TEXT; @@ -156,10 +154,11 @@ public class OutputInfo implements Serializable return DataExpression.FORMAT_TYPE_VALUE_MATRIXMARKET; else if( oinfo == OutputInfo.CSVOutputInfo ) return DataExpression.FORMAT_TYPE_VALUE_CSV; - else if( oinfo == OutputInfo.BinaryBlockOutputInfo ) + else if( oinfo == OutputInfo.BinaryBlockOutputInfo + || oinfo == OutputInfo.BinaryCellOutputInfo ) return DataExpression.FORMAT_TYPE_VALUE_BINARY; else - throw new DMLRuntimeException("Unrecognized outputInfo: " + oinfo); + return "specialized"; } @Override
