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

Jump to bottom

WIP: Hdf5 code generation, VLDataset, WriteToBuf, FillBuf #1333

Merged
merged 18 commits into from
Jan 10, 2017
Merged

WIP: Hdf5 code generation, VLDataset, WriteToBuf, FillBuf #1333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f3fd5a0
working towards generating FillBuf
hodger Nov 20, 2016
f327027
multi fixes, recursive setup for the fill buf generation
hodger Dec 2, 2016
ed03460
added write body recursion, created string primitive function
hodger Dec 11, 2016
77ba3af
fixed recursion for multi-child variable length types. Added CMake pr…
hodger Dec 14, 2016
a4ffcad
fixed pointer variables, probably correct generation for several types
hodger Dec 14, 2016
9b2e0a9
latest work
hodger Dec 14, 2016
25aa22a
code compiles but is not fully correct
hodger Dec 20, 2016
a2f28e7
Merge branch 'develop' into morecodegen
hodger Dec 20, 2016
62d3131
fixed UUID
hodger Dec 21, 2016
4f0bd2d
tests pass, although all map_pair_y types are not properly implemented.
hodger Dec 22, 2016
30c3241
VL_MAP_PAIR*_STRING should be correct now, tests still pass.
hodger Dec 22, 2016
4422462
docstrings and clean up
hodger Dec 22, 2016
b9dc246
removed loops over non-ordered data structures, as per #1336
hodger Jan 2, 2017
57c7ccf
Merge develop for unit test bug fixes.
hodger Jan 2, 2017
d0c195a
added check for whether size is greater than column
hodger Jan 4, 2017
c021a84
formatting
hodger Jan 5, 2017
2fe3b3a
Merge branch 'develop' into morecodegen for pywrap branch
hodger Jan 5, 2017
e45bc59
Merge branch 'develop' into morecodegen for numpy fix
hodger Jan 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 15 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,21 @@ IF(NOT "${res_var_c}" STREQUAL "0")
message(FATAL_ERROR "Process hdf5_back_gen.py 'CREATE' failed, result = '${res_var_c}'")
ENDIF()

EXECUTE_PROCESS(COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/hdf5_back_gen.py "VL_DATASET" OUTPUT_VARIABLE HDF5_BACK_CC_VL_DATASET RESULT_VARIABLE res_var_v)
IF(NOT "${res_var_v}" STREQUAL "0")
message(FATAL_ERROR "Process hdf5_back_gen.py 'VL_DATASET' failed, result = '${res_var_v}'")
ENDIF()

EXECUTE_PROCESS(COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/hdf5_back_gen.py "FILL_BUF" OUTPUT_VARIABLE HDF5_BACK_CC_FILL_BUF RESULT_VARIABLE res_var_f)
IF(NOT "${res_var_f}" STREQUAL "0")
message(FATAL_ERROR "Process hdf5_back_gen.py 'FILL_BUF' failed, result = '${res_var_f}'")
ENDIF()

EXECUTE_PROCESS(COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/hdf5_back_gen.py "WRITE" OUTPUT_VARIABLE HDF5_BACK_CC_WRITE RESULT_VARIABLE res_var_w)
IF(NOT "${res_var_w}" STREQUAL "0")
message(FATAL_ERROR "Process hdf5_back_gen.py 'WRITE' failed, result = '${res_var_w}'")
ENDIF()

CONFIGURE_FILE(
"${CMAKE_CURRENT_SOURCE_DIR}/hdf5_back.cc.in"
"${CMAKE_CURRENT_SOURCE_DIR}/hdf5_back.cc"
Expand Down