Skip to content

Change axis default on a number of functions in uproot-raw codegen #1054

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Change axis default on a number of functions in uproot-raw codegen #1054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
74ab642
Change axis default on a number of functions
ponyisi May 10, 2025
3503b73
Merge branch 'develop' into uproot-raw-axis-1
ponyisi May 12, 2025
8dac89e
Hash update for test
ponyisi May 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 32 additions & 27 deletions code_generator_raw_uproot/servicex/raw_uproot_code_generator/request_translator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2019, IRIS-HEP
# Copyright (c) 2019-2025, IRIS-HEP
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -62,41 +62,46 @@ def run_query(file_path):
rv_arrays_trees.update(a); rv_arrays_histograms.update(b)
return rv_arrays_trees, rv_arrays_histograms

def fa(func, axis=1):
# change the axis argument
import functools
return functools.partial(func, axis=axis)

def run_single_query(file_path, query):
import uproot
import awkward as ak
from tenacity import retry, stop_after_attempt, retry_if_exception_message,\
wait_exponential_jitter

lang = uproot.language.python.PythonLanguage()
lang.functions.update({{ 'concatenate': ak.concatenate,
lang.functions.update({{ 'concatenate': fa(ak.concatenate),
'where': ak.where,
'flatten': ak.flatten,
'flatten': fa(ak.flatten, axis=2),
'num': ak.num,
'count': ak.count,
'count_nonzero': ak.count_nonzero,
'sum': ak.sum,
'nansum': ak.nansum,
'prod': ak.prod,
'nanprod': ak.nanprod,
'any': ak.any,
'all': ak.all,
'min': ak.min,
'nanmin': ak.nanmin,
'max': ak.max,
'nanmax': ak.nanmax,
'argmin': ak.argmin,
'nanargmin': ak.nanargmin,
'argmax': ak.argmax,
'nanargmax': ak.nanargmax,
'moment': ak.moment,
'mean': ak.mean,
'nanmean': ak.nanmean,
'var': ak.var,
'nanvar': ak.nanvar,
'std': ak.std,
'nanstd': ak.nanstd,
'softmax': ak.softmax,
'count': fa(ak.count),
'count_nonzero': fa(ak.count_nonzero),
'sum': fa(ak.sum),
'nansum': fa(ak.nansum),
'prod': fa(ak.prod),
'nanprod': fa(ak.nanprod),
'any': fa(ak.any),
'all': fa(ak.all),
'min': fa(ak.min),
'nanmin': fa(ak.nanmin),
'max': fa(ak.max),
'nanmax': fa(ak.nanmax),
'argmin': fa(ak.argmin),
'nanargmin': fa(ak.nanargmin),
'argmax': fa(ak.argmax),
'nanargmax': fa(ak.nanargmax),
'moment': fa(ak.moment),
'mean': fa(ak.mean),
'nanmean': fa(ak.nanmean),
'var': fa(ak.var),
'nanvar': fa(ak.nanvar),
'std': fa(ak.std),
'nanstd': fa(ak.nanstd),
'softmax': fa(ak.softmax),
'sort': ak.sort,
'argsort': ak.argsort,
'mask': ak.mask,
Expand Down
2 changes: 1 addition & 1 deletion code_generator_raw_uproot/tests/test_src.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def test_generate_code():
'filter_name': ['lbn']},
{'copy_histograms': 'CutBookkeeper*'}
])
expected_hash = "5c3235898f268e81080455c92b7c914e"
expected_hash = "b0bd4d7cf19f52a2ad9719233aa9982f"
result = translator.generate_code(query, tmpdirname)

# is the generated code at least syntactically valid Python?
Expand Down