-
Notifications
You must be signed in to change notification settings - Fork 18
Cache and decorator improvements #339
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
Open
ethanbb
wants to merge
11
commits into
nel-lab:master
Choose a base branch
from
proektlab:ignore-return-copy
base: master
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.
Open
Conversation
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
…provements to cache; clean up component index decorator
ethanbb
commented
Sep 8, 2025
elif add_residuals: | ||
temporal += cnmf_obj.estimates.f | ||
|
||
if add_residuals: |
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.
Change in behavior here but it seemed like a bug...if background + residuals is not allowed it should at least warn or error.
Oh shoot this doesn't work in 3.9. Are we still supporting 3.9? |
…yping more complicated
…use it can be accessed without keeping CNMF obj in cache
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #80, fixes #338. This started as a fix to #80 and the scope expanded a bit because I also wanted to get typing right.
Here are the main changes:
return_copy
and the extensions instance, and uses that for comparisons with cache items. This prevents unnecessary cache misses when functions are called in different ways. The "args" column was removed.return_copy
is enforced to be a keyword-only argument. Also, the default value ofreturn_copy
is actually read and used by the cache decorator. Ifreturn_copy
is passed to the decorator, that value is always used and it cannot be passed to the decorated function (this feature is currently not used)_component_indices_parser
more precise wrt types...I was going to do something more drastic but realized it's better not to change the signature of functions with decorators.wrapsmethod
to use instead offunctools.wraps
because the latter doesn't work well with methods when type checking, for some reason. This way at least pylance correctly recognizes the signatures of decorated methods in cnmf.py and highlights some minor errors regarding them. I didn't fix most of these though because they're really from type ambiguity in CaImAn and I didn't want to add a bunch of assertions to band-aid that.get_temporal
only adding either background or residuals, but not both even if both were requested (this seemed like a bug)test_cache
to take these changes into account.