Skip to content

Commit 7bac8a0

Browse files
bug fixes
1 parent 3bece15 commit 7bac8a0

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

src/Operations/Apply.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ function GrB_apply( # w<mask> = accum (w, op(u))
88
Mask::T, # optional mask for w, unused if NULL
99
accum::U, # optional accum for z=accum(w,t)
1010
op::GrB_UnaryOp, # operator to apply to the entries
11-
A::X, # first input: vector u
11+
A::Y, # first input: vector u
1212
desc::V # descriptor for w and mask
13-
) where {X <: Union{GrB_Vector, GrB_Matrix}, T <: Union{GrB_Vector, GrB_Matrix, GrB_NULL_Type}, U <: valid_accum_types, V <: valid_desc_types}
13+
) where {X <: Union{GrB_Vector, GrB_Matrix}, Y <: Union{GrB_Vector, GrB_Matrix}, T <: Union{GrB_Vector, GrB_Matrix, GrB_NULL_Type}, U <: valid_accum_types, V <: valid_desc_types}
1414

1515
fn_name = "GrB_" * get_struct_name(C) * "_apply"
1616

src/Operations/Element_wise_addition.jl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ then T(i, j) = A (i, j) and the "+" operator is not used. Likewise, if only B(i,
1212
but A(i, j) is not in the pattern of A, then T(i, j) = B(i, j). For a semiring, the mult operator is the
1313
semiring's add operator.
1414
"""
15-
function GrB_eWiseAdd(C::T, mask::V, accum::W, op::U, A::T, B::T,
16-
desc::X) where {T <: Union{GrB_Vector, GrB_Matrix}, U <: Union{GrB_BinaryOp, GrB_Monoid, GrB_Semiring},
17-
V <: Union{GrB_Vector, GrB_Matrix, GrB_NULL_Type}, W <: valid_accum_types, X <: valid_desc_types}
15+
function GrB_eWiseAdd(C::Z, mask::V, accum::W, op::U, A::T, B::Y,
16+
desc::X) where {T <: Union{GrB_Vector, GrB_Matrix}, Y <: Union{GrB_Vector, GrB_Matrix}, Z <: Union{GrB_Vector, GrB_Matrix},
17+
U <: Union{GrB_BinaryOp, GrB_Monoid, GrB_Semiring}, V <: Union{GrB_Vector, GrB_Matrix, GrB_NULL_Type},
18+
W <: valid_accum_types, X <: valid_desc_types}
1819

1920
T_name = get_struct_name(A)
2021
U_name = get_struct_name(op)

src/Operations/Element_wise_multiplication.jl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ are not computed. This is primary difference with `GrB_eWiseAdd`. The input matr
1010
via the descriptor. For a semiring, the mult operator is the semiring's multiply operator; this differs from the
1111
eWiseAdd methods which use the semiring's add operator instead.
1212
"""
13-
function GrB_eWiseMult(C::T, mask::V, accum::W, op::U, A::T, B::T,
14-
desc::X) where {T <: Union{GrB_Vector, GrB_Matrix}, U <: Union{GrB_BinaryOp, GrB_Monoid, GrB_Semiring},
15-
V <: Union{GrB_Vector, GrB_Matrix, GrB_NULL_Type}, W <: valid_accum_types, X <: valid_desc_types}
13+
function GrB_eWiseMult(C::Z, mask::V, accum::W, op::U, A::T, B::Y,
14+
desc::X) where {T <: Union{GrB_Vector, GrB_Matrix}, Y <: Union{GrB_Vector, GrB_Matrix}, Z <: Union{GrB_Vector, GrB_Matrix},
15+
U <: Union{GrB_BinaryOp, GrB_Monoid, GrB_Semiring}, V <: Union{GrB_Vector, GrB_Matrix, GrB_NULL_Type},
16+
W <: valid_accum_types, X <: valid_desc_types}
1617

1718
T_name = get_struct_name(A)
1819
U_name = get_struct_name(op)

0 commit comments

Comments
 (0)