Skip to content

[MINOR] Refine internal sparse printing #1893

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Baunsgaard merged 1 commit into from
Sep 6, 2023
Merged

[MINOR] Refine internal sparse printing #1893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/org/apache/sysds/runtime/data/SparseBlockCSR.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -888,14 +888,14 @@ public String toString() {
final int pos = pos(i);
final int len = size(i);
if(pos < pos + len) {
sb.append(String.format("row %0"+rowDigits+"d -- ", i));
sb.append(String.format("%0"+rowDigits+"d ", i));
for(int j = pos; j < pos + len; j++) {
if(_values[j] == (long) _values[j])
sb.append(String.format("%"+rowDigits+"d:%d", _indexes[j], (long)_values[j]));
else
sb.append(String.format("%"+rowDigits+"d:%s", _indexes[j], Double.toString(_values[j])));
if(j + 1 < pos + len)
sb.append(", ");
sb.append(" ");
}
sb.append("\n");
}
Expand Down
8 changes: 6 additions & 2 deletions src/main/java/org/apache/sysds/runtime/data/SparseBlockMCSR.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,13 @@ public SparseBlockMCSR(SparseRow[] rows, boolean deep) {
}
}

public SparseBlockMCSR(int rlen, int clen) {
public SparseBlockMCSR(int rlen){
_rows = new SparseRow[rlen];
}

public SparseBlockMCSR(int rlen, int clen) {
this(rlen);
}

/**
* Get the estimated in-memory size of the sparse block in MCSR
Expand Down Expand Up @@ -436,7 +440,7 @@ public String toString() {
for( int i=0; i<nRow; i++ ) {
if(isEmpty(i))
continue;
sb.append(String.format("row %0"+rowDigits+"d -- %s\n", i, _rows[i].toString()));
sb.append(String.format("%0"+rowDigits+"d %s\n", i, _rows[i].toString()));
}

return sb.toString();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/apache/sysds/runtime/data/SparseRow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ public String toString() {
else
sb.append(String.format("%"+rowDigits+"d:%s", indexes[i], Double.toString(values[i])));
if(i + 1 < s)
sb.append(", ");
sb.append(" ");
}

return sb.toString();
Expand Down