Fix Mask (#91)

* fix masking op to use replace

* really gross method of solving cfunction error? Will likely remove with more sleep

* try functionwrappers

* use celrod trick

* begin adding other unpack types

* begin adding other unpack types

* transfer wip to antarctic

* WIP fill generalization, container type generalization

* passing tests locally

* fix type infer error

* reorg, fix #84

* add some tests, fix binaryops between valid_union and UDTs

* missing qualifiers

* fix typo

* similar->oftype

* refix typo

Author: Will Kimmerer

Project.toml

@@ -1,7 +1,7 @@
 name = "SuiteSparseGraphBLAS"
 uuid = "c2e53296-7b14-11e9-1210-bddfa8111e1d"
 authors = ["Will Kimmerer <[email protected]", "Abhinav Mehndiratta <[email protected]>"]
-version = "0.8"
+version = "0.8.0"
 
 [deps]
 ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
@@ -17,14 +17,14 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
 StorageOrders = "e9177fbf-8fde-426c-9425-4eed0f22262a"
 SuiteSparse = "4607b0f0-06f3-5cda-b6b1-a6196a1729e9"
+Tricks = "410a4b4d-49e4-4fbc-ab6d-cb71b17b3775"
 
 [compat]
 ChainRulesCore = "1"
+KLU = "0.4"
 MacroTools = "0.5"
 Preferences = "1"
 SSGraphBLAS_jll = "7.2"
 SpecialFunctions = "2"
 StorageOrders = "0.2"
 julia = "1.7"
-KLU = "0.4"
-

docs/src/arrays.md

@@ -3,7 +3,7 @@
 There are two primary array types in SuiteSparseGraphBLAS.jl: [`GBVector`](@ref) and [`GBMatrix`](@ref), as well as a few specialized versions of those array types. The full type hierarchy is:
 
 ```
-AbstractGBArray{T, N, F} <: AbstractSparseArray{T, N}
+AbstractGBArray{T, F, N} <: AbstractSparseArray{Union{T, F}, N}
  ├ N = 2 ─ AbstractGBMatrix{T, F} 
  │   ├─ GBMatrix{T, F}
  │   └─ OrientedGBMatrix{T, F, O}

src/SuiteSparseGraphBLAS.jl

@@ -18,6 +18,7 @@ using SparseArrays
 using SparseArrays: nonzeroinds, getcolptr, getrowval, getnzval
 using MacroTools
 using LinearAlgebra
+using LinearAlgebra: copy_oftype
 using Random: randsubseq, default_rng, AbstractRNG, GLOBAL_RNG
 using SpecialFunctions: lgamma, gamma, erf, erfc
 using Base.Broadcast
@@ -58,9 +59,15 @@ include("indexutils.jl")
 # 
 include("operations/extract.jl")
 include("scalar.jl")
-include("vector.jl")
-include("matrix.jl")
+include("gbvector.jl")
+include("gbmatrix.jl")
 include("abstractgbarray.jl")
+
+# EXPERIMENTAL array types:
+include("shallowtypes.jl")
+include("oriented.jl")
+
+include("convert.jl")
 include("random.jl")
 # Miscellaneous Operations
 include("print.jl")
@@ -96,19 +103,17 @@ include("serialization.jl")
 include("misc.jl")
 include("mmread.jl")
 # include("iterator.jl")
-include("oriented.jl")
 include("solvers/klu.jl")
 include("solvers/umfpack.jl")
-include("shallowtypes.jl")
 
 export SparseArrayCompat
 export LibGraphBLAS
 # export UnaryOps, BinaryOps, Monoids, Semirings #Submodules
 export unaryop, binaryop, Monoid, semiring #UDFs
 export Descriptor #Types
-export gbset, gbget # global and object specific options.
+export gbset, gbget, getfill, setfill # global and object specific options.
 # export xtype, ytype, ztype #Determine input/output types of operators
-export GBScalar, GBVector, GBMatrix #arrays
+export GBScalar, GBVector, GBMatrix, GBMatrixC, GBMatrixR #arrays
 export lgamma, gamma, erf, erfc #reexport of SpecialFunctions.
 
 # Function arguments not found elsewhere in Julia