-
-
Notifications
You must be signed in to change notification settings - Fork 1.5k
MRG, ENH: Abstracted volume registration again #9521
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
Conversation
* upstream/main: MAINT: Speed up CIs (mne-tools#9518) Update tools (mne-tools#9517) FIX: Fix simulate_evoked and apply_forward (mne-tools#9513) FIX: Mayavi (mne-tools#9512)
|
The key commit is 8794813 |
|
So this issue is how you apply a For the other case it would be nice to use the same code, but that seems like a large overhaul of tests and visualizations because they are not functionally equivalent. |
Sure you can, same way as you do for the SDR -- you use
This part I don't understand. What is the "other case" here, non- |
|
You could move the coordinates to aligned space and make the |
|
Basically the commit uses 8794813#diff-780e284e0c926dd24e28047f79e10f0138e800e5a91a35b88c17689edd1909b8R1789 The morph tests suggest the |
The other case being the volumetric source space warp. That one can't just be switched to |
I agree it's slightly simpler internally to use |
Ok, I misunderstood, I think this is great then! My bad just thinking within the |
|
Do you want to try porting over your reg-on-the-fly (and test that it still works!) and any other change(s) from #9515? If it all tests well at your end I'll push a commit to remove all I won't get to it until Tuesday, though, so if you want to take a shot at doing the above as well, feel free. Otherwise if you're more interested in moving on to the GUI stuff feel free to do that! |
Sure, I can do that. I think for the reg-on-the-fly as you call it you have to change 4 tests but not too much (just loosen slightly). I'll take at Alex Gramfort's issue and then get to it. |
I'm only talking about this tutorial change: No changes to internal code for "reg on the fly" (as opposed to hard-coded values) |
Ah I thought you meant you didn't move the |
|
Ok, the example runs at full resolution just fine and all the tests pass! And, thinking about it, it is consistent with how the affine registration is done (applying before each optimization). I'm happy, looks great to merge. |
|
We'll just have to see how long it takes to run on CircleCI. If it's many minutes, we might still want to hard-code the result (and just comment out the high-res / best version). On Tuesday I can add back the SourceMorph changes unless you beat me to it |
It was 2.5 minutes to run locally, that's okay right? |
That's probably too slow for CircleCI -- < 1 min is best for an example like this, and CircleCI is slower than most workstations so it's going to probably take 5+ minutes there if I had to guess (assuming you're not running on an underpowered laptop or anything) |
2:29 when run locally... |
* upstream/main: MAINT: Avoid VTK 9.0.2 [skip actions] [skip circle] (mne-tools#9530) MRG: Test get_montage on fNIRS data (mne-tools#9524) FIX: fix topo plot when large channel distance gives rise to invalid values for arcsin (mne-tools#9528) use Polynomial.fit for poly fitting (mne-tools#9514)
|
This actually isn't as bad as I expected: This might be a problem (<1.5 GB is better): I'll push a commit to comment out the affine since it makes it much faster and memory efficient; locally I saw:
@alexrockhill want to take one last look at the example and make sure everything is okay, then we merge? Here it is: |
|
I would use the |
|
Looks like there is issues with one too many "`" in the warning about zooms for the SDR |
Okay, I thought at one point you said this was no longer necessary, but if it works at least as well why not! I'm planning to put in whatever affine I get from locally using this code, hopefully it matches well what was there before |
You can use |
|
Okay locally it works, I'll go ahead and merge to save the CIs some cycles. Thanks @alexrockhill ! |
|
... I say that then |
* upstream/main: MRG, ENH: Abstracted volume registration again (mne-tools#9521) MAINT: Avoid VTK 9.0.2 [skip actions] [skip circle] (mne-tools#9530) MRG: Test get_montage on fNIRS data (mne-tools#9524) FIX: fix topo plot when large channel distance gives rise to invalid values for arcsin (mne-tools#9528) use Polynomial.fit for poly fitting (mne-tools#9514)
Another version of #9515, but with fewer tests modified. The relevant ones pass locally at least.
@alexrockhill feel free to test _USE_PREALIGN=False to see if it works better now!