-
Notifications
You must be signed in to change notification settings - Fork 70
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
GomezGab
wants to merge
166
commits into
GraphBLAS:with_GraphBLAS_v10
Choose a base branch
from
GomezGab:RCC_GB10
base: with_GraphBLAS_v10
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
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 b0db5d4
Modiffied RCC and added detailed pseudocode for SwapEdges
GomezGab 855afae
Merge branch 'GraphBLAS:v1.2' into v1.2
GomezGab 8ae4ff9
Added alot of code to SwapEdges.c. Does not compile.
GomezGab cb50ec2
small additions and changes to SwapEdges Psuedo code
GomezGab 0bee66a
Meeting notes on SwapEdges.c
GomezGab b807619
Merge pull request #1 from GomezGab/mybranch
GomezGab 7ba7208
Merge branch 'GraphBLAS:v1.2' into v1.2
GomezGab 0f810b5
Code compiling; Switching Swap Edges to use Concat
GomezGab 8bd15df
Merge branch 'GraphBLAS:v1.2' into v1.2
GomezGab d9df0d7
Swap edges mostly done
GomezGab b4ae4ed
Merge branch 'GraphBLAS:v1.2' into v1.2
GomezGab a188e7d
Merge branch 'GraphBLAS:v1.2' into v1.2
GomezGab 33aa7b5
RCC passing basic tests
GomezGab e6cf5fe
More testing of RCC and setting up cumsum
GomezGab f9ed6f1
Comment changes to RCC
GomezGab fbfe13a
Merge branch 'GraphBLAS:v1.2' into v1.2
GomezGab 02d9cba
minor updates to burble
DrTimothyAldenDavis be452a8
Preliminary testing for SwapEdges
GomezGab 4f8a8f5
Swap Edges Tests Passing. Singleton Graphs not working.
GomezGab ec130e3
Fixed Tests and Self Edges and Parallel Edges being Generated
GomezGab f4aa901
Added demos, small optimizations
GomezGab c0a771c
Edge Swap optimizations
GomezGab fa44964
speed up RCC 4x by using row and col scale
GomezGab b02b68a
sped up Swap Edges by reducing interf search
GomezGab 94157fe
Modified demos
GomezGab 7bc9469
Merge branch 'GraphBLAS:v1.2' into v1.2
GomezGab 45b8aec
Swap_Edges hash
GomezGab 2c168ab
Merge branch 'v1.2' of github.com:GomezGab/LAGraph into my_v1.2
GomezGab 2971ab1
Cleaned up demo and Swap variables
GomezGab e5a3c6c
Simplified RCC Calculation
GomezGab b5e0688
fixes to swap edges
GomezGab 37a9d41
Changed from using incidence matrix
GomezGab 4bb29b9
Cleaned up old variables and clarified names
GomezGab 4235cd0
Modified E to Row Full
GomezGab b70d943
Random init fixed
GomezGab ab94b88
Reduce bug fix
GomezGab aac33c3
Fixed column full pack
GomezGab 0a22c3b
Changed how I find duplicate edges
GomezGab 8cf6e3f
Fixed memory leak
GomezGab 377fbbd
Removed permutation matrix
GomezGab 250b262
Buckets for hashes
GomezGab a046147
Revert "Buckets for hashes"
GomezGab 51ab705
switching verticies of edges pre swap
GomezGab d596a62
vectorise edges
GomezGab a14ab12
Merge branch 'v1.2' of github.com:GomezGab/LAGraph into v1.2
GomezGab d61805a
inplace swapping using E vector
GomezGab 0e37a78
fixed randomized swapping
3a29b63
Merge branch 'GraphBLAS:v1.2' into v1.2
GomezGab b9bfc4b
Simplified initial permute
GomezGab 1fb51c8
faster unary ops for swaps
GomezGab 8c9022d
Vectorised most thin matricies
GomezGab d4fb00d
Cleaning up prints and testing permutes
GomezGab 09cbbaa
Changed method for perm
GomezGab bafe70e
Hash set testing
GomezGab d564cc3
modifying hash set functions
GomezGab e5a8108
Added CSC magic to testing
GomezGab 642340a
Changed subassign to matrix concat
GomezGab 215f23e
Merge branch 'GraphBLAS:v1.2' into v1.2
GomezGab 4d3fe94
Changed method for hashing edges
GomezGab 1fc7d5d
Merge branch 'v1.2' of github.com:GomezGab/LAGraph into v1.2
GomezGab 3d4e393
Modified duplication finding. Not passing tests
GomezGab b5bc2d2
new hashing method
GomezGab a56361e
Cleaned up RCC code
GomezGab cf75705
added add_term, not yet in use
GomezGab af10685
Fixed counter overflow
GomezGab 6665d46
Merge branch 'GraphBLAS:v1.2' into v1.2
GomezGab f36df04
trigger JIT bug in GraphBLAS
DrTimothyAldenDavis 285f945
targeting saxpy4 and ONEB now working
GomezGab 8a893a4
Merge branch 'v1.2' into with_GraphBLAS_v10
GomezGab e27baef
Added the FastBuild method using load/unload
GomezGab e904936
singleton bug fix and test added
GomezGab 05d774f
Merge branch 'GraphBLAS:with_GraphBLAS_v10' into with_GraphBLAS_v10
GomezGab 34761ea
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab 381ef58
Incidence Matrix general type
GomezGab a315e4e
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab 8b3458b
Merge branch 'with_GraphBLAS_v10' of github.com:GomezGab/LAGraph into…
GomezGab f822e4d
FastBuild -> FastAssign
GomezGab c1d0255
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab 06a6451
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab 5c0edbc
added FastAssign demo
GomezGab cad2386
FastAssign fixes. Now implemented into FastSV6
GomezGab 9e5f736
Fixed #if's
GomezGab 0f20326
Added FastSV6_SSGrBv10 to benchmark
GomezGab 965c204
added some TODO's
GomezGab 926b28f
merged new incidence matrix
GomezGab 3aa0f59
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab 9a11d29
Fast Assign Semiring and FastSV7_FA
GomezGab 9eadbbd
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab 92cd9c9
Added vanilla RCC algorithm
GomezGab 704b16a
Fast Assign transpose and comments
GomezGab 6c370c0
Starting SwapEdgesV2
GomezGab 5bbfc6e
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab 9811a72
Merge branch 'fastAssign_GraphBLAS_10' of github.com:GomezGab/LAGraph…
GomezGab 510ded2
added comments and FastSV7_FA brutal
GomezGab 8f4b309
Merge branch 'fastAssign_GraphBLAS_10' of github.com:GomezGab/LAGraph…
GomezGab 06cec2c
fixed brutal test CC
GomezGab 2d15c0e
Merge branch 'fastAssign_GraphBLAS_10' of github.com:GomezGab/LAGraph…
GomezGab 9d133b1
Fixed typo in brutal CC test
GomezGab 06d289b
Merge branch 'fastAssign_GraphBLAS_10' of github.com:GomezGab/LAGraph…
GomezGab 67334da
Remove SwapEdges: not ready to merge
GomezGab 137a271
Restored files changed in error
GomezGab 0c85a8a
Changed strategy for placing new edges in E_vec to Subassign
GomezGab 068a761
Fixed type getting in LAGraph_FastAssign
GomezGab 6113059
Swap placement strategy FastAssign
GomezGab d8b0205
Changed misleading P type and added an assert
GomezGab 6cdfb53
Merge branch 'fastAssign_GraphBLAS_10' of github.com:GomezGab/LAGraph…
GomezGab 923f838
Temporary Fix for weird Segfault
GomezGab 66dee51
Switched from pack/unpack to load/unload
GomezGab 08e4cbf
added brutal test to rcc and now using fastassign semiring
GomezGab 786ee08
Now working on with saxpy4 of GBv10.0.1
GomezGab 3950a76
changed dupswap lookup
GomezGab c5a9cb9
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab 21a3a95
Fixed input params RCC
GomezGab 0941d38
check GBSS for brutal test
GomezGab c457ab8
Merge branch 'fastAssign_GraphBLAS_10' into rcc_butal_test
GomezGab de022cf
Fixed fast assign monoid for all but UDTs
GomezGab f860c57
fix FA return & small rcc changes
GomezGab b74b3a0
Merge branch 'RCC_GB10' into SwapEdges_GB10
GomezGab 82549a2
Removed last pack operation
GomezGab 08cb4f8
added file export to swap demo
GomezGab 53f7297
Mar 19 meeting: __builtin_clzl
DrTimothyAldenDavis aa1fa5d
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab de02b6e
Filled node_edges for faster mxv
GomezGab 90602ae
Renamed variables and changed output of RCC
GomezGab a7a119a
intial Swap Edges int 32 support
GomezGab 3008138
Merge branch 'SwapEdges_GB10' of github.com:GomezGab/LAGraph into Swa…
GomezGab 1d124fd
removed debug statements
GomezGab ab7164e
debug statements
GomezGab 50c9893
Merge branch 'RCC_GB10' into SwapEdges_GB10
b49af6e
merged RCC branch
5e2724d
Added Build to FA demo
GomezGab 26382a4
Turned off demo burble and fixed test
GomezGab 614727b
Demo prebuilt ramp
GomezGab c6b4dd9
Added single threaded non-GB RCC algo
GomezGab 25c271e
changed eq op
GomezGab bc8baee
Parrallelizing non-GB approach
GomezGab 6d81f7f
Parallel NoGB Fix
GomezGab cd880b4
Fixed RCC for earlier GB versions. Speed Up No GB.
GomezGab 71afb0f
Removed FastAssign demo on lower GB versions
GomezGab 063ed7e
NoGB returns NOT IMPLEMENTED for GB <v10
GomezGab 111c380
Merge remote-tracking branch 'origin/RCC_GB10' into SwapEdges_GB10
GomezGab 38c30ba
removed void ptr functions
GomezGab b4f2f44
remove old swapedges file
GomezGab 7a84b29
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab c0f0e47
renamed function and changed demo call
GomezGab 6915cc9
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab 1f73428
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab de56aaf
Merge branch 'SwapEdges_GB10' into RCC_GB10
GomezGab e430c2c
Moved out the rcc checker
GomezGab 846c471
include rcc check on demo
GomezGab 3410828
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab 767c29a
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab f671b86
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab 827480f
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab ae9d178
LG_Random fixes and starting test cov
GomezGab a4b9041
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab ba69d16
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab b7c8d32
Remove test check for older versions
GomezGab 8e6c242
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab 1a2a052
more coverage and added paper
GomezGab a4daaf4
hack fast_assign
DrTimothyAldenDavis 2d14265
Merge branch 'RCC_GB10' of github.com:GomezGab/LAGraph into RCC_GB10
GomezGab fa59ff5
Test cov 100
GomezGab 623c72d
Merge branch 'with_GraphBLAS_v10' of github.com:GraphBLAS/LAGraph int…
GomezGab a7e86e5
move USING_GRAPHBLAS_V10 definition
GomezGab File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.