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

Draft: Add Maximum matching algorithm in experimental #254

Draft
wants to merge 61 commits into
base: v1.2
Choose a base branch
from
+1,374 −1
Draft

Draft: Add Maximum matching algorithm in experimental #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
3a9d316
Add initial commit of maximum matching
kchristin22 Jun 5, 2024
2906e70
Fix initialization of frontierC and add test for debugging purposes
kchristin22 Jun 6, 2024
e2bb41a
Add test of semiring in MCM
kchristin22 Jun 7, 2024
d8b48fa
Discard visited rows and Set parents of newly visited rows
kchristin22 Jun 7, 2024
9f49b4c
Compute mateR through inverting mateC
kchristin22 Jun 8, 2024
ee80f27
Update pathC
kchristin22 Jun 10, 2024
efbc6ea
Fix vector_build usage
kchristin22 Jun 12, 2024
402f381
Draft: Add PRUNE function
kchristin22 Jun 12, 2024
23d648b
Finish PRUNE function
kchristin22 Jun 13, 2024
8c761f7
Improve PRUNE, finish inner loop body and clean up
kchristin22 Jun 14, 2024
5112c8d
Implement comments
kchristin22 Jun 20, 2024
d28e141
Draft: fix previous build warning, add augment and test multiple iter…
kchristin22 Jun 20, 2024
18f23b2
Use mateR copy for each iteration and check if vectors are empty befo…
kchristin22 Jun 21, 2024
80a08e4
Improve descriptor in ur assignment and add explanation in a comment
kchristin22 Jun 21, 2024
582a59c
Fix how parents of fR are updated
kchristin22 Jun 24, 2024
6671d1e
Delete unnecessary allocations and wrong deallocations to avoid memor…
kchristin22 Jun 24, 2024
c9b5670
Use jumble flag of pack when inverting and allow indices to be unsort…
kchristin22 Jun 24, 2024
42479d7
Fix LAGraph_Free calls
kchristin22 Jun 24, 2024
610304f
Make I a bool vector, add another vector to copy to output and free w…
kchristin22 Jun 25, 2024
2c8c11c
Add the burble and evaluation of the matching in MCM test
kchristin22 Jun 25, 2024
f872354
Fix shared jumbled var among vectors bug
kchristin22 Jun 26, 2024
f3a5c0b
Test with a matrix from the data set of LAGraph
kchristin22 Jun 26, 2024
4032a53
Add second test and comment out any debugging prints
kchristin22 Jun 27, 2024
bddfc36
Specify nvals name per vector
kchristin22 Jun 27, 2024
eaf9d0e
Parametrize tests of multiple data sets
kchristin22 Jun 27, 2024
52fce12
Change input graph to matrix to support rectangular adjacency matrices
kchristin22 Jun 27, 2024
4091ddb
Change input graph of MaximumMatching to matrix
kchristin22 Jun 27, 2024
31c67d1
Use ur vector to compute mateR instead of inverting mateC
kchristin22 Jun 28, 2024
325e9bc
Fix and improve the algorithm
kchristin22 Jul 1, 2024
3b1b6a6
Merge remote-tracking branch 'upstream/v1.2' into maximum-matching
kchristin22 Jul 3, 2024
0faf31a
Revert vscode changes
kchristin22 Jul 3, 2024
ccd3a56
Merge apply and assign operations for the parentsR update
kchristin22 Jul 3, 2024
3239a8f
Change update operations to use a mask instead of an extension accumu…
kchristin22 Jul 3, 2024
f7f5f75
Use extracted jumbled var for mateC pack operation
kchristin22 Jul 3, 2024
0752b16
Add test cases where JIT is off and the mateC is not empty at the beg…
kchristin22 Jul 5, 2024
f8ee5d3
burble
DrTimothyAldenDavis Jul 5, 2024
c5bd7bd
July 5th code session
DrTimothyAldenDavis Jul 5, 2024
32152a5
Work on FIXME comments
kchristin22 Jul 8, 2024
180f964
Finish helper invert functions and polish them
kchristin22 Jul 8, 2024
5a09563
Specify the steps of the algorithm as indicated in the paper
kchristin22 Jul 8, 2024
b691eac
Initial benchmark for MCM
kchristin22 Jul 9, 2024
dea5618
Add push-pull optimization and enable it in tests and benchmarks
kchristin22 Jul 11, 2024
cedcc81
comments and timing
DrTimothyAldenDavis Jul 11, 2024
8b086f7
Fix mateC initialization on the test
kchristin22 Jul 11, 2024
bd45f2e
starting to add A,AT options
DrTimothyAldenDavis Jul 11, 2024
6a40f82
.
DrTimothyAldenDavis Jul 11, 2024
141df7b
add check of input/output of invert
DrTimothyAldenDavis Jul 11, 2024
1f18d60
Fix setting of mateR and inverting of vr in the augment function
kchristin22 Jul 11, 2024
96839fa
debugging for Orkut matrix, added check_matching
DrTimothyAldenDavis Jul 12, 2024
ce5ead5
Print number of matches in the benchmark
kchristin22 Jul 12, 2024
e41787e
Merge remote-tracking branch 'refs/remotes/origin/maximum-matching' i…
kchristin22 Jul 12, 2024
d63aa7e
Clear frontierC before updating it and clean up
kchristin22 Jul 16, 2024
dd62fd4
Add check of the matching in benchmark and fix memory leakage in tests
kchristin22 Jul 16, 2024
9aed507
Revert mateR update method and use one trial for the benchmarks
kchristin22 Jul 16, 2024
df0c3e0
Apply mask separately in vxm
kchristin22 Jul 17, 2024
138d4bc
Use 3 trails in benchamrking for a better sample than having just one
kchristin22 Jul 17, 2024
7373fb4
Fix push-only method
kchristin22 Jul 23, 2024
6b593a9
Allow mateR as initial matching and add mateR as output
kchristin22 Jul 23, 2024
7788238
First half of vanilla version: missing invert2
kchristin22 Jul 24, 2024
edb3df9
Merge vxm and mask operations again for testing
kchristin22 Jul 27, 2024
a06981c
Fix user defined functions
kchristin22 Oct 4, 2024
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
Loading
Loading