Skip to content

Commit

Permalink
Fix sparseMatToPdarray test failures for distributed arrays (#3804)
Browse files Browse the repository at this point in the history
* move makeSparseArray to SymArrayDmap module. Use Arkouda's global controls for whether domains are distributed. Use same makeSparseArray routine in SparseSymArray and randSparseMatrix helper proc

Signed-off-by: Jeremiah Corrado <jeremiah.corrado@hpe.com>

* fill sparse matrices in global row-major or column-major order,  instead of 1 locale at a time

Signed-off-by: Jeremiah Corrado <jeremiah.corrado@hpe.com>

* debugging sparseMatToPdarray

Signed-off-by: Jeremiah Corrado <jeremiah.corrado@hpe.com>

* fix ordering bug in flattened-scan helper procs

Signed-off-by: Jeremiah Corrado <jeremiah.corrado@hpe.com>

* sparseMatToPdarrayCSR behaving correctly in distributed setting

Signed-off-by: Jeremiah Corrado <jeremiah.corrado@hpe.com>

* fix non-dist compiler errors and re-implement sparseMatToPdarrayCSC

Signed-off-by: Jeremiah Corrado <jeremiah.corrado@hpe.com>

* fix indexing bug in colMajorExScan

Signed-off-by: Jeremiah Corrado <jeremiah.corrado@hpe.com>

* re-add a few TODO's about improving performance using lower-level accesses to CSR/CSC data structures

Signed-off-by: Jeremiah Corrado <jeremiah.corrado@hpe.com>

* use CSR/CSC 'startIdx' array to compute number of non-zeros in each row/column. Use 'rows/colsAndVals' iterators to avoid use of 'contains' query when populating 1D arrays

Signed-off-by: Jeremiah Corrado <jeremiah.corrado@hpe.com>

* add 'getLocalSubarray' queries to fix multi-locale build errors

Signed-off-by: Jeremiah Corrado <jeremiah.corrado@hpe.com>

---------

Signed-off-by: Jeremiah Corrado <jeremiah.corrado@hpe.com>
  • Loading branch information
jeremiah-corrado authored Oct 9, 2024
1 parent 5af79f8 commit 7c0599a
Show file tree
Hide file tree
Showing 4 changed files with 297 additions and 314 deletions.
7 changes: 0 additions & 7 deletions src/MultiTypeSymEntry.chpl
Original file line number Diff line number Diff line change
Expand Up @@ -727,13 +727,6 @@ module MultiTypeSymEntry
return new shared SparseSymEntry(a, size, matLayout, eltType);
}

proc makeSparseArray(size, type eltType, param matLayout) {
const dom = {1..size, 1..size};
var spsDom: sparse subdomain(dom) dmapped new dmap(new CS(compressRows=(matLayout==layout.CSR)));
var A: [spsDom] eltType;
return A;
}


class GeneratorSymEntry:AbstractSymEntry {
type etype;
Expand Down
Loading

0 comments on commit 7c0599a

Please sign in to comment.