Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Mask #91

Merged
merged 17 commits into from
Oct 6, 2022
Merged

Fix Mask #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
44f2488
fix masking op to use replace
rayegun Sep 22, 2022
9a516c9
really gross method of solving cfunction error? Will likely remove wi…
rayegun Sep 22, 2022
2bae6c6
try functionwrappers
rayegun Sep 22, 2022
c9cdda7
use celrod trick
rayegun Sep 22, 2022
7db3e0c
begin adding other unpack types
rayegun Sep 22, 2022
584fcef
begin adding other unpack types
rayegun Sep 22, 2022
05eac0f
transfer wip to antarctic
rayegun Sep 26, 2022
e0c3e34
WIP fill generalization, container type generalization
rayegun Oct 2, 2022
6aa5b0e
passing tests locally
rayegun Oct 3, 2022
40b5b49
fix type infer error
rayegun Oct 6, 2022
4d3d707
reorg, fix #84
rayegun Oct 6, 2022
a78e6d7
add some tests, fix binaryops between valid_union and UDTs
rayegun Oct 6, 2022
b7a812c
Merge remote-tracking branch 'origin/master' into fixmask
rayegun Oct 6, 2022
855d757
missing qualifiers
rayegun Oct 6, 2022
4d70f61
fix typo
rayegun Oct 6, 2022
03585de
similar->oftype
rayegun Oct 6, 2022
51d45e9
refix typoe
rayegun Oct 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "SuiteSparseGraphBLAS"
uuid = "c2e53296-7b14-11e9-1210-bddfa8111e1d"
authors = ["Will Kimmerer <wrkimmerer@outlook.com", "Abhinav Mehndiratta <abhinavmehndiratta@gmail.com>"]
version = "0.8"
version = "0.8.0"

[deps]
ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
Expand All @@ -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"

2 changes: 1 addition & 1 deletion docs/src/arrays.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
17 changes: 11 additions & 6 deletions src/SuiteSparseGraphBLAS.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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
Expand Down
Loading