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.

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

Feature/improve generator #81

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

Feature/improve generator #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
50ee3ee
A few build-system preliminaries.
staleyLANL Nov 2, 2021
e4d56ea
Updatong cmake dependencies
whaeck Nov 2, 2021
fc0c91e
Updating CI to get hdf5 installed
whaeck Nov 2, 2021
90c38c8
Removing compiler definition
whaeck Nov 2, 2021
396e07e
Updating to develop
whaeck Nov 4, 2021
717a4fe
Work-in-progress.
staleyLANL Nov 15, 2021
2a148d6
Merge branch 'feature/hdf5' of https://github.com/njoy/GNDStk into fe…
staleyLANL Nov 15, 2021
316b6d7
Extended the autogenerator to support a ProjectDir entry.
staleyLANL Nov 17, 2021
5d8653b
Lots of not-yet-finished work on an HDF5 read/write capability.
staleyLANL Nov 18, 2021
31a4b65
comment
staleyLANL Nov 18, 2021
44c71db
fix
staleyLANL Nov 18, 2021
20fb5a2
Moving something around.
staleyLANL Nov 18, 2021
769916a
Addition to .gitignore.
staleyLANL Nov 18, 2021
e683ce7
Merge branch 'feature/hdf5' of https://github.com/njoy/GNDStk into fe…
staleyLANL Nov 18, 2021
cf218ec
Another setter capability in generated classes, and other improvements.
staleyLANL Nov 22, 2021
7179380
Merge branch 'feature/hdf5' of https://github.com/njoy/GNDStk into fe…
staleyLANL Nov 22, 2021
cdff3fc
Suppress potential warning due to unused parameters in one branch of …
staleyLANL Nov 22, 2021
d58d5be
Small change to fix issue Tom found with a particular compiler.
staleyLANL Nov 29, 2021
06e3297
Some work on the code generator, mostly to simplify some things.
staleyLANL Nov 30, 2021
f74e578
Code generator changes to support data-only nodes.
staleyLANL Dec 6, 2021
f944930
Regenerated prototype classes.
staleyLANL Dec 6, 2021
d111a40
More work on HDF5.
staleyLANL Dec 7, 2021
41026c5
Basic HDF5 capability is complete.
staleyLANL Dec 10, 2021
3e70eed
Name change: BodyText to BlockData.
staleyLANL Dec 11, 2021
92e0019
Remove allow-as-top-level-GNDS-node flag in Child class.
staleyLANL Dec 12, 2021
3b77064
Removed an old, deprecated "keyword builder" capability.
staleyLANL Dec 13, 2021
b1fb7fc
Reformulation of HDF5-related temporary file handling.
staleyLANL Dec 14, 2021
f4c8620
Cleaned-up and improved logic related to HDF5 handling.
staleyLANL Dec 16, 2021
04df13e
Name change.
staleyLANL Dec 16, 2021
1debaa6
Terminology change re: body text.
staleyLANL Dec 18, 2021
3d239dd
This commit requires some explanation.
staleyLANL Dec 22, 2021
2c606ea
Identify "special" nodes by making their names, well, special.
staleyLANL Dec 23, 2021
cfacec9
In generated code: Remove struct defaults where it would be empty.
staleyLANL Dec 23, 2021
502588b
Remove unused built-in Meta and Child objects.
staleyLANL Jan 8, 2022
78ffbbf
Block data "truncate" feature.
staleyLANL Jan 19, 2022
88de64b
Simple commit: limit lines to 80 characters in many places.
staleyLANL Jan 20, 2022
87e22db
Rework built-in Meta and Child objects as for-testing-only.
staleyLANL Jan 24, 2022
32d86b4
Reworked some of BlockData's behavior
staleyLANL Feb 1, 2022
7fa7f15
Introduced a "type guesser", eventually for use by the HDF5 writer.
staleyLANL Feb 8, 2022
7c278e5
Modified how the code generator makes Meta and Child keys
staleyLANL Feb 10, 2022
28ec4e4
JSON functionality respects original ordering.
staleyLANL Feb 14, 2022
df78378
Updating python tests, per reordering in generated classes.
staleyLANL Feb 14, 2022
eb6e568
Various improvements in the HDF5 writing capability.
staleyLANL Feb 16, 2022
5fbc414
A few further improvements to the HDF5 writing capability.
staleyLANL Feb 16, 2022
e069a0f
Simplified some SFINAE.
staleyLANL Feb 23, 2022
ad03b39
Made getter-related index and label consistent with one another, with…
staleyLANL Feb 23, 2022
086d41f
Tons of work on the upcoming major "Lookup" capability.
staleyLANL Feb 25, 2022
4f0ae58
Updating autogenerated codes.
staleyLANL Feb 28, 2022
83b6a27
More autogenerated code updates.
staleyLANL Feb 28, 2022
1219770
Updated code generator to reflect generated-code changes that we want.
staleyLANL Feb 28, 2022
4b8710a
Python modifications apparently necessitated by introduction of membe…
staleyLANL Mar 1, 2022
dec016f
Updated the code generator's generation of python-binding code, so th…
staleyLANL Mar 1, 2022
6402771
Further improvements to HDF5 I/O.
staleyLANL Mar 9, 2022
bf22b7e
See if this fixes the MacOS error. Does its C++ see "FALSE" as special??
staleyLANL Mar 9, 2022
f738de5
Some name changes I thought were warranted.
staleyLANL Mar 10, 2022
497948e
Replace "/" with rootHDF5 (equals "/") in appropriate places.
staleyLANL Mar 10, 2022
d60a805
Changed details regarding Node and Tree names.
staleyLANL Mar 14, 2022
51287db
Slight simplification in class HDF5.
staleyLANL Mar 14, 2022
4725966
Consolidated some Tree stuff into Node.
staleyLANL Mar 15, 2022
4543598
Got rid of node2node(). It's rolled into Node=Node.
staleyLANL Mar 15, 2022
4ff05d6
Filled in some additional I/O related content.
staleyLANL Mar 17, 2022
6c9b128
Circumvented pugixml's spurious newline printing.
staleyLANL Mar 19, 2022
5bd5378
Fixed some fixmes. Part of ongoing cleanup / code tightening.
staleyLANL Mar 21, 2022
57ee74f
Name change.
staleyLANL Mar 21, 2022
b693f66
Some fixes; and consolidated some code.
staleyLANL Mar 24, 2022
a3fd1a5
Did some default initialization differently.
staleyLANL Mar 29, 2022
90942cc
Fix some terminology.
staleyLANL Mar 29, 2022
5e5141a
Lots of miscellaneous changes.
staleyLANL Mar 31, 2022
1cf8d87
Updating autogenerated files.
staleyLANL Mar 31, 2022
56ea4c0
Adjust some terminology, fix some fixmes.
staleyLANL Mar 31, 2022
8cc0cb3
Simplified some Component stuff.
staleyLANL Mar 31, 2022
e29e55a
Some simplifications.
staleyLANL Apr 1, 2022
16fc7b7
Updating ...
whaeck Jun 30, 2022
a951980
Updating ...
whaeck Jun 30, 2022
4e04868
Updating ...
whaeck Jun 30, 2022
6b20355
Updating ...
whaeck Jun 30, 2022
4755fd3
Updating ...
whaeck Jun 30, 2022
15c0d7a
Updating ...
whaeck Jun 30, 2022
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
6 changes: 6 additions & 0 deletions .github/workflows/ContinuousIntegration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ jobs:
build_type: [ Debug, Release ]

steps:
- name: Install hdf5 libraries for Linux
if: matrix.os == 'ubuntu-18.04'
run: sudo apt-get install libhdf5-dev
- name: Install hdf5 libraries for MacOS
if: matrix.os == 'macos-10.15'
run: brew install hdf5
- name: which CXX
run: |
which ${{matrix.cxx}}
Expand Down
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ target_link_libraries( GNDStk
INTERFACE catch-adapter
INTERFACE pugixml-adapter
INTERFACE nlohmann_json::nlohmann_json
INTERFACE HighFive
)

add_executable( json2class.exe
Expand Down
1 change: 0 additions & 1 deletion autogen/.gitignore
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion autogen/changes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"metadata": {
"type": {
"Boolean": "bool",
"string": "std::string",
"encoding": "enums::Encoding",
"frame": "enums::Frame",
"interaction": "enums::Interaction",
Expand Down
Loading