Skip to content
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

Fix build error caused by #3883 #3887

Merged
merged 2 commits into from
Nov 5, 2024
Merged

Fix build error caused by #3883 #3887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9ba7d6
work around bug with csr/cscLayout blockDist initialization
jeremiah-corrado Nov 5, 2024
e9d4057
Merge branch 'master' into fix-layout-cs-build-error
jeremiah-corrado Nov 5, 2024
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
5 changes: 1 addition & 4 deletions src/SymArrayDmap.chpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,7 @@ module SymArrayDmap {
grid = {0..<locsPerDim, 0..<locsPerDim},
localeGrid = reshape(Locales[0..<grid.size], grid);

type layoutType = getSparseDomType(matLayout);
const DenseBlkDom = dom dmapped new blockDist(boundingBox=dom,
targetLocales=localeGrid,
sparseLayoutType=layoutType);
const DenseBlkDom = getDenseDom(dom, localeGrid, matLayout);

var SD: sparse subdomain(DenseBlkDom);
return (SD, DenseBlkDom);
Expand Down
8 changes: 6 additions & 2 deletions src/compat/eq-20/ArkoudaSparseMatrixCompat.chpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,17 @@ module ArkoudaSparseMatrixCompat {
use SparseBlockDist;
use LayoutCS;
import SparseMatrix.SpsMatUtil.Layout;
use BlockDist;

proc getSparseDom(param layout: Layout) {
return new dmap(new CS(compressRows=(layout==Layout.CSR)));
}

proc getSparseDomType(param layout: Layout) type {
return CS(compressRows=(layout==Layout.CSR));
proc getDenseDom(dom, localeGrid, param layout: Layout) {
type layoutType = CS(compressRows=(layout==Layout.CSR));
return dom dmapped new blockDist(boundingBox=dom,
targetLocales=localeGrid,
sparseLayoutType=layoutType);
}

proc SparseBlockDom.setLocalSubdomain(locIndices, loc: locale = here) {
Expand Down
8 changes: 6 additions & 2 deletions src/compat/eq-21/ArkoudaSparseMatrixCompat.chpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
module ArkoudaSparseMatrixCompat {
use LayoutCS;
import SparseMatrix.SpsMatUtil.Layout;
use BlockDist;

proc getSparseDom(param layout: Layout) {
return new dmap(new CS(compressRows=(layout==Layout.CSR)));
}

proc getSparseDomType(param layout: Layout) type {
return CS(compressRows=(layout==Layout.CSR));
proc getDenseDom(dom, localeGrid, param layout: Layout) {
type layoutType = CS(compressRows=(layout==Layout.CSR));
return dom dmapped new blockDist(boundingBox=dom,
targetLocales=localeGrid,
sparseLayoutType=layoutType);
}
}
8 changes: 6 additions & 2 deletions src/compat/eq-22/ArkoudaSparseMatrixCompat.chpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
module ArkoudaSparseMatrixCompat {
use LayoutCS;
import SparseMatrix.SpsMatUtil.Layout;
use BlockDist;

proc getSparseDom(param layout: Layout) {
return new dmap(new CS(compressRows=(layout==Layout.CSR)));
}

proc getSparseDomType(param layout: Layout) type {
return CS(compressRows=(layout==Layout.CSR));
proc getDenseDom(dom, localeGrid, param layout: Layout) {
type layoutType = CS(compressRows=(layout==Layout.CSR));
return dom dmapped new blockDist(boundingBox=dom,
targetLocales=localeGrid,
sparseLayoutType=layoutType);
}
}
14 changes: 12 additions & 2 deletions src/compat/ge-23/ArkoudaSparseMatrixCompat.chpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
module ArkoudaSparseMatrixCompat {
use CompressedSparseLayout;
import SparseMatrix.SpsMatUtil.Layout;
use BlockDist;

proc getSparseDom(param layout: Layout) {
select layout {
Expand All @@ -9,7 +10,16 @@ module ArkoudaSparseMatrixCompat {
}
}

proc getSparseDomType(param layout: Layout) type {
if layout == Layout.CSR then return csrLayout; else return cscLayout;
// see: https://github.com/chapel-lang/chapel/issues/26209
proc getDenseDom(dom, localeGrid, param layout: Layout) {
if layout == Layout.CSR {
return dom dmapped new blockDist(boundingBox=dom,
targetLocales=localeGrid,
sparseLayoutType=csrLayout);
} else {
return dom dmapped new blockDist(boundingBox=dom,
targetLocales=localeGrid,
sparseLayoutType=cscLayout);
}
}
}
Loading