-
Notifications
You must be signed in to change notification settings - Fork 9
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
#941 added subphase support to loadComm #1081
#941 added subphase support to loadComm #1081
Conversation
Codecov Report
@@ Coverage Diff @@
## develop #1081 +/- ##
========================================
Coverage 75.60% 75.61%
========================================
Files 719 719
Lines 27239 27255 +16
========================================
+ Hits 20595 20609 +14
- Misses 6644 6646 +2
|
So, to carry this the rest of the way through, we'll need a per-subphase structure alongside |
vt/src/vt/vrt/collection/balance/node_stats.h Lines 257 to 267 in 1a4c8bc
So I see there is a node_subphase_data_ structure on line 257. Is this not a sufficient structure for this implementation? Ah, as I wrote this I saw something on line 267. Would |
I think you will to refactor to be |
@lifflander @PhilMiller |
aa73485
to
4919ca3
Compare
It looks like the last commit, "Checkpoint before rebase", reverts all of the intended changes in the rest of the PR. |
Ok. Do I revert back to the previous commit then push? |
I think you would want to |
4919ca3
to
3326259
Compare
Yep that is what I ended up doing. I force pushed the commit. |
As for the conflicts; which side of the conflict do I take? I assume I should be taking the side from develop and not my own branch? The conflicts appear to be from the runtime library. |
There shouldn't be conflicts at all - your changes don't touch those files. |
3326259
to
655358f
Compare
9943029
to
f2ad333
Compare
f2ad333
to
dcb917c
Compare
fixes #941 implementing subphases in loadComm