Skip to content
Snippets Groups Projects
Commit 95b1e73c authored by Wang, Ruonan's avatar Wang, Ruonan
Browse files

reversed cmakelist format

parent 33a1264f
No related branches found
No related tags found
1 merge request!106fixed a few DataMan problems caused by recent merges
...@@ -6,15 +6,15 @@ ...@@ -6,15 +6,15 @@
set(dataman_targets) set(dataman_targets)
add_library(dataman add_library(dataman
DataManBase.cpp DataManBase.h DataManBase.cpp DataManBase.h
DataMan.cpp DataMan.h DataMan.cpp DataMan.h
CacheMan.cpp CacheMan.h CacheMan.cpp CacheMan.h
) )
target_include_directories(dataman PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(dataman PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(dataman target_link_libraries(dataman
PRIVATE adios2sys PRIVATE adios2sys
PUBLIC NLohmannJson PUBLIC NLohmannJson
) )
list(APPEND dataman_targets dataman) list(APPEND dataman_targets dataman)
# Add the dataman plugins as MODULE libraries instead of SHARED libraries. # Add the dataman plugins as MODULE libraries instead of SHARED libraries.
...@@ -31,37 +31,37 @@ list(APPEND dataman_targets temporalman) ...@@ -31,37 +31,37 @@ list(APPEND dataman_targets temporalman)
option(ADIOS_USE_DataMan_ZeroMQ "Enable ZeroMQ for DataMan" OFF) option(ADIOS_USE_DataMan_ZeroMQ "Enable ZeroMQ for DataMan" OFF)
if(ADIOS_USE_DataMan_ZeroMQ) if(ADIOS_USE_DataMan_ZeroMQ)
find_package(ZeroMQ REQUIRED) find_package(ZeroMQ REQUIRED)
add_library(zmqman MODULE add_library(zmqman MODULE
StreamMan.h StreamMan.cpp StreamMan.h StreamMan.cpp
ZmqMan.h ZmqMan.cpp ZmqMan.h ZmqMan.cpp
) )
target_link_libraries(zmqman PRIVATE dataman ZeroMQ::ZMQ) target_link_libraries(zmqman PRIVATE dataman ZeroMQ::ZMQ)
list(APPEND dataman_targets zmqman) list(APPEND dataman_targets zmqman)
add_library(mdtmman MODULE add_library(mdtmman MODULE
StreamMan.h StreamMan.cpp StreamMan.h StreamMan.cpp
MdtmMan.h MdtmMan.cpp MdtmMan.h MdtmMan.cpp
) )
target_link_libraries(mdtmman PRIVATE dataman ZeroMQ::ZMQ) target_link_libraries(mdtmman PRIVATE dataman ZeroMQ::ZMQ)
list(APPEND dataman_targets mdtmman) list(APPEND dataman_targets mdtmman)
endif() endif()
set(ADIOS_USE_DataMan_ZFP ${ADIOS_USE_ZFP} CACHE INTERNAL "Enable ZFP for DataMan" FORCE) set(ADIOS_USE_DataMan_ZFP ${ADIOS_USE_ZFP} CACHE INTERNAL "Enable ZFP for DataMan" FORCE)
if(ADIOS_USE_DataMan_ZFP) if(ADIOS_USE_DataMan_ZFP)
find_package(ZFP REQUIRED) find_package(ZFP REQUIRED)
add_library(zfpman MODULE ZfpMan.h ZfpMan.cpp) add_library(zfpman MODULE ZfpMan.h ZfpMan.cpp)
target_link_libraries(zfpman PRIVATE dataman zfp::zfp) target_link_libraries(zfpman PRIVATE dataman zfp::zfp)
list(APPEND dataman_targets zfpman) list(APPEND dataman_targets zfpman)
endif() endif()
install( install(
TARGETS ${dataman_targets} EXPORT adios2 TARGETS ${dataman_targets} EXPORT adios2
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
) )
...@@ -150,8 +150,9 @@ int DataManBase::put_end(const void *p_data, json &p_jmsg) ...@@ -150,8 +150,9 @@ int DataManBase::put_end(const void *p_data, json &p_jmsg)
m_profiling["total_manager_time"] = m_profiling["total_manager_time"] =
m_profiling["total_manager_time"].get<double>() + duration.count(); m_profiling["total_manager_time"].get<double>() + duration.count();
m_profiling["total_mb"] = m_profiling["total_mb"] =
m_profiling["total_mb"].get<size_t>() + m_profiling["total_mb"].get<double>() +
product(p_jmsg["varshape"], dsize(p_jmsg["dtype"])) / 1000000.0f; product(p_jmsg["varshape"], dsize(p_jmsg["dtype"])) / 1000000.0f;
std::cout << product(p_jmsg["varshape"], dsize(p_jmsg["dtype"])) << "\n";
duration = end - m_start_time; duration = end - m_start_time;
m_profiling["total_workflow_time"] = duration.count(); m_profiling["total_workflow_time"] = duration.count();
m_profiling["workflow_mbs"] = m_profiling["workflow_mbs"] =
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment