Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s

#### Blueprint
- Added `conduit::blueprint::<mpi>::mesh::state()`, `conduit::blueprint::<mpi>::mesh::cycle()`, and `conduit::blueprint::<mpi>::mesh::time()`, utilities for getting state information from meshes.
- Added `conduit.blueprint.mpi`, `conduit.blueprint.mpi.mesh`, and `conduit.blueprint.mpi.mesh.examples` modules to the Python interface.

#### Relay
- Added h5z-zfp compression support to relay io hdf5 methods.
- Added `conduit::relay::<mpi>::io::blueprint::generate_root_filename()`, which takes the same arguments as `save_mesh` or `write_mesh` and produces the name of the root file that would be generated by a call to `save_mesh` or `write_mesh`.
- Added `conduit::relay::mpi::memory_usage` and `conduit::relay::mpi::memory_stats` helpers.
- Added `conduit.relay.mpi.io` and `conduit.relay.mpi.io.blueprint` modules to the Python interface.
- Added `v1120` and `v1140` options to hdf5 libver settings to support 1.12 and 1.14 libver upper range.


### Changed
#### Conduit
- Changed Conduit memory handler callbacks from function pointers to `std::function` objects, allowing users more flexibility in dealing with different memory spaces.
Expand Down
2 changes: 1 addition & 1 deletion scripts/uberenv
Submodule uberenv updated 1 files
+7 −3 uberenv.py
59 changes: 59 additions & 0 deletions src/libs/blueprint/python/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -116,3 +116,62 @@ target_link_libraries(conduit_blueprint_table_examples_python PRIVATE conduit_py

# link with the proper libs (beyond python)
target_link_libraries(conduit_blueprint_table_examples_python PRIVATE conduit conduit_blueprint conduit_python_build)

################################################################
# If we have mpi, add the conduit blueprint mpi module
################################################################

if(MPI_FOUND)

# add blueprint mpi submodule
PYTHON_ADD_COMPILED_MODULE(NAME conduit_blueprint_mpi_python
DEST_DIR python-modules
PY_MODULE_DIR conduit/blueprint/mpi
SOURCES conduit_blueprint_mpi_python.cpp
${CMAKE_CURRENT_BINARY_DIR}/conduit_blueprint_python_exports.h
FOLDER libs/python)

# compiled modules depend on output dir structure created by main module setup
target_link_libraries(conduit_blueprint_mpi_python PRIVATE conduit_python_py_setup)

# link with the proper libs (beyond python)
target_link_libraries(conduit_blueprint_mpi_python PRIVATE conduit conduit_blueprint_mpi conduit_python_build)

endif()

#############################################################
# blueprint.mpi.mesh
#############################################################

if(MPI_FOUND)

# add mesh submodule
PYTHON_ADD_COMPILED_MODULE(NAME conduit_blueprint_mpi_mesh_python
DEST_DIR python-modules
PY_MODULE_DIR conduit/blueprint/mpi/mesh
SOURCES conduit_blueprint_mpi_mesh_python.cpp
${CMAKE_CURRENT_BINARY_DIR}/conduit_blueprint_python_exports.h
FOLDER libs/python)

# compiled modules depend on output dir structure created by main module setup
target_link_libraries(conduit_blueprint_mpi_mesh_python PRIVATE conduit_python_py_setup)

# link with the proper libs (beyond python)
target_link_libraries(conduit_blueprint_mpi_mesh_python PRIVATE conduit conduit_blueprint_mpi conduit_python_build)


# add mesh examples submodule
PYTHON_ADD_COMPILED_MODULE(NAME conduit_blueprint_mpi_mesh_examples_python
DEST_DIR python-modules
PY_MODULE_DIR conduit/blueprint/mpi/mesh/examples
SOURCES conduit_blueprint_mpi_mesh_examples_python.cpp
${CMAKE_CURRENT_BINARY_DIR}/conduit_blueprint_python_exports.h
FOLDER libs/python)

# compiled modules depend on output dir structure created by main module setup
target_link_libraries(conduit_blueprint_mpi_mesh_examples_python PRIVATE conduit_python_py_setup)

# link with the proper libs (beyond python)
target_link_libraries(conduit_blueprint_mpi_mesh_examples_python PRIVATE conduit conduit_blueprint_mpi conduit_python_build)

endif()
6 changes: 5 additions & 1 deletion src/libs/blueprint/python/conduit_blueprint_mesh_python.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ PyBlueprint_mesh_generate_index(PyObject *, //self
}

//---------------------------------------------------------------------------//
// conduit::blueprint::mesh::generate_index
// conduit::blueprint::mesh::partition
//---------------------------------------------------------------------------//

// doc str
Expand Down Expand Up @@ -277,6 +277,10 @@ PyBlueprint_mesh_partition(PyObject *, //self
Py_RETURN_NONE;
}

//---------------------------------------------------------------------------//
// conduit::blueprint::mesh::flatten
//---------------------------------------------------------------------------//

// doc str
const char *PyBlueprint_mesh_flatten_doc_str =
"flatten(mesh, options, output)\n"
Expand Down
Loading