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

adding Adios2 io support #113

Merged
merged 20 commits into from
Feb 3, 2025
+749 −0
Merged

adding Adios2 io support #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
c786f61
support for Omega_h_USE_ADIOS2 added
seegyoung Aug 25, 2024
788e45c
checking in adios2 dev
seegyoung Aug 26, 2024
906c8bc
adding osh2bp and bp2osh to utils
seegyoung Sep 7, 2024
dcdfe09
minor changes
seegyoung Sep 9, 2024
a3fe049
adding missing header file and sanity check
seegyoung Sep 12, 2024
ad95f00
adding adios2 impl (cpp) and config.sh for romulus
seegyoung Sep 17, 2024
a76e37a
config.sh removed
seegyoung Sep 17, 2024
cb35d7f
resolve conflicts
seegyoung Dec 17, 2024
5627b34
adding prefix option in adios2 read/write
seegyoung Dec 28, 2024
1971fe0
writing multiple meshes with prefix
seegyoung Dec 30, 2024
aae867b
writing multiple meshes added to adios2_io test
seegyoung Dec 31, 2024
f0099e7
fixing ctest error with adios2_io
seegyoung Jan 16, 2025
6285327
removing unnecessary function declaration
seegyoung Jan 23, 2025
6abf57a
adding static
seegyoung Jan 25, 2025
d7a31ea
removing FindADIOS2.cmake
seegyoung Jan 25, 2025
e937e83
addressing requested changes
seegyoung Jan 27, 2025
70bb5b9
adding adios namespace
seegyoung Jan 27, 2025
8a2be97
Update src/CMakeLists.txt
seegyoung Jan 30, 2025
b11dda0
addressing comments
seegyoung Jan 30, 2025
cbc88b6
removing mesh from read/write_value
seegyoung Jan 31, 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
2 changes: 2 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ bob_input(Kokkos_PREFIX "" PATH "Path to Kokkos install")
bob_option(Omega_h_USE_CUDA_AWARE_MPI "Assume MPI is CUDA-aware, make use of that" OFF)
bob_option(Omega_h_USE_SimModSuite "Enable reading Simmetrix MeshSim meshes" OFF)
bob_option(Omega_h_USE_SimDiscrete "Enable reading and creating Simmetrix Discrete models" OFF)
bob_option(Omega_h_USE_ADIOS2 "Enable ADIOS2" OFF)
bob_input(Omega_h_VALGRIND "" STRING "Valgrind plus arguments for testing")
bob_option(Omega_h_EXAMPLES "Compile examples" OFF)

Expand Down Expand Up @@ -163,6 +164,7 @@ set(Omega_h_KEY_BOOLS
Omega_h_USE_SEACASExodus
Omega_h_USE_SimModSuite
Omega_h_USE_SimDiscrete
Omega_h_USE_ADIOS2
Omega_h_USE_DOLFIN
Omega_h_USE_dwarf
Omega_h_CHECK_BOUNDS
Expand Down
29 changes: 29 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,12 @@ if(Omega_h_USE_SimModSuite)
"${CMAKE_CURRENT_BINARY_DIR}/Omega_h_simConfig.h")
endif()

message(STATUS "Omega_h_USE_ADIOS2: ${Omega_h_USE_ADIOS2}")
if(Omega_h_USE_ADIOS2)
list(APPEND Omega_h_SOURCES Omega_h_adios2.cpp)
find_package(ADIOS2 REQUIRED)
endif()

if(Omega_h_USE_SEACASExodus)
set(Omega_h_SOURCES ${Omega_h_SOURCES} Omega_h_exodus.cpp)
endif()
Expand Down Expand Up @@ -226,6 +232,15 @@ if(Omega_h_USE_SimModSuite)
target_link_libraries(omega_h PUBLIC "${SIMMODSUITE_LIBS}")
endif()

if(Omega_h_USE_ADIOS2)
if (Omega_h_USE_MPI)
target_include_directories(omega_h PRIVATE "${ADIOS2_INCLUDE_DIRS}")
target_link_libraries(omega_h PUBLIC "${ADIOS2_LIBRARIES}")
Comment on lines +237 to +238
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cwsmith @seegyoung should we be using the adios2 target here? Or, do we need to handle this with the library variables because of bob.cmake?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think Cameron can answer this

target_link_libraries(omega_h PUBLIC MPI::MPI_CXX)
else()
message(FATAL_ERROR, "set Omega_h_USE_MPI to use ADIOS2")
endif()
endif()

bob_link_dependency(omega_h PUBLIC SEACASExodus)

Expand Down Expand Up @@ -629,6 +644,16 @@ if(BUILD_TESTING)
else()
test_func(describe_serial 1 ./describe ${CMAKE_SOURCE_DIR}/meshes/box_3d.osh)
endif()

if (Omega_h_USE_ADIOS2)
osh_add_util(bp2osh)
osh_add_util(osh2bp)
osh_add_exe(adios2_io)
test_basefunc(adios2_io 1 ./adios2_io
${CMAKE_SOURCE_DIR}/meshes/unitbox_cutTriCube_1k.osh
${CMAKE_SOURCE_DIR}/meshes/plate_6elem.osh
output.bp)
endif()
endif()

bob_config_header("${CMAKE_CURRENT_BINARY_DIR}/Omega_h_config.h")
Expand Down Expand Up @@ -744,6 +769,10 @@ else()
list(APPEND Omega_h_HEADERS Omega_h_array_default.hpp)
endif()

if(Omega_h_USE_ADIOS2)
list(APPEND Omega_h_HEADERS Omega_h_adios2.hpp)
endif()

install(FILES ${Omega_h_HEADERS} DESTINATION include)

if (Omega_h_USE_pybind11)
Expand Down
Loading