Skip to content
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

fix: merging 1D NumpyArray with option #2105

Merged
merged 2 commits into from
Jan 12, 2023

Conversation

agoose77
Copy link
Collaborator

@agoose77 agoose77 commented Jan 12, 2023

This used to work; I broke this in #2063 by removing this code block. I'm not sure how I managed to do so, I must have been tired and confused the ND NumpyArray duplicated code with the 1D case (that we still need).

Fixes #2104

@agoose77 agoose77 force-pushed the agoose77/fix-mergeable-numpy-option branch from a9c86d2 to 5175d25 Compare January 12, 2023 12:38
@agoose77 agoose77 temporarily deployed to docs-preview January 12, 2023 12:49 — with GitHub Actions Inactive
@codecov
Copy link

codecov bot commented Jan 12, 2023

Codecov Report

Merging #2105 (5175d25) into main (6efa287) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Additional details and impacted files
Impacted Files Coverage Δ
src/awkward/contents/numpyarray.py 91.22% <100.00%> (+0.03%) ⬆️
src/awkward/contents/unmaskedarray.py 73.19% <0.00%> (+0.42%) ⬆️

Copy link
Member

@jpivarski jpivarski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And I didn't catch it!

Yes, each _mergeable_next (except possibly indexed/optional types?) should start by asking if the other is indexed/optional.

@jpivarski jpivarski merged commit 969c73b into main Jan 12, 2023
@jpivarski jpivarski deleted the agoose77/fix-mergeable-numpy-option branch January 12, 2023 19:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

NumpyArray merging is broken with option types
2 participants