Skip to content

Resolve internal issue #557: bugs in eWiseApply #105

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
anyzelman merged 9 commits into from
Oct 21, 2022
Merged

Resolve internal issue #557: bugs in eWiseApply #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e64a1f9
Move some dispatches earlier in each eWiseApply function. Add checks …
anyzelman Oct 19, 2022
92d22a3
Minor code fixes and one assert to masked_apply_generic to harden the…
anyzelman Oct 19, 2022
b4fed98
Bugfix: dense descriptor no longer applies to output in masked_apply_…
anyzelman Oct 19, 2022
c3fda7f
BSP1D backend did not handle dense descriptor properly
anyzelman Oct 19, 2022
bfdbb22
Minor code style change and make it easier to trace bugs (by adding a…
anyzelman Oct 19, 2022
e98ebe2
Subissue #3 in issue #557
anyzelman Oct 19, 2022
886f045
This should resolve subissue 4 of issue #557
anyzelman Oct 19, 2022
fb852b1
Check for trivial dispatch before dispatching based on IDs
anyzelman Oct 19, 2022
de6f927
Code review: found two issues, herewith fixed
anyzelman Oct 21, 2022
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
29 changes: 19 additions & 10 deletions include/graphblas/bsp1d/blas1.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1477,7 +1477,9 @@ namespace grb {

// check if can delegate to dense variant
const size_t n = size( z );
if( (descr & descriptors::dense) || nnz( x ) == n ) {
if( (descr & descriptors::dense) || (
nnz( x ) == n && nnz( z ) == n
) ) {
return eWiseApply< descr | descriptors::dense >(
z, x, beta, monoid.getOperator(), phase
);
Expand All @@ -1488,7 +1490,7 @@ namespace grb {
return MISMATCH;
}
if( descr & descriptors::dense ) {
if( nnz( x ) < n ) {
if( nnz( x ) < n || nnz( z ) < n ) {
return ILLEGAL;
}
}
Expand Down Expand Up @@ -1566,7 +1568,9 @@ namespace grb {

// check if can delegate to dense variant
const size_t n = size( z );
if( (descr & descriptors::dense) || nnz( y ) == n ) {
if( (descr & descriptors::dense) || (
nnz( y ) == n && nnz( z ) == n
) ) {
return eWiseApply< descr | descriptors::dense >(
z, alpha, y, monoid.getOperator(), phase
);
Expand All @@ -1577,7 +1581,7 @@ namespace grb {
return MISMATCH;
}
if( descr & descriptors::dense ) {
if( nnz( y ) < n ) {
if( nnz( y ) < n || nnz( z ) < n ) {
return ILLEGAL;
}
}
Expand Down Expand Up @@ -1657,7 +1661,9 @@ namespace grb {

// check if we can delegate to dense variant
const size_t n = size( z );
if( (descr & descriptors::dense) || (nnz( x ) == n && nnz( y ) == n) ) {
if( (descr & descriptors::dense) || (
nnz( x ) == n && nnz( y ) == n && nnz( z ) == n
) ) {
return eWiseApply< descr | descriptors::dense >(
z, x, y, monoid.getOperator(), phase
);
Expand Down Expand Up @@ -1773,7 +1779,7 @@ namespace grb {
return MISMATCH;
}
if( descr & descriptors::dense ) {
if( nnz( y ) < n || nnz( mask ) < n ) {
if( nnz( y ) < n || nnz( mask ) < n || nnz( z ) < n ) {
return ILLEGAL;
}
}
Expand Down Expand Up @@ -1879,6 +1885,9 @@ namespace grb {
if( nnz( x ) < n ) {
return ILLEGAL;
}
if( nnz ( z ) < n ) {
return ILLEGAL;
}
}

// handle trivial resize phase
Expand Down Expand Up @@ -1979,7 +1988,7 @@ namespace grb {
return MISMATCH;
}
if( descr & descriptors::dense ) {
if( nnz( x ) < n || nnz( y ) < n ) {
if( nnz( x ) < n || nnz( y ) < n || nnz( z ) < n ) {
return ILLEGAL;
}
if( nnz( mask ) < n ) {
Expand Down Expand Up @@ -2499,7 +2508,7 @@ namespace grb {
return MISMATCH;
}
if( descr & descriptors::dense ) {
if( nnz( x ) < n || nnz( y ) < n ) {
if( nnz( x ) < n || nnz( y ) < n || nnz( z ) < n ) {
return ILLEGAL;
}
}
Expand Down Expand Up @@ -2563,7 +2572,7 @@ namespace grb {
return MISMATCH;
}
if( descr & descriptors::dense ) {
if( nnz( y ) < n ) {
if( nnz( y ) < n || nnz( z ) < n ) {
return ILLEGAL;
}
}
Expand Down Expand Up @@ -2624,7 +2633,7 @@ namespace grb {
return MISMATCH;
}
if( descr & descriptors::dense ) {
if( nnz( x ) < n ) {
if( nnz( x ) < n || nnz( z ) < n ) {
return ILLEGAL;
}
}
Expand Down
Loading