Datashift - Rigid and Segmented Registration#29
Open
alexmorley wants to merge 14 commits into
Open
Conversation
- eMouse simulation example - Jenkins report builder - Simple comparison analysis
* 'master' of github.com:rossant/pykilosort: Typed Configuration (MouseLand#28) Comparison between MATLAB & Python Versions (MouseLand#25) Add dockerfile for running tests with GPU (MouseLand#22)
alexmorley
force-pushed
the
datashift
branch
from
September 8, 2020 08:00
aaf4f4e to
6ebc8c9
Compare
alexmorley
changed the title
alexmorley
marked this pull request as ready for review
September 14, 2020 00:18
alexmorley
commented
Sep 21, 2020
| counter = np.zeros(2, dtype=np.int32, order='F') | ||
|
|
||
| # filter the data with the temporal templates | ||
| Conv1D = cp.RawKernel(code, 'Conv1D') |
Collaborator
Author
There was a problem hiding this comment.
@kushbanga was this Conv1D function the one you said had a bug?
alexmorley
commented
Sep 21, 2020
| @@ -0,0 +1,10 @@ | |||
| 0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0,7.5,17.6706,7.5,0,16,0 | |||
Collaborator
Author
There was a problem hiding this comment.
These files are for regression tests.
Collaborator
Author
There was a problem hiding this comment.
(the output is from the MATLAB version)
alexmorley
commented
Sep 21, 2020
|
|
||
| TEST_DATA_FOLDER = "tests/fixtures/data" | ||
|
|
||
| @pytest.mark.requires_gpu |
Collaborator
Author
There was a problem hiding this comment.
Not sure this one does require gpu...
Collaborator
Author
|
Suggestion from @kushbanga. Let's add a test against the MATLAB version that the depth shift is exactly the same for each time segment. |
* 'master' of github.com:rossant/pykilosort: fixes bug fix minor fix
…ashift * 'datashift' of github.com:alexmorley/pykilosort: minor bug
alexmorley
commented
Oct 15, 2020
|
|
||
| # upsample the shift for each channel using interpolation | ||
| if len(ysamp) > 1: | ||
| # zero pad input so "extrapolation" tends to zero |
Collaborator
Author
There was a problem hiding this comment.
NB: Makima vs zero-padded Akima
Collaborator
Author
There was a problem hiding this comment.
Try:
- regression towards mean
- mirror
alexmorley
commented
Oct 15, 2020
| ) # this kernel is fixed as a variance of 1 | ||
| dcs = cp.array(dcs) | ||
| # dcs = my_conv2_cpu(dcs, .5, [0,1,2]) | ||
| for i in range(dcs.shape[0]): |
Collaborator
Author
There was a problem hiding this comment.
conv bug in MATLAB??
Collaborator
Author
|
@kushbanga I just pushed a bunch of fixes that I had sitting on my laptop just FYI! |
Collaborator
Author
|
more tests here alexmorley/kilosort-testing#2 |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
V1 working version of datashift.
Probably could use a) a couple more unit tests and b) better integration with the sorting flow.
Check for: