bug fixes

Author: abhinavmehndiratta

src/Object_Methods/Free_Objects.jl

@@ -2,57 +2,14 @@
     GrB_free(object)
 
 Generic method to free a GraphBLAS object.
-
-# Examples
-```jldoctest
-julia> using SuiteSparseGraphBLAS
-
-julia> w = GrB_Vector{Int64}()
-GrB_Vector{Int64}
-
-julia> I = [0, 2, 4]; X = [10, 20, 30]; n = 3;
-
-julia> GrB_Vector_new(w, GrB_INT64, 5)
-GrB_SUCCESS::GrB_Info = 0
-
-julia> GrB_Vector_build(w, I, X, n, GrB_FIRST_INT64)
-GrB_SUCCESS::GrB_Info = 0
-
-julia> @GxB_fprint(w, GxB_COMPLETE)
-
-GraphBLAS vector: w
-nrows: 5 ncols: 1 max # entries: 3
-format: standard CSC vlen: 5 nvec_nonempty: 1 nvec: 1 plen: 1 vdim: 1
-hyper_ratio 0.0625
-GraphBLAS type:  int64_t size: 8
-number of entries: 3
-column: 0 : 3 entries [0:2]
-    row 0: int64 10
-    row 2: int64 20
-    row 4: int64 30
-
-
-julia> GrB_free(w)
-GrB_SUCCESS::GrB_Info = 0
-
-julia> @GxB_fprint(w, GxB_COMPLETE)
-
-GraphBLAS vector: w NULL
-```
 """
-function GrB_free(object::GrB_Struct)
-    object_ptr = pointer_from_objref(object)
-    fn_name = "GrB_" * get_struct_name(object) * "_free"
-
-    return GrB_Info(
-        ccall(
-                dlsym(graphblas_lib, fn_name),
-                Cint,
-                (Ptr{Cvoid}, ),
-                object_ptr
-            )
-        )
-end
+GrB_free(object::GrB_UnaryOp) = GrB_UnaryOp_free(object)
+GrB_free(object::GrB_BinaryOp) = GrB_BinaryOp_free(object)
+GrB_free(object::GrB_Monoid) = GrB_Monoid_free(object)
+GrB_free(object::GrB_Semiring) = GrB_Semiring_free(object)
+GrB_free(object::GrB_Vector) = GrB_Vector_free(object)
+GrB_free(object::GrB_Matrix) = GrB_Matrix_free(object)
+GrB_free(object::GrB_Descriptor) = GrB_Descriptor_free(object)
 
 """
     GrB_UnaryOp_free(unaryop)
@@ -130,6 +87,43 @@ end
     GrB_Vector_free(v)
 
 Free vector.
+
+# Examples
+```jldoctest
+julia> using SuiteSparseGraphBLAS
+
+julia> w = GrB_Vector{Int64}()
+GrB_Vector{Int64}
+
+julia> I = [0, 2, 4]; X = [10, 20, 30]; n = 3;
+
+julia> GrB_Vector_new(w, GrB_INT64, 5)
+GrB_SUCCESS::GrB_Info = 0
+
+julia> GrB_Vector_build(w, I, X, n, GrB_FIRST_INT64)
+GrB_SUCCESS::GrB_Info = 0
+
+julia> @GxB_fprint(w, GxB_COMPLETE)
+
+GraphBLAS vector: w
+nrows: 5 ncols: 1 max # entries: 3
+format: standard CSC vlen: 5 nvec_nonempty: 1 nvec: 1 plen: 1 vdim: 1
+hyper_ratio 0.0625
+GraphBLAS type:  int64_t size: 8
+number of entries: 3
+column: 0 : 3 entries [0:2]
+    row 0: int64 10
+    row 2: int64 20
+    row 4: int64 30
+
+
+julia> GrB_Vector_free(w)
+GrB_SUCCESS::GrB_Info = 0
+
+julia> @GxB_fprint(w, GxB_COMPLETE)
+
+GraphBLAS vector: w NULL
+```
 """
 function GrB_Vector_free(v::GrB_Vector)
     v_ptr = pointer_from_objref(v)

src/Object_Methods/Print_Objects.jl

@@ -1,11 +1,31 @@
-function GxB_fprint(A::GrB_Struct, name::String, pr::GxB_Print_Level)
+function GxB_fprint(
+    A::T, 
+    name::String, 
+    pr::GxB_Print_Level
+    ) where T <: Union{GrB_Type, GrB_UnaryOp, GrB_BinaryOp, GrB_Monoid, GrB_Semiring, GrB_Matrix, GrB_Vector, GrB_Descriptor}
+    
     function f(path, io)
         FILE = Libc.FILE(io)
         ccall(dlsym(graphblas_lib, fn_name), Cint, (Ptr{Cvoid}, Ptr{UInt8}, Cint, Ptr{Cvoid}), A.p, pointer(name), pr, FILE)
         ccall(:fclose, Cint, (Ptr{Cvoid},), FILE)
         foreach(println, eachline(path))
     end
-    s = get_struct_name(A)
+    
+    s = "Descriptor"
+    if T <: GrB_UnaryOp
+        s = "UnaryOp"
+    elseif T <: GrB_BinaryOp
+        s = "BinaryOp"
+    elseif T <: GrB_Monoid
+        s = "Monoid"
+    elseif T <: GrB_Semiring
+        s = "Semiring"
+    elseif T <: GrB_Vector
+        s = "Vector"
+    elseif T <: GrB_Matrix
+        s = "Matrix"
+    end
+
     fn_name  = "GxB_" * s * "_fprint"
     mktemp(f)
 end

src/Operations/Apply.jl

@@ -3,26 +3,8 @@
 
 Generic matrix/vector apply.
 """
-function GrB_apply(                 # w<mask> = accum (w, op(u))
-    C::X,                           # input/output vector for results
-    Mask::T,                        # optional mask for w, unused if NULL
-    accum::U,                       # optional accum for z=accum(w,t)
-    op::GrB_UnaryOp,                # operator to apply to the entries
-    A::Y,                           # first input:  vector u
-    desc::V                         # descriptor for w and mask
-) 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}
-
-    fn_name = "GrB_" * get_struct_name(C) * "_apply"
-
-    return GrB_Info(
-                ccall(
-                        dlsym(graphblas_lib, fn_name),
-                        Cint,
-                        (Ptr{Cvoid}, Ptr{Cvoid}, Ptr{Cvoid}, Ptr{Cvoid}, Ptr{Cvoid}, Ptr{Cvoid}),
-                        C.p, Mask.p, accum.p, op.p, A.p, desc.p
-                    )
-                )
-end
+GrB_apply(C::GrB_Vector, Mask, accum, op, A, desc) = GrB_Vector_apply(C, Mask, accum, op, A, desc)
+GrB_apply(C::GrB_Matrix, Mask, accum, op, A, desc) = GrB_Matrix_apply(C, Mask, accum, op, A, desc)
 
 """
     GrB_Vector_apply(w, mask, accum, op, u, desc)