You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by de...@apache.org on 2016/09/10 18:03:07 UTC
incubator-systemml git commit: [SYSTEMML-902] Move toString to
CacheableData
Repository: incubator-systemml
Updated Branches:
refs/heads/master b3d193241 -> 4d5fc9d16
[SYSTEMML-902] Move toString to CacheableData
Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/4d5fc9d1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/4d5fc9d1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/4d5fc9d1
Branch: refs/heads/master
Commit: 4d5fc9d16f73984f1ab11ad069fff029cd37b23e
Parents: b3d1932
Author: Deron Eriksson <de...@us.ibm.com>
Authored: Sat Sep 10 11:01:12 2016 -0700
Committer: Deron Eriksson <de...@us.ibm.com>
Committed: Sat Sep 10 11:01:12 2016 -0700
----------------------------------------------------------------------
.../controlprogram/caching/CacheableData.java | 35 ++++++++++++++++
.../controlprogram/caching/FrameObject.java | 31 ---------------
.../controlprogram/caching/MatrixObject.java | 42 --------------------
3 files changed, 35 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/4d5fc9d1/src/main/java/org/apache/sysml/runtime/controlprogram/caching/CacheableData.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/controlprogram/caching/CacheableData.java b/src/main/java/org/apache/sysml/runtime/controlprogram/caching/CacheableData.java
index bf22fa3..9a136cd 100644
--- a/src/main/java/org/apache/sysml/runtime/controlprogram/caching/CacheableData.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/caching/CacheableData.java
@@ -44,6 +44,7 @@ import org.apache.sysml.runtime.matrix.MatrixFormatMetaData;
import org.apache.sysml.runtime.matrix.MetaData;
import org.apache.sysml.runtime.matrix.data.FileFormatProperties;
import org.apache.sysml.runtime.matrix.data.InputInfo;
+import org.apache.sysml.runtime.matrix.data.NumItemsByEachReducerMetaData;
import org.apache.sysml.runtime.matrix.data.OutputInfo;
import org.apache.sysml.runtime.util.LocalFileUtils;
import org.apache.sysml.runtime.util.MapReduceTool;
@@ -1469,4 +1470,38 @@ public abstract class CacheableData<T extends CacheBlock> extends Data
return ret;
}
+ public String toString() {
+ StringBuilder str = new StringBuilder();
+ str.append(getClass().getSimpleName());
+ str.append(": ");
+ str.append(_hdfsFileName + ", ");
+
+ if (_metaData instanceof NumItemsByEachReducerMetaData) {
+ str.append("NumItemsByEachReducerMetaData");
+ } else {
+ try {
+ MatrixFormatMetaData md = (MatrixFormatMetaData) _metaData;
+ if (md != null) {
+ MatrixCharacteristics mc = ((MatrixDimensionsMetaData) _metaData).getMatrixCharacteristics();
+ str.append(mc.toString());
+
+ InputInfo ii = md.getInputInfo();
+ if (ii == null)
+ str.append("null");
+ else {
+ str.append(", ");
+ str.append(InputInfo.inputInfoToString(ii));
+ }
+ } else {
+ str.append("null, null");
+ }
+ } catch (Exception ex) {
+ LOG.error(ex);
+ }
+ }
+ str.append(", ");
+ str.append(isDirty() ? "dirty" : "not-dirty");
+
+ return str.toString();
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/4d5fc9d1/src/main/java/org/apache/sysml/runtime/controlprogram/caching/FrameObject.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/controlprogram/caching/FrameObject.java b/src/main/java/org/apache/sysml/runtime/controlprogram/caching/FrameObject.java
index bd4eb65..e3d2332 100644
--- a/src/main/java/org/apache/sysml/runtime/controlprogram/caching/FrameObject.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/caching/FrameObject.java
@@ -243,35 +243,4 @@ public class FrameObject extends CacheableData<FrameBlock>
SparkExecutionContext.writeFrameRDDtoHDFS(rdd, fname, oinfo);
}
- @Override
- public String toString() {
- StringBuilder str = new StringBuilder();
- str.append("Frame: ");
- str.append(_hdfsFileName + ", ");
-
- try {
- MatrixFormatMetaData md = (MatrixFormatMetaData) _metaData;
- if (md != null) {
- MatrixCharacteristics mc = ((MatrixDimensionsMetaData) _metaData).getMatrixCharacteristics();
- str.append(mc.toString());
-
- InputInfo ii = md.getInputInfo();
- if (ii == null)
- str.append("null");
- else {
- str.append(", ");
- str.append(InputInfo.inputInfoToString(ii));
- }
- } else {
- str.append("null, null");
- }
- } catch (Exception ex) {
- LOG.error(ex);
- }
- str.append(", ");
- str.append(isDirty() ? "dirty" : "not-dirty");
-
- return str.toString();
- }
-
}
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/4d5fc9d1/src/main/java/org/apache/sysml/runtime/controlprogram/caching/MatrixObject.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/sysml/runtime/controlprogram/caching/MatrixObject.java b/src/main/java/org/apache/sysml/runtime/controlprogram/caching/MatrixObject.java
index b18b9ee..aad660e 100644
--- a/src/main/java/org/apache/sysml/runtime/controlprogram/caching/MatrixObject.java
+++ b/src/main/java/org/apache/sysml/runtime/controlprogram/caching/MatrixObject.java
@@ -42,7 +42,6 @@ import org.apache.sysml.runtime.matrix.data.FileFormatProperties;
import org.apache.sysml.runtime.matrix.data.InputInfo;
import org.apache.sysml.runtime.matrix.data.LibMatrixDNN;
import org.apache.sysml.runtime.matrix.data.MatrixBlock;
-import org.apache.sysml.runtime.matrix.data.NumItemsByEachReducerMetaData;
import org.apache.sysml.runtime.matrix.data.OutputInfo;
import org.apache.sysml.runtime.util.DataConverter;
import org.apache.sysml.runtime.util.IndexRange;
@@ -225,47 +224,6 @@ public class MatrixObject extends CacheableData<MatrixBlock>
}
}
- public String toString()
- {
- StringBuilder str = new StringBuilder();
- str.append("Matrix: ");
- str.append(_hdfsFileName + ", ");
-
- if ( _metaData instanceof NumItemsByEachReducerMetaData ) {
- str.append("NumItemsByEachReducerMetaData");
- }
- else
- {
- try
- {
- MatrixFormatMetaData md = (MatrixFormatMetaData)_metaData;
- if ( md != null ) {
- MatrixCharacteristics mc = ((MatrixDimensionsMetaData)_metaData).getMatrixCharacteristics();
- str.append(mc.toString());
-
- InputInfo ii = md.getInputInfo();
- if ( ii == null )
- str.append("null");
- else {
- str.append(", ");
- str.append(InputInfo.inputInfoToString(ii));
- }
- }
- else {
- str.append("null, null");
- }
- }
- catch(Exception ex)
- {
- LOG.error(ex);
- }
- }
- str.append(", ");
- str.append(isDirty() ? "dirty" : "not-dirty");
-
- return str.toString();
- }
-
// *********************************************
// *** ***
// *** HIGH-LEVEL PUBLIC METHODS ***