Skip to content

Daos Engine Merge #4477

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

Merged
eisenhauer merged 2 commits into from
Mar 11, 2025
Merged

Daos Engine Merge #4477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8747ec0
Daos Engine merge. No testing yet.
eisenhauer Mar 11, 2025
a4ac5aa
format
eisenhauer Mar 11, 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
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 @@ -160,6 +160,7 @@ mark_as_advanced(CLEAR BUILD_TESTING)
adios_option(BigWhoop "Enable support for BigWhoop transforms" AUTO)
adios_option(Blosc2 "Enable support for c-blosc-2 transforms" AUTO)
adios_option(BZip2 "Enable support for BZip2 transforms" AUTO)
adios_option(Caliper "Enable support for Caliper" AUTO)
adios_option(ZFP "Enable support for ZFP transforms" AUTO)
adios_option(SZ "Enable support for SZ transforms" AUTO)
adios_option(LIBPRESSIO "Enable support for LIBPRESSIO transforms" AUTO)
Expand Down
2 changes: 1 addition & 1 deletion bindings/Fortran/f2c/adios2_f2c_variable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ void FC_GLOBAL(adios2_variable_shape_f2c,
return;
}

size_t shapeC[ndims];
size_t shapeC[adios2::helper::MAX_DIMS];
*ierr = static_cast<int>(adios2_variable_shape(shapeC, *variable));
if (*ierr > 0)
{
Expand Down
6 changes: 6 additions & 0 deletions cmake/DetectOptions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,12 @@ if(DAOS_FOUND)
set(ADIOS2_HAVE_DAOS TRUE)
endif()

# Caliper
find_package(Caliper)
if(Caliper_FOUND)
set(ADIOS2_HAVE_Caliper TRUE)
endif()

#SysV IPC
if(UNIX)
include(CheckSymbolExists)
Expand Down
2 changes: 1 addition & 1 deletion source/adios2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ if(ADIOS2_HAVE_DAOS)
engine/daos/DaosWriter_TwoLevelShm.cpp
engine/daos/DaosReader.cpp engine/daos/DaosReader.tcc
engine/daos/DaosWriter.cpp engine/daos/DaosWriter.tcc)
target_link_libraries(adios2_core PRIVATE DAOS::DAOS)
target_link_libraries(adios2_core PRIVATE DAOS::DAOS Caliper::Caliper)
endif()

if(ADIOS2_HAVE_MPI)
Expand Down
Loading
Loading