Skip to content

Commit

Permalink
Merge branch 'main' into unproject-layout-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
douglasdavis authored Aug 9, 2023
2 parents e3da7f6 + 74bd201 commit 7b47972
Show file tree
Hide file tree
Showing 12 changed files with 508 additions and 190 deletions.
1 change: 1 addition & 0 deletions .github/envs/environment-3.10.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ dependencies:
- awkward
- dask-histogram
- uproot
- hist
1 change: 1 addition & 0 deletions .github/envs/environment-3.8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ dependencies:
- awkward
- dask-histogram
- uproot
- hist
1 change: 1 addition & 0 deletions .github/envs/environment-3.9.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ dependencies:
- awkward
- dask-histogram
- uproot
- hist
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ repos:
- --target-version=py38

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.0.280
rev: v0.0.282
hooks:
- id: ruff

Expand All @@ -32,7 +32,7 @@ repos:
language_version: python3

- repo: https://github.com/asottile/pyupgrade
rev: v3.9.0
rev: v3.10.1
hooks:
- id: pyupgrade
args:
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"awkward": ("https://awkward-array.org/doc/stable/", None),
}

autodoc_typehints = "none"
autodoc_typehints = "description"

pygments_style = "default"

Expand Down
3 changes: 3 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,14 @@ docs = [
]
test = [
"dask-awkward[complete]",
"dask-histogram",
"distributed",
"hist",
"pandas",
"pytest >=6.0",
"pytest-cov >=3.0.0",
"requests >=2.27.1",
"uproot",
]

[project.entry-points."dask.sizeof"]
Expand Down
109 changes: 93 additions & 16 deletions src/dask_awkward/__init__.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,96 @@
from dask_awkward import config # isort:skip; load awkward config


import dask_awkward.lib.core as core
import dask_awkward.lib.describe as describe
import dask_awkward.lib.inspect as inspect
import dask_awkward.lib.operations as operations
import dask_awkward.lib.optimize as optimize
import dask_awkward.lib.reducers as reducers
import dask_awkward.lib.structure as structure
from dask_awkward.lib.core import Array, PartitionCompatibility, Record, Scalar
from dask_awkward.lib.core import _type as type
from dask_awkward.lib.core import (
compatible_partitions,
map_partitions,
partition_compatibility,
typetracer_from_form,
)
from dask_awkward.lib.describe import fields
from dask_awkward.lib.inspect import necessary_columns, sample
from dask_awkward.lib.io.io import (
ImplementsFormTransformation,
from_awkward,
from_dask_array,
from_delayed,
from_lists,
from_map,
to_dask_array,
to_dask_bag,
to_dataframe,
to_delayed,
)
from dask_awkward.lib.io.json import from_json, to_json
from dask_awkward.lib.io.parquet import from_parquet, to_parquet
from dask_awkward.lib.operations import concatenate
from dask_awkward.lib.reducers import (
all,
any,
argmax,
argmin,
corr,
count,
count_nonzero,
covar,
linear_fit,
max,
mean,
min,
moment,
prod,
ptp,
softmax,
std,
sum,
var,
)
from dask_awkward.lib.structure import (
argcartesian,
argcombinations,
argsort,
broadcast_arrays,
cartesian,
combinations,
copy,
drop_none,
fill_none,
firsts,
flatten,
from_regular,
full_like,
is_none,
isclose,
local_index,
mask,
nan_to_num,
num,
ones_like,
pad_none,
ravel,
run_lengths,
singletons,
sort,
strings_astype,
to_packed,
to_regular,
unflatten,
unzip,
values_astype,
where,
with_field,
with_name,
with_parameter,
without_parameters,
zeros_like,
zip,
)
from dask_awkward.version import __version__


def __getattr__(value):
import dask_awkward.lib

return getattr(dask_awkward.lib, value)


original = dir()


def __dir__():
import dask_awkward.lib # pragma: no cover

return original + dir(dask_awkward.lib) # pragma: no cover
7 changes: 5 additions & 2 deletions src/dask_awkward/lib/io/io.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,11 @@ def from_awkward(
"""
nrows = len(source)
chunksize = int(math.ceil(nrows / npartitions))
locs = list(range(0, nrows, chunksize)) + [nrows]
if nrows == 0:
locs = [None, None]
else:
chunksize = int(math.ceil(nrows / npartitions))
locs = list(range(0, nrows, chunksize)) + [nrows]
starts = locs[:-1]
stops = locs[1:]
meta = typetracer_array(source)
Expand Down
Loading

0 comments on commit 7b47972

Please sign in to comment.