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

feat: refactoring the AwkwardForth code-discovery process #943

Merged
merged 82 commits into from
Dec 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
5a9e7af
WIP: Remove AwkwardForth from strings.py
SethBendigo Jun 22, 2023
a20b9d4
Remove AwkwardForth from strings.py
SethBendigo Jun 22, 2023
45e5651
Remove Forth from objects.py
SethBendigo Jun 22, 2023
680b53c
Remove AwkwardForth from containers.py
SethBendigo Jun 22, 2023
4f5db7e
Remove AwkwardForth import statement from objects.py
SethBendigo Jun 22, 2023
4d02fd1
Remove AwkwardForth from model.py and models/
SethBendigo Jun 23, 2023
2f7e011
Change test_0610 and test_0798 to not use forth
SethBendigo Jun 23, 2023
bb24278
Remove AwkwardForth from streamers.py
SethBendigo Jun 23, 2023
5d378d2
Remove more awkward forth code
SethBendigo Aug 1, 2023
799d46f
WIP: refactor af generation for a simple vector vector float case
SethBendigo Aug 10, 2023
7ca6b88
Refactor AwkwardForth generation for vectorvectordouble
SethBendigo Aug 17, 2023
a35f26e
Change previous_model dict to be apart of ForthGenerator
SethBendigo Aug 17, 2023
22dbde6
feat: Refactoring AwkwardForth code discovery
SethBendigo Aug 17, 2023
d257395
Deleting unwanted file.
jpivarski Aug 17, 2023
2103925
No AwkwardForth skip for test_0912
SethBendigo Aug 17, 2023
eae63ea
AwkwardForth implemented for test 81 of test_0637
SethBendigo Aug 31, 2023
964d133
Tests 57 through 79 pass.
SethBendigo Oct 12, 2023
fd83f05
Remove print_tree for now, will make it a proper repr method later. A…
SethBendigo Oct 12, 2023
9416069
WIP, working on more tests.
SethBendigo Oct 12, 2023
51ce2cb
style: pre-commit fixes
pre-commit-ci[bot] Oct 12, 2023
20fc969
Added reverse-map comments about which code is used in which tests.
jpivarski Nov 9, 2023
1027be2
Added expected AwkwardForth code for all cases that can have them.
jpivarski Nov 9, 2023
6342ee4
tests 05 and 08 are new, but they don't work yet.
jpivarski Nov 9, 2023
87a36ef
Mild infastructure changes to forth generating objects.
SethBendigo Nov 11, 2023
c4732a2
test_05 works.
jpivarski Nov 11, 2023
b6b35a2
Remove print statement.
jpivarski Nov 11, 2023
2561968
Got test_08 to work with some refactoring.
jpivarski Nov 11, 2023
e0bc6dd
style: pre-commit fixes
pre-commit-ci[bot] Nov 11, 2023
5a26054
Got test_31 to work.
jpivarski Nov 11, 2023
354abc2
Got test_79 to work.
jpivarski Nov 11, 2023
7525fb7
All the tests that worked before work again.
jpivarski Nov 12, 2023
61e3a2f
Removed ForthStash class, and dead functions in _awkward_forth.py
SethBendigo Nov 29, 2023
2b44f20
style: pre-commit fixes
pre-commit-ci[bot] Nov 29, 2023
22746ad
Removed two FIXME tags.
SethBendigo Nov 29, 2023
bbb7ce2
UnwindProtect to replace updating previous model to a pre-saved previ…
SethBendigo Dec 1, 2023
89cb2f2
pre-commit (that was done post commit)
SethBendigo Dec 1, 2023
8dda59b
String instead of dictionary error.
SethBendigo Dec 2, 2023
f041ee3
style: pre-commit fixes
pre-commit-ci[bot] Dec 2, 2023
2abf31a
Added back accidentally removed fix me. content = {}
SethBendigo Dec 2, 2023
9074a9c
test_AnalysisJetsAuxDyn_GhostTrack now passes.
SethBendigo Dec 2, 2023
f45a9c5
test 9, 15, 16, 17, 18, 19, 20, 21, 22, 23, 33, 36, 41, 42, 43 now pass.
SethBendigo Dec 2, 2023
158ac58
style: pre-commit fixes
pre-commit-ci[bot] Dec 2, 2023
254cbb0
The child of a base-class can be a dispatch-by-version.
jpivarski Dec 2, 2023
147bd9c
Fixed 'N'.
jpivarski Dec 2, 2023
e8f6ee5
Many fixes, mostly adding a new way to get field_name into the model.…
jpivarski Dec 2, 2023
b7a1c63
Four more tests work.
jpivarski Dec 2, 2023
43620e8
Fixed 'G' and updated tests.
jpivarski Dec 2, 2023
4cd54c5
Implemented 'C' and 'F'.
jpivarski Dec 2, 2023
f60843e
Fixed resetting of AsVector previous_model for test_38.
jpivarski Dec 2, 2023
bd4677e
TRef and Test 52.
SethBendigo Dec 2, 2023
9a897e2
Missing comma
SethBendigo Dec 3, 2023
dcaa064
TDatime, test 40, and remaining three tests in DAOD_PHYSLITE.
SethBendigo Dec 3, 2023
4e9387f
Implemented but untested TString AwkwardForth.
jpivarski Dec 3, 2023
eeba40d
style: pre-commit fixes
pre-commit-ci[bot] Dec 3, 2023
a907262
All tests pass without forth_obj.get_key_number().
jpivarski Dec 3, 2023
ce8066c
REALLY all tests pass without forth_obj.get_key_number().
jpivarski Dec 3, 2023
f22c562
key_number has been completely removed from Forth_Generator.
jpivarski Dec 3, 2023
3020593
pre-commit.
jpivarski Dec 3, 2023
76f5d8a
Merge branch 'sethbendigo/af-generation-vectorvectordouble' of https:…
jpivarski Dec 3, 2023
d6bb51f
The last test works.
jpivarski Dec 3, 2023
18d89b3
Reintroduce a Forth-cancellation mechanism.
jpivarski Dec 3, 2023
ffb8b6e
Cancel Forth-generation in any untested code-paths.
jpivarski Dec 3, 2023
6e58637
Touch-ups.
jpivarski Dec 3, 2023
c5abaa4
Turn these tests back on.
jpivarski Dec 3, 2023
e5170b4
Turn the AwkwardForth default back on.
jpivarski Dec 3, 2023
27730fc
Try to make awkward-pandas Series even if AwkwardForth was unsuccessful.
jpivarski Dec 3, 2023
222759e
Replaced UnwindProtect with push/pop logic.
jpivarski Dec 5, 2023
40c705c
Consolidate AsVector, AsRVec, and AsSet into a single implementation.
jpivarski Dec 5, 2023
d00dc95
Merge branch 'main' into sethbendigo/af-generation-vectorvectordouble
jpivarski Dec 5, 2023
05ab1f3
Removed intentional error from test_0692_fsspec_writing.
jpivarski Dec 5, 2023
98495df
Rename '_awkward_forth' -> '_awkwardforth'.
jpivarski Dec 5, 2023
8afad75
Rename 'Forth_Generator' -> 'ForthGenerator'.
jpivarski Dec 5, 2023
7d82f37
Removing dead code and 'previous_model' -> 'active_model'.
jpivarski Dec 5, 2023
e786dbb
Rename and privatize all attributes of ForthGenerator.
jpivarski Dec 5, 2023
8379ef7
Rename the dtype <--> struct formatter conversions.
jpivarski Dec 5, 2023
00fc6de
Nodes don't need dtypes.
jpivarski Dec 5, 2023
02a4c48
Removed the 'add_to_' indirection.
jpivarski Dec 5, 2023
2bf416c
Simplify Node attributes.
jpivarski Dec 5, 2023
e24a12e
Better __str__ for Node.
jpivarski Dec 5, 2023
d85593b
Simplify generated code by introducing shortcut aliases.
jpivarski Dec 5, 2023
b8e9539
pre-commit
jpivarski Dec 5, 2023
44576a3
Unequivocally reset the active node at the start of each entry.
jpivarski Dec 5, 2023
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
362 changes: 0 additions & 362 deletions src/uproot/_awkward_forth.py

This file was deleted.

Loading
Loading