-
Notifications
You must be signed in to change notification settings - Fork 2
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
feat: working numpy arrays for methods that return arrays #14
Merged
Conversation
This file contains 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
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #14 +/- ##
==========================================
+ Coverage 15.00% 24.90% +9.90%
==========================================
Files 2 2
Lines 180 257 +77
Branches 141 183 +42
==========================================
+ Hits 27 64 +37
- Misses 18 33 +15
- Partials 135 160 +25 ☔ View full report in Codecov by Sentry. |
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.
this closes #1, adding proper numpy bindings for things that need to return arrays, like
getImage()
. All arrays are read-only views of the C++ memory buffer owned by the core objectRefactoring and Enhancements:
meson.build
: Updated the script run command to usepatch_sources.py
instead ofpatch_c14_c17.py
to apply necessary patches and bring code up to C++17.scripts/patch_sources.py
: Introduced a new script that consolidates and extends the functionality ofpatch_c14_c17.py
, including additional patching for image metadata error handling.Image Handling Improvements:
src/_pymmcore_nano.cc
: Added helper functions to create NumPy arrays from image data and metadata, and extended theCMMCore
methods to return these arrays. This includes new overloads for methods likegetLastImageMD
andpopNextImageMD
to return both image and metadata. [1] [2] [3] [4] [5]Type Annotations:
src/_pymmcore_nano.pyi
: Updated type annotations to useAnnotated[ArrayLike, dict(writable=False)]
for image-related methods in theCMMCore
class, ensuring that returned NumPy arrays are read-only. Added new exception classesMetadataIndexError
andMetadataKeyError
. [1] [2] [3] [4]Testing:
tests/test_core.py
: Addednumpy
import and updated thedemo_core
function to include a system wait to ensure the demo configuration is fully loaded before proceeding with tests. [1] [2]