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

C++ refactoring: ak.concatenate #1161

Merged
merged 10 commits into from
Nov 30, 2021
Merged

C++ refactoring: ak.concatenate #1161

merged 10 commits into from
Nov 30, 2021

Conversation

ioanaif
Copy link
Collaborator

@ioanaif ioanaif commented Nov 22, 2021

No description provided.

@codecov
Copy link

codecov bot commented Nov 22, 2021

Codecov Report

Merging #1161 (3a3c91c) into main (f795658) will increase coverage by 1.56%.
The diff coverage is 76.45%.

Impacted Files Coverage Δ
src/awkward/_v2/forms/bitmaskedform.py 75.64% <ø> (ø)
src/awkward/_v2/forms/bytemaskedform.py 76.05% <ø> (ø)
src/awkward/_v2/forms/emptyform.py 78.84% <ø> (+1.92%) ⬆️
src/awkward/_v2/forms/indexedoptionform.py 76.81% <ø> (ø)
src/awkward/_v2/forms/listform.py 75.94% <ø> (ø)
src/awkward/_v2/forms/listoffsetform.py 81.94% <ø> (+1.38%) ⬆️
src/awkward/_v2/forms/recordform.py 66.46% <ø> (ø)
src/awkward/_v2/forms/regularform.py 75.34% <ø> (ø)
src/awkward/_v2/forms/unionform.py 76.19% <ø> (ø)
src/awkward/_v2/forms/unmaskedform.py 74.57% <ø> (ø)
... and 78 more

@ioanaif ioanaif marked this pull request as ready for review November 24, 2021 00:12
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.

I can see how much went into this—thank you! However, I wasn't clear enough about the new broadcast_and_apply and recursively_apply interfaces, which are in _broadcasting.py and the Content class, respectively. What you've done below takes us to 90% of the implementation, but some arguments need to change to use the new interfaces. After that, the broadcast_and_apply and transform/transform_layouts functions you ported in _v2/_util.py won't be needed.

src/awkward/_v2/_util.py Outdated Show resolved Hide resolved
src/awkward/_v2/_util.py Outdated Show resolved Hide resolved
src/awkward/_v2/_util.py Outdated Show resolved Hide resolved
src/awkward/_v2/contents/content.py Outdated Show resolved Hide resolved
src/awkward/_v2/operations/structure/ak_concatenate.py Outdated Show resolved Hide resolved
src/awkward/_v2/operations/structure/ak_fill_none.py Outdated Show resolved Hide resolved
@jpivarski jpivarski enabled auto-merge (squash) November 30, 2021 16:21
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.

Thank you very much for fixing that (and finding a few untested parts of _broadcasting.py). The commit I just made was to remove some commented-out code, that's all. It's set to auto-merge when the tests pass again.

@ioanaif
Copy link
Collaborator Author

ioanaif commented Nov 30, 2021

Thank you very much for fixing that (and finding a few untested parts of _broadcasting.py). The commit I just made was to remove some commented-out code, that's all. It's set to auto-merge when the tests pass again.

Thank you! Great! Happy to have this merged!

@jpivarski jpivarski merged commit 9955401 into main Nov 30, 2021
@jpivarski jpivarski deleted the ioanaif/ak.concatenate branch November 30, 2021 16:59
@douglasdavis
Copy link
Contributor

Woohoo! Thanks for this 😄

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.

3 participants