make GrB_Type parametric

Author: abhinavmehndiratta

src/Object_Methods/Matrix_Methods.jl

@@ -17,11 +17,9 @@ julia> GrB_Matrix_new(MAT, GrB_INT8, 4, 4)
 GrB_SUCCESS::GrB_Info = 0
 ```
 """
-function GrB_Matrix_new(A::GrB_Matrix{T}, type::GrB_Type, nrows::U, ncols::U) where {U <: GrB_Index, T <: valid_types}
+function GrB_Matrix_new(A::GrB_Matrix{T}, type::GrB_Type{T}, nrows::U, ncols::U) where {U <: GrB_Index, T <: valid_types}
     A_ptr = pointer_from_objref(A)
-    if jl_type(type) != T
-        error("Domain and matrix type do not match")
-    end
+    
     return GrB_Info(
         ccall(
                 dlsym(graphblas_lib, "GrB_Matrix_new"),

src/Object_Methods/Vector_Methods.jl

@@ -17,11 +17,9 @@ julia> GrB_Vector_new(V, GrB_FP64, 4)
 GrB_SUCCESS::GrB_Info = 0
 ```
 """
-function GrB_Vector_new(v::GrB_Vector{T}, type::GrB_Type, n::U) where {U <: GrB_Index, T <: valid_types}
+function GrB_Vector_new(v::GrB_Vector{T}, type::GrB_Type{T}, n::U) where {U <: GrB_Index, T <: valid_types}
     v_ptr = pointer_from_objref(v)
-    if jl_type(type) != T
-        error("Domain and vector type do not match")
-    end
+    
     return GrB_Info(
         ccall(
                 dlsym(graphblas_lib, "GrB_Vector_new"),

src/Structures.jl

@@ -2,14 +2,11 @@ import Base.show
 import Base.==
 export GrB_Type, GrB_UnaryOp, GrB_BinaryOp, GrB_Vector, GrB_Matrix, GrB_Descriptor
 
-mutable struct GrB_Type
+mutable struct GrB_Type{T}
     p::Ptr{Cvoid}
 end
-GrB_Type() = GrB_Type(Ptr{Cvoid}(0)) 
-Base.show(io::IO, ::GrB_Type) = print("GrB_Type")
-function ==(t1::GrB_Type, t2::GrB_Type)
-    t1.p == t2.p
-end
+GrB_Type{T}() where T = GrB_Type{T}(Ptr{Cvoid}(0)) 
+Base.show(io::IO, ::GrB_Type{T}) where T = print("GrB_Type{" * string(T) * "}")
 
 mutable struct GrB_UnaryOp
     p::Ptr{Cvoid}
@@ -39,4 +36,4 @@ mutable struct GrB_Descriptor
     p::Ptr{Cvoid}
 end
 GrB_Descriptor() = GrB_Descriptor(Ptr{Cvoid}(0))
-Base.show(io::IO, ::GrB_Descriptor) = print("GrB_Descriptor")
+Base.show(io::IO, ::GrB_Descriptor) = print("GrB_Descriptor")

src/SuiteSparseGraphBLAS.jl

@@ -7,21 +7,22 @@ if !isfile(depsjl_path)
     error("SuiteSparseGraphBLAS not installed properly, run Pkg.build(\"SuiteSparseGraphBLAS\"), restart Julia and try again")
 end
 
-include(depsjl_path)
-include("Structures.jl")
-
-types = ["BOOL", "INT8", "UINT8", "INT16", "UINT16", "INT32", "UINT32",
-         "INT64", "UINT64", "FP32", "FP64"]
+const types = ["BOOL", "INT8", "UINT8", "INT16", "UINT16", "INT32", "UINT32",
+                "INT64", "UINT64", "FP32", "FP64"]
 
-GrB_Index = Union{Int64, UInt64}
-valid_types = Union{Bool, Int8, UInt8, Int16, UInt16, Int32, UInt32, Int64, UInt64, Float32, Float64}
-valid_int_types = Union{Bool, Int8, UInt8, Int16, UInt16, Int32, UInt32, Int64, UInt64}
+const GrB_Index = Union{Int64, UInt64}
+const valid_types = Union{Bool, Int8, UInt8, Int16, UInt16, Int32, UInt32, Int64, UInt64, Float32, Float64}
+const valid_int_types = Union{Bool, Int8, UInt8, Int16, UInt16, Int32, UInt32, Int64, UInt64}
 
 unary_operators = ["IDENTITY", "AINV", "MINV"]
 
 binary_operators = ["EQ", "NE", "GT", "LT", "GE", "LE", "FIRST", "SECOND", "MIN", "MAX",
                     "PLUS", "MINUS", "TIMES", "DIV"]
 
+include(depsjl_path)
+include("Structures.jl")
+include("Utils.jl")
+
 const GrB_LNOT = GrB_UnaryOp()
 const GrB_LOR = GrB_BinaryOp(); const GrB_LAND = GrB_BinaryOp(); const GrB_LXOR = GrB_BinaryOp()
 graphblas_lib = C_NULL
@@ -39,9 +40,10 @@ function __init__()
     end
 
     #load global types
-    for t in types
-        x = GrB_Type(load_global("GrB_"*t))
-        @eval const $(Symbol(:GrB_, t)) = $x
+    for t in [Bool, Int8, UInt8, Int16, UInt16, Int32, UInt32, Int64, UInt64, Float32, Float64]
+        type_suffix = suffix(t)
+        x = GrB_Type{t}(load_global("GrB_"*type_suffix))
+        @eval const $(Symbol(:GrB_, type_suffix)) = $x
     end
 
     #load global unary operators
@@ -69,7 +71,6 @@ end
 
 include("Enums.jl")
 include("Context_Methods.jl")
-include("Utils.jl")
 include("Object_Methods/Matrix_Methods.jl")
 include("Object_Methods/Vector_Methods.jl")
 include("Object_Methods/Descriptor_Methods.jl")

src/Utils.jl

@@ -23,31 +23,6 @@ function suffix(T::DataType)
     return "FP64"
 end
 
-function jl_type(T::GrB_Type)
-    if T == GrB_BOOL
-        return Bool
-    elseif T == GrB_INT8
-        return Int8
-    elseif T == GrB_UINT8
-        return UInt8
-    elseif T == GrB_INT16
-        return Int16
-    elseif T == GrB_UINT16
-        return UInt16
-    elseif T == GrB_INT32
-        return Int32
-    elseif T == GrB_UINT32
-        return UInt32
-    elseif T == GrB_INT64
-        return Int64
-    elseif T == GrB_UINT64
-        return UInt64
-    elseif  T == GrB_FP32
-        return Float32
-    end
-    return Float64
-end
-
 function _GrB_Index(x::T) where T <: GrB_Index
     x > typemax(Int64) && return x
     return Int64(x)