Skip to content

fix: backport vendored mixin from #2534#2583

Merged
agoose77 merged 7 commits intomain-v1from
agoose77/fix-backport-mixin-vendor
Jul 19, 2023
Merged

fix: backport vendored mixin from #2534#2583
agoose77 merged 7 commits intomain-v1from
agoose77/fix-backport-mixin-vendor

Conversation

@agoose77
Copy link
Copy Markdown
Collaborator

@agoose77 agoose77 commented Jul 17, 2023

This PR uses only the vendored NDArrayOperatorsMixin mixin class (without __slots__) from #2534

@agoose77 agoose77 changed the base branch from main to main-v1 July 17, 2023 17:26
agoose77
agoose77 commented Jul 17, 2023
View reviewed changes
src/awkward/_v2/operations/ak_to_layout.py
)

elif ak.nplike.is_jax_buffer(array) and type(array).__name__ == "DeviceArray":
elif ak.nplike.is_jax_buffer(array):
Copy link
Copy Markdown
Collaborator Author

@agoose77 agoose77 Jul 17, 2023

Choose a reason for hiding this comment

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

Any jaxlib object is now permitted here, which mirrors v2.

@agoose77 agoose77 requested a review from jpivarski July 17, 2023 17:27
@agoose77 agoose77 mentioned this pull request Jul 17, 2023
Merged
jpivarski
jpivarski reviewed Jul 17, 2023
View reviewed changes
Copy link
Copy Markdown
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.

Why is there a _v2 directory? I noticed that NDArrayOperatorsMixin is now defined twice, and then one of them is in the _v2 directory.

This is a good thing to do, though!

@agoose77
Copy link
Copy Markdown
Collaborator Author

agoose77 commented Jul 18, 2023

@jpivarski this is a backport for main-v1, which still has _v2 (although it doesn't receive feature updates). In fact, our unofficial policy for _v2 is that it doesn't get much bugfix support either, because so many bugs are fixed by the large-scale changes in main.

@codecov
Copy link
Copy Markdown

codecov bot commented Jul 18, 2023 •
edited
Loading

Codecov Report

❗ No coverage uploaded for pull request base (main-v1@3375b4a). Click here to learn what that means.
The diff coverage is n/a.

❗ Current head fb3a23d differs from pull request most recent head f2c1ee9. Consider uploading reports for the commit f2c1ee9 to get more accurate results

Additional details and impacted files

@agoose77 agoose77 merged commit 38237d6 into main-v1 Jul 19, 2023
@agoose77 agoose77 deleted the agoose77/fix-backport-mixin-vendor branch July 19, 2023 07:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jpivarski jpivarski jpivarski left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@agoose77 @jpivarski