Skip to content

SpGeMM #77

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

Merged
merged 18 commits into from
May 5, 2023
Merged

SpGeMM #77

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
269fc21
refactor: ClArray.Bitmap module
IgorErin Apr 30, 2023
1ebf84b
refactor: CSR.expandRowsPointers
IgorErin May 1, 2023
3d2cc7f
add: CSR.subByRows
IgorErin May 1, 2023
5551c57
add: ClArray.upperBound
IgorErin May 1, 2023
5b1b3cd
add: Search.Bin.lowerBound comments
IgorErin May 1, 2023
970ffa0
wip: SpGeMM
IgorErin May 2, 2023
fcbeee4
add: ClArray.upperBoundWithValue
IgorErin May 2, 2023
02fa1ff
add: MaxMemAllocSize
IgorErin May 2, 2023
9662efe
refactor: release in spgemm
IgorErin May 2, 2023
7e58687
add: maxAllocSize assert
IgorErin May 2, 2023
bae988e
add: measure maxAllocSize
IgorErin May 3, 2023
2ddbe37
refactor: tests
IgorErin May 3, 2023
35e5e29
add: ClArray.set, ClArray.item
IgorErin May 4, 2023
627e8c5
fix: SpGeMM, last item in pointers
IgorErin May 4, 2023
06be7e7
refactor: Naming, Generators
IgorErin May 4, 2023
9482cab
fix: allocSize compute in spgemm
IgorErin May 4, 2023
e647418
refactor: formatting
IgorErin May 4, 2023
e52847c
refactor: sparsity generators
IgorErin May 5, 2023
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
Prev Previous commit
Next Next commit
wip: SpGeMM
  • Loading branch information
@IgorErin
IgorErin committed May 2, 2023
commit 970ffa02860d905c472456f2f967760a97838034
1 change: 1 addition & 0 deletions src/GraphBLAS-sharp.Backend/Matrix/COO/Matrix.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ open GraphBLAS.FSharp.Backend.Objects
open GraphBLAS.FSharp.Backend.Objects.ClMatrix
open GraphBLAS.FSharp.Backend.Objects.ClCell
open GraphBLAS.FSharp.Backend.Objects.ArraysExtensions
open GraphBLAS.FSharp.Backend.Objects.ClContext

module Matrix =
let map = Map.run
Expand Down
32 changes: 16 additions & 16 deletions src/GraphBLAS-sharp.Backend/Matrix/Matrix.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,19 +405,19 @@ module Matrix =
| ClMatrix.CSR m1, ClMatrix.CSC m2, ClMatrix.COO mask -> runCSRnCSC queue m1 m2 mask |> ClMatrix.COO
| _ -> failwith "Matrix formats are not matching"

// let expand
// (opAdd: Expr<'c -> 'c -> 'c option>)
// (opMul: Expr<'a -> 'b -> 'c option>)
// (clContext: ClContext)
// workGroupSize
// =
//
// let run =
// SpGeMM.Expand.run clContext workGroupSize opAdd opMul
//
// fun (processor: MailboxProcessor<_>) allocationMode (leftMatrix: ClMatrix<'a>) (rightMatrix: ClMatrix<'b>) ->
// match leftMatrix, rightMatrix with
// | ClMatrix.CSR leftMatrix, ClMatrix.CSR rightMatrix ->
// ClMatrix.LIL
// <| run processor allocationMode leftMatrix rightMatrix
// | _ -> failwith "Matrix formats are not matching"
let expand
(opAdd: Expr<'c -> 'c -> 'c option>)
(opMul: Expr<'a -> 'b -> 'c option>)
(clContext: ClContext)
workGroupSize
=

let run =
SpGeMM.Expand.run opAdd opMul clContext workGroupSize

fun (processor: MailboxProcessor<_>) allocationMode (leftMatrix: ClMatrix<'a>) (rightMatrix: ClMatrix<'b>) ->
match leftMatrix, rightMatrix with
| ClMatrix.CSR leftMatrix, ClMatrix.CSR rightMatrix ->
// TODO(max alloc size)
run processor allocationMode 1000 leftMatrix rightMatrix
| _ -> failwith "Matrix formats are not matching"
Loading