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

split up functions #1397

Merged
merged 11 commits into from
Apr 19, 2022
Merged

split up functions #1397

merged 11 commits into from
Apr 19, 2022

Conversation

martindurant
Copy link
Contributor

Quite aside from the options we talked about for various ways to handle file layout, this kind of splitting up of functionality is very helpful for reusing the code in dask. I haven't checked whether this actually works yet, I probably mistyped along the way, but I wanted to show the idea.

@jpivarski
Copy link
Member

It's a good factorization. Be aware that your git submodules are out of date, and that's why they're being counted as diffs in this PR. @agoose77 also suggested turning the ErrorContext manager into a decorator, which is something we should do across all the functions, not in this PR.

@martindurant
Copy link
Contributor Author

your git submodules are out of date

Remind me how to make this go away?

something we should do across all the functions, not in this PR.

Agreed - it's here because it helped me reason about what the code was doing.

@jpivarski
Copy link
Member

your git submodules are out of date

Remind me how to make this go away?

I don't remember the git commands, so I always just clone a new repo.

I just looked it up: you cd into the submodule directory and then git checkout using the submodule's commit hash. It will be a detached HEAD; that's fine.

  • dlpack: e1e11e0d555c08bec08a6c7773aa777dfcaae9da
  • pybind11: ffa346860b306c9bbfb341aed9c14c067751feb8
  • rapidjson: f54b0e47a08782a6131cc3d60f94d038fa6e0a51

@codecov
Copy link

codecov bot commented Apr 18, 2022

Codecov Report

Merging #1397 (34e04c3) into main (edfce38) will decrease coverage by 0.68%.
The diff coverage is 45.76%.

Impacted Files Coverage Δ
src/awkward/_v2/_connect/cuda/__init__.py 0.00% <0.00%> (ø)
src/awkward/_v2/_connect/jax/__init__.py 0.00% <0.00%> (ø)
src/awkward/_v2/contents/content.py 81.91% <0.00%> (-0.13%) ⬇️
src/awkward/_v2/operations/convert/ak_from_cupy.py 50.00% <0.00%> (+23.33%) ⬆️
src/awkward/_v2/operations/convert/ak_from_iter.py 93.75% <ø> (ø)
src/awkward/_v2/operations/convert/ak_from_jax.py 50.00% <0.00%> (-25.00%) ⬇️
src/awkward/_v2/operations/convert/ak_to_cupy.py 33.33% <0.00%> (+23.95%) ⬆️
src/awkward/_v2/operations/convert/ak_to_jax.py 33.33% <0.00%> (-41.67%) ⬇️
src/awkward/_v2/operations/describe/ak_backend.py 10.00% <0.00%> (-2.50%) ⬇️
src/awkward/_v2/operations/reducers/ak_count.py 95.83% <ø> (ø)
... and 55 more

@martindurant
Copy link
Contributor Author

OK, @jpivarski , this actually runs. It still does not handle _metadata or directory partitioning, but there should be enough here for dask-awkward to use.

(cc @douglasdavis , since we talked about this)

@jpivarski
Copy link
Member

I'll be looking it over more carefully soon. In the meantime, I just want to make sure that this PR wouldn't change the pybind11 version.

@jpivarski jpivarski marked this pull request as ready for review April 19, 2022 20:45
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.

This looks done to me! @martindurant, is there anything else you want to do in this PR? Otherwise, I'll be merging it.

@jpivarski jpivarski merged commit 04eaee1 into scikit-hep:main Apr 19, 2022
jpivarski added a commit that referenced this pull request Apr 19, 2022
jpivarski added a commit that referenced this pull request Apr 19, 2022
jpivarski added a commit that referenced this pull request Apr 19, 2022
* Fixed a bug in RecordArray.to_arrow and consequences for from_arrow.

* conservative_optiontype -> generate_bitmasks because it no longer controls whether an array is option-type.

* More concise option[string/bytes/char/byte] type string.

* Merged with main (and #1397).
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.

2 participants