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

Revised getitem operation for masked jagged indexers #322

Merged
merged 11 commits into from Jul 9, 2020

Conversation

nsmith-
Copy link
Contributor

@nsmith- nsmith- commented Jul 7, 2020

First pass, some new kernels will need to be made.

First pass, some new kernels will need to be made
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.

Thanks a lot! I just have a lot of little comments.

src/libawkward/Content.cpp Outdated Show resolved Hide resolved
src/libawkward/array/ByteMaskedArray.cpp Outdated Show resolved Hide resolved
src/libawkward/array/IndexedArray.cpp Outdated Show resolved Hide resolved
src/libawkward/Content.cpp Outdated Show resolved Hide resolved
src/libawkward/Content.cpp Outdated Show resolved Hide resolved
src/libawkward/Content.cpp Outdated Show resolved Hide resolved
src/libawkward/array/IndexedArray.cpp Outdated Show resolved Hide resolved
src/libawkward/Content.cpp Outdated Show resolved Hide resolved
src/libawkward/Content.cpp Outdated Show resolved Hide resolved
@nsmith- nsmith- marked this pull request as ready for review July 8, 2020 22:13
@nsmith-
Copy link
Contributor Author

nsmith- commented Jul 8, 2020

I think the functionality is there now. I think the boilerplate for kernels is pretty out of hand, would be nice to find a way to reduce it. Remaining items:

  • How do I auto-format to 80 characters?
  • Where do I put some documentation of this behavior?
  • Why is the doctest failing

@jpivarski
Copy link
Member

  • How do I auto-format to 80 characters?

We don't have a tool for that; I did it by hand. If it's roughly or mostly 80 characters, that is fine.

  • Where do I put some documentation of this behavior?

__getitem__ behavior is documented here: https://github.com/scikit-hep/awkward-1.0/blob/cfa3a04d679529175e742fb5015047bd499ea1a6/src/awkward1/highlevel.py#L507-L843

  • Why is the doctest failing

Merge upstream master; it was fixed today (PR #323).

@jpivarski
Copy link
Member

I'm going to merge your branch with master, which should fix the doctest.

After that, it's done, right? You're not planning any more changes?

@jpivarski
Copy link
Member

We're going to ignore the doctest error; I'll ask Reik to look into that after all the merges are done.

Assuming all the other tests pass, should I merge this? I'm dealing with the compiler warnings on another PR.

@nsmith-
Copy link
Contributor Author

nsmith- commented Jul 9, 2020

Ok, now that its formatted and docs are added, I think its ready

@nsmith-
Copy link
Contributor Author

nsmith- commented Jul 9, 2020

Closes #315

@jpivarski jpivarski merged commit b89c73f into scikit-hep:master Jul 9, 2020
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.

None yet

2 participants