Skip to content

RCC, FastAssign, and SwapEdges #310

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.

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

Draft
wants to merge 166 commits into
base: with_GraphBLAS_v10
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
166 commits
Select commit Hold shift + click to select a range
f4aeac7
Switched development branches and added swap edges algorithm
GomezGab Apr 18, 2024
b0db5d4
Modiffied RCC and added detailed pseudocode for SwapEdges
GomezGab May 16, 2024
855afae
Merge branch 'GraphBLAS:v1.2' into v1.2
GomezGab May 19, 2024
8ae4ff9
Added alot of code to SwapEdges.c. Does not compile.
GomezGab May 21, 2024
cb50ec2
small additions and changes to SwapEdges Psuedo code
GomezGab May 22, 2024
0bee66a
Meeting notes on SwapEdges.c
GomezGab May 29, 2024
b807619
Merge pull request #1 from GomezGab/mybranch
GomezGab May 29, 2024
7ba7208
Merge branch 'GraphBLAS:v1.2' into v1.2
GomezGab May 29, 2024
0f810b5
Code compiling; Switching Swap Edges to use Concat
GomezGab Jun 4, 2024
8bd15df
Merge branch 'GraphBLAS:v1.2' into v1.2
GomezGab Jun 4, 2024
d9df0d7
Swap edges mostly done
GomezGab Jun 11, 2024
b4ae4ed
Merge branch 'GraphBLAS:v1.2' into v1.2
GomezGab Aug 25, 2024
a188e7d
Merge branch 'GraphBLAS:v1.2' into v1.2
GomezGab Sep 13, 2024
33aa7b5
RCC passing basic tests
GomezGab Sep 30, 2024
e6cf5fe
More testing of RCC and setting up cumsum
GomezGab Oct 3, 2024
f9ed6f1
Comment changes to RCC
GomezGab Oct 3, 2024
fbfe13a
Merge branch 'GraphBLAS:v1.2' into v1.2
GomezGab Oct 3, 2024
02d9cba
minor updates to burble
DrTimothyAldenDavis Oct 3, 2024
be452a8
Preliminary testing for SwapEdges
GomezGab Oct 10, 2024
4f8a8f5
Swap Edges Tests Passing. Singleton Graphs not working.
GomezGab Oct 14, 2024
ec130e3
Fixed Tests and Self Edges and Parallel Edges being Generated
GomezGab Oct 15, 2024
f4aa901
Added demos, small optimizations
GomezGab Oct 17, 2024
c0a771c
Edge Swap optimizations
GomezGab Oct 19, 2024
fa44964
speed up RCC 4x by using row and col scale
GomezGab Oct 21, 2024
b02b68a
sped up Swap Edges by reducing interf search
GomezGab Oct 24, 2024
94157fe
Modified demos
GomezGab Oct 24, 2024
7bc9469
Merge branch 'GraphBLAS:v1.2' into v1.2
GomezGab Oct 27, 2024
45b8aec
Swap_Edges hash
GomezGab Nov 3, 2024
2c168ab
Merge branch 'v1.2' of github.com:GomezGab/LAGraph into my_v1.2
GomezGab Nov 4, 2024
2971ab1
Cleaned up demo and Swap variables
GomezGab Nov 4, 2024
e5a3c6c
Simplified RCC Calculation
GomezGab Nov 5, 2024
b5e0688
fixes to swap edges
GomezGab Nov 7, 2024
37a9d41
Changed from using incidence matrix
GomezGab Nov 9, 2024
4bb29b9
Cleaned up old variables and clarified names
GomezGab Nov 9, 2024
4235cd0
Modified E to Row Full
GomezGab Nov 9, 2024
b70d943
Random init fixed
GomezGab Nov 10, 2024
ab94b88
Reduce bug fix
GomezGab Nov 10, 2024
aac33c3
Fixed column full pack
GomezGab Nov 13, 2024
0a22c3b
Changed how I find duplicate edges
GomezGab Nov 15, 2024
8cf6e3f
Fixed memory leak
GomezGab Nov 15, 2024
377fbbd
Removed permutation matrix
GomezGab Nov 15, 2024
250b262
Buckets for hashes
GomezGab Nov 16, 2024
a046147
Revert "Buckets for hashes"
GomezGab Nov 16, 2024
51ab705
switching verticies of edges pre swap
GomezGab Nov 16, 2024
d596a62
vectorise edges
GomezGab Nov 16, 2024
a14ab12
Merge branch 'v1.2' of github.com:GomezGab/LAGraph into v1.2
GomezGab Nov 16, 2024
d61805a
inplace swapping using E vector
GomezGab Nov 16, 2024
0e37a78
fixed randomized swapping
Nov 16, 2024
3a29b63
Merge branch 'GraphBLAS:v1.2' into v1.2
GomezGab Nov 19, 2024
b9bfc4b
Simplified initial permute
GomezGab Nov 19, 2024
1fb51c8
faster unary ops for swaps
GomezGab Nov 24, 2024
8c9022d
Vectorised most thin matricies
GomezGab Dec 3, 2024
d4fb00d
Cleaning up prints and testing permutes
GomezGab Dec 3, 2024
09cbbaa
Changed method for perm
GomezGab Dec 4, 2024
bafe70e
Hash set testing
GomezGab Dec 7, 2024
d564cc3
modifying hash set functions
GomezGab Dec 7, 2024
e5a8108
Added CSC magic to testing
GomezGab Dec 7, 2024
642340a
Changed subassign to matrix concat
GomezGab Dec 8, 2024
215f23e
Merge branch 'GraphBLAS:v1.2' into v1.2
GomezGab Dec 16, 2024
4d3fe94
Changed method for hashing edges
GomezGab Dec 17, 2024
1fc7d5d
Merge branch 'v1.2' of github.com:GomezGab/LAGraph into v1.2
GomezGab Dec 17, 2024
3d4e393
Modified duplication finding. Not passing tests
GomezGab Dec 18, 2024
b5bc2d2
new hashing method
GomezGab Dec 18, 2024
a56361e
Cleaned up RCC code
GomezGab Jan 29, 2025
cf75705
added add_term, not yet in use
GomezGab Feb 6, 2025
af10685
Fixed counter overflow
GomezGab Feb 10, 2025
6665d46
Merge branch 'GraphBLAS:v1.2' into v1.2
GomezGab Feb 10, 2025
f36df04
trigger JIT bug in GraphBLAS
DrTimothyAldenDavis Feb 12, 2025
285f945
targeting saxpy4 and ONEB now working
GomezGab Feb 19, 2025
8a893a4
Merge branch 'v1.2' into with_GraphBLAS_v10
GomezGab Feb 20, 2025
e27baef
Added the FastBuild method using load/unload
GomezGab Feb 21, 2025
e904936
singleton bug fix and test added
GomezGab Feb 21, 2025
05d774f
Merge branch 'GraphBLAS:with_GraphBLAS_v10' into with_GraphBLAS_v10
GomezGab Feb 21, 2025
34761ea
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab Feb 21, 2025
381ef58
Incidence Matrix general type
GomezGab Feb 21, 2025
a315e4e
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab Feb 21, 2025
8b3458b
Merge branch 'with_GraphBLAS_v10' of github.com:GomezGab/LAGraph into…
GomezGab Feb 21, 2025
f822e4d
FastBuild -> FastAssign
GomezGab Feb 22, 2025
c1d0255
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab Feb 22, 2025
06a6451
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab Feb 23, 2025
5c0edbc
added FastAssign demo
GomezGab Feb 23, 2025
cad2386
FastAssign fixes. Now implemented into FastSV6
GomezGab Feb 24, 2025
9e5f736
Fixed #if's
GomezGab Feb 24, 2025
0f20326
Added FastSV6_SSGrBv10 to benchmark
GomezGab Feb 24, 2025
965c204
added some TODO's
GomezGab Feb 24, 2025
926b28f
merged new incidence matrix
GomezGab Feb 24, 2025
3aa0f59
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab Feb 27, 2025
9a11d29
Fast Assign Semiring and FastSV7_FA
GomezGab Feb 28, 2025
9eadbbd
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab Feb 28, 2025
92cd9c9
Added vanilla RCC algorithm
GomezGab Feb 28, 2025
704b16a
Fast Assign transpose and comments
GomezGab Mar 1, 2025
6c370c0
Starting SwapEdgesV2
GomezGab Mar 1, 2025
5bbfc6e
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab Mar 1, 2025
9811a72
Merge branch 'fastAssign_GraphBLAS_10' of github.com:GomezGab/LAGraph…
GomezGab Mar 1, 2025
510ded2
added comments and FastSV7_FA brutal
GomezGab Mar 1, 2025
8f4b309
Merge branch 'fastAssign_GraphBLAS_10' of github.com:GomezGab/LAGraph…
GomezGab Mar 1, 2025
06cec2c
fixed brutal test CC
GomezGab Mar 1, 2025
2d15c0e
Merge branch 'fastAssign_GraphBLAS_10' of github.com:GomezGab/LAGraph…
GomezGab Mar 1, 2025
9d133b1
Fixed typo in brutal CC test
GomezGab Mar 1, 2025
06d289b
Merge branch 'fastAssign_GraphBLAS_10' of github.com:GomezGab/LAGraph…
GomezGab Mar 1, 2025
67334da
Remove SwapEdges: not ready to merge
GomezGab Mar 1, 2025
137a271
Restored files changed in error
GomezGab Mar 1, 2025
0c85a8a
Changed strategy for placing new edges in E_vec to Subassign
GomezGab Mar 2, 2025
068a761
Fixed type getting in LAGraph_FastAssign
GomezGab Mar 2, 2025
6113059
Swap placement strategy FastAssign
GomezGab Mar 2, 2025
d8b0205
Changed misleading P type and added an assert
GomezGab Mar 2, 2025
6cdfb53
Merge branch 'fastAssign_GraphBLAS_10' of github.com:GomezGab/LAGraph…
GomezGab Mar 2, 2025
923f838
Temporary Fix for weird Segfault
GomezGab Mar 2, 2025
66dee51
Switched from pack/unpack to load/unload
GomezGab Mar 4, 2025
08e4cbf
added brutal test to rcc and now using fastassign semiring
GomezGab Mar 4, 2025
786ee08
Now working on with saxpy4 of GBv10.0.1
GomezGab Mar 5, 2025
3950a76
changed dupswap lookup
GomezGab Mar 16, 2025
c5a9cb9
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab Mar 16, 2025
21a3a95
Fixed input params RCC
GomezGab Mar 16, 2025
0941d38
check GBSS for brutal test
GomezGab Mar 16, 2025
c457ab8
Merge branch 'fastAssign_GraphBLAS_10' into rcc_butal_test
GomezGab Mar 16, 2025
de022cf
Fixed fast assign monoid for all but UDTs
GomezGab Mar 17, 2025
f860c57
fix FA return & small rcc changes
GomezGab Mar 17, 2025
b74b3a0
Merge branch 'RCC_GB10' into SwapEdges_GB10
GomezGab Mar 17, 2025
82549a2
Removed last pack operation
GomezGab Mar 17, 2025
08cb4f8
added file export to swap demo
GomezGab Mar 17, 2025
53f7297
Mar 19 meeting: __builtin_clzl
DrTimothyAldenDavis Mar 19, 2025
aa1fa5d
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab Apr 1, 2025
de02b6e
Filled node_edges for faster mxv
GomezGab Apr 1, 2025
90602ae
Renamed variables and changed output of RCC
GomezGab Apr 2, 2025
a7a119a
intial Swap Edges int 32 support
GomezGab Apr 2, 2025
3008138
Merge branch 'SwapEdges_GB10' of github.com:GomezGab/LAGraph into Swa…
GomezGab Apr 2, 2025
1d124fd
removed debug statements
GomezGab Apr 2, 2025
ab7164e
debug statements
GomezGab Apr 2, 2025
50c9893
Merge branch 'RCC_GB10' into SwapEdges_GB10
Apr 2, 2025
b49af6e
merged RCC branch
Apr 2, 2025
5e2724d
Added Build to FA demo
GomezGab Apr 2, 2025
26382a4
Turned off demo burble and fixed test
GomezGab Apr 2, 2025
614727b
Demo prebuilt ramp
GomezGab Apr 2, 2025
c6b4dd9
Added single threaded non-GB RCC algo
GomezGab Apr 8, 2025
25c271e
changed eq op
GomezGab Apr 8, 2025
bc8baee
Parrallelizing non-GB approach
GomezGab Apr 9, 2025
6d81f7f
Parallel NoGB Fix
GomezGab Apr 9, 2025
cd880b4
Fixed RCC for earlier GB versions. Speed Up No GB.
GomezGab Apr 10, 2025
71afb0f
Removed FastAssign demo on lower GB versions
GomezGab Apr 10, 2025
063ed7e
NoGB returns NOT IMPLEMENTED for GB <v10
GomezGab Apr 10, 2025
111c380
Merge remote-tracking branch 'origin/RCC_GB10' into SwapEdges_GB10
GomezGab Apr 10, 2025
38c30ba
removed void ptr functions
GomezGab Apr 27, 2025
b4f2f44
remove old swapedges file
GomezGab Apr 27, 2025
7a84b29
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab Apr 27, 2025
c0f0e47
renamed function and changed demo call
GomezGab Apr 28, 2025
6915cc9
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab Apr 28, 2025
1f73428
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab Apr 28, 2025
de56aaf
Merge branch 'SwapEdges_GB10' into RCC_GB10
GomezGab Apr 28, 2025
e430c2c
Moved out the rcc checker
GomezGab Apr 28, 2025
846c471
include rcc check on demo
GomezGab Apr 29, 2025
3410828
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab Apr 29, 2025
767c29a
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab May 1, 2025
f671b86
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab May 4, 2025
827480f
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab May 6, 2025
ae9d178
LG_Random fixes and starting test cov
GomezGab May 7, 2025
a4b9041
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab May 7, 2025
ba69d16
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab May 7, 2025
b7c8d32
Remove test check for older versions
GomezGab May 8, 2025
8e6c242
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab May 8, 2025
1a2a052
more coverage and added paper
GomezGab May 8, 2025
a4daaf4
hack fast_assign
DrTimothyAldenDavis May 8, 2025
2d14265
Merge branch 'RCC_GB10' of github.com:GomezGab/LAGraph into RCC_GB10
GomezGab May 11, 2025
fa59ff5
Test cov 100
GomezGab May 11, 2025
623c72d
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab May 11, 2025
a7e86e5
move USING_GRAPHBLAS_V10 definition
GomezGab May 11, 2025
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: 0 additions & 6 deletions .vscode/settings.json

This file was deleted.

6 changes: 6 additions & 0 deletions config/LAGraph.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,15 @@
#error "If using SuiteSparse::GraphBLAS, version 9.0.0 or later is required"
#endif
#define LAGRAPH_SUITESPARSE 1
#if GxB_IMPLEMENTATION >= GxB_VERSION (10,0,0)
#define USING_GRAPHBLAS_V10 1

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This #define of USING_GRAPHBLAS_V10 should not be exposed to the end user since it does not have the right name for that. This #define should be moved to LG_internal.h, or if it appears in LAGraph.h it must be renamed to LAGRAPH_SUITESPARSE_V10 perhaps. Better to just move it to LG_internal.h for now.

#else
#define USING_GRAPHBLAS_V10 0
#endif
#else
// use any GraphBLAS library (possibly SuiteSparse) but with no GxB*
#define LAGRAPH_SUITESPARSE 0
#define USING_GRAPHBLAS_V10 0
#endif

// maximum length of the name of a GrB type, including the null-terminator
Expand Down
Loading
Loading