bug fixes for OneBasedIndices

Author: abhinavmehndiratta

src/Operations/Assign.jl

@@ -154,12 +154,23 @@ GrB_Matrix_assign(
     Mask::T,
     accum::U,
     A::GrB_Matrix,
-    I::OneBasedIndices,
+    I::Union{OneBasedIndices, GrB_ALL_Type},
     ni::Union{Int64, UInt64},
     J::OneBasedIndices,
     nj::Union{Int64, UInt64},
     desc::V) where {T <: valid_matrix_mask_types, U <: valid_accum_types, V <: valid_desc_types} = GrB_Matrix_assign(C, Mask, accum, A, ZeroBasedIndices(I), ni, ZeroBasedIndices(J), nj, desc)
 
+GrB_Matrix_assign(
+    C::GrB_Matrix,
+    Mask::T,
+    accum::U,
+    A::GrB_Matrix,
+    I::OneBasedIndices,
+    ni::Union{Int64, UInt64},
+    J::Union{OneBasedIndices, GrB_ALL_Type},
+    nj::Union{Int64, UInt64},
+    desc::V) where {T <: valid_matrix_mask_types, U <: valid_accum_types, V <: valid_desc_types} = GrB_Matrix_assign(C, Mask, accum, A, ZeroBasedIndices(I), ni, ZeroBasedIndices(J), nj, desc)
+
 """
     GrB_Col_assign(C, mask, accum, u, I, ni, j, desc)
 
@@ -246,11 +257,11 @@ GrB_Col_assign(
     mask::T,
     accum::U,
     u::GrB_Vector,
-    I::OneBasedIndices,
+    I::Union{OneBasedIndices, GrB_ALL_Type},
     ni::Union{Int64, UInt64},
     j::OneBasedIndex,
     desc::V
-    ) where {T <: valid_vector_mask_types, U <: valid_accum_types, V <: valid_desc_types} = GrB_Col_assign(C, Mask, accum, u, ZeroBasedIndices(I), ni, ZeroBasedIndex(j), desc)
+    ) where {T <: valid_vector_mask_types, U <: valid_accum_types, V <: valid_desc_types} = GrB_Col_assign(C, mask, accum, u, ZeroBasedIndices(I), ni, ZeroBasedIndex(j), desc)
 
 """
     GrB_Row_assign(C, mask, accum, u, i, J, nj, desc)
@@ -338,7 +349,7 @@ GrB_Row_assign(
     accum::U,
     u::GrB_Vector,
     i::OneBasedIndex,
-    J::OneBasedIndices,
+    J::Union{OneBasedIndices, GrB_ALL_Type},
     nj::Union{Int64, UInt64},
     desc::V
     ) where {T <: valid_vector_mask_types, U <: valid_accum_types, V <: valid_desc_types} = GrB_Row_assign(C, mask, accum, u, ZeroBasedIndex(i), ZeroBasedIndices(J), nj, desc)
@@ -599,9 +610,21 @@ GrB_Matrix_assign(
     Mask::T,
     accum::U,
     x,
-    I::OneBasedIndices,
+    I::Union{OneBasedIndices, GrB_ALL_Type},
     ni::Union{Int64, UInt64},
     J::OneBasedIndices,
     nj::Union{Int64, UInt64},
     desc::V
     ) where {T <: valid_matrix_mask_types, U <: valid_accum_types, V <: valid_desc_types} = GrB_Matrix_assign(C, Mask, accum, x, ZeroBasedIndices(I), ni, ZeroBasedIndices(J), nj, desc)
+
+GrB_Matrix_assign(
+    C::GrB_Matrix,
+    Mask::T,
+    accum::U,
+    x,
+    I::OneBasedIndices,
+    ni::Union{Int64, UInt64},
+    J::Union{OneBasedIndices, GrB_ALL_Type},
+    nj::Union{Int64, UInt64},
+    desc::V
+    ) where {T <: valid_matrix_mask_types, U <: valid_accum_types, V <: valid_desc_types} = GrB_Matrix_assign(C, Mask, accum, x, ZeroBasedIndices(I), ni, ZeroBasedIndices(J), nj, desc)

src/Operations/Extract.jl

@@ -175,9 +175,9 @@ GrB_Matrix_extract(
     Mask::T,
     accum::U,
     A::GrB_Matrix,
-    I::OneBasedIndices,
+    I::Union{OneBasedIndices, GrB_ALL_Type},
     ni::Union{Int64, UInt64},
-    J::OneBasedIndices,
+    J::Union{OneBasedIndices, GrB_ALL_Type},
     nj::Union{Int64, UInt64},
     desc::V
     ) where {T <: valid_matrix_mask_types, U <: valid_accum_types, V <: valid_desc_types} = GrB_Matrix_extract(C, Mask, accum, A, ZeroBasedIndices(I), ni, ZeroBasedIndices(J), nj, desc)
@@ -271,12 +271,12 @@ function GrB_Col_extract(               # w<mask> = accum (w, A(I,j))
 end
 
 GrB_Col_extract(
-    w::GrB_Vector, 
-    mask::T, 
-    accum::U, 
-    A::GrB_Matrix, 
-    I::OneBasedIndices, 
-    ni::Union{Int64, UInt64}, 
-    j::OneBasedIndex, 
+    w::GrB_Vector,
+    mask::T,
+    accum::U,
+    A::GrB_Matrix,
+    I::Union{OneBasedIndices, GrB_ALL_Type},
+    ni::Union{Int64, UInt64},
+    j::OneBasedIndex,
     desc::V
     ) where {T <: valid_vector_mask_types, U <: valid_accum_types, V <: valid_desc_types} = GrB_Col_extract(w, mask, accum, A, ZeroBasedIndices(I), ni, ZeroBasedIndex(j), desc)

src/Structures.jl

@@ -92,3 +92,4 @@ mutable struct GrB_ALL_Type <: Abstract_GrB_ALL
 end
 pointer(x::GrB_ALL_Type) = x.p
 show(io::IO, ::GrB_ALL_Type) = print("GrB_ALL")
+Vector{ZeroBasedIndex}(::GrB_ALL_Type) = GrB_ALL