From 95b1e73ceb1d4dde21c7f0e897c58f20205b5569 Mon Sep 17 00:00:00 2001
From: Jason Wang <wangr1@ornl.gov>
Date: Wed, 10 May 2017 12:33:06 -0400
Subject: [PATCH] reversed cmakelist format
---
source/dataman/CMakeLists.txt | 58 +++++++++++++++++-----------------
source/dataman/DataManBase.cpp | 3 +-
2 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/source/dataman/CMakeLists.txt b/source/dataman/CMakeLists.txt
index 17f5095ba..1acb89487 100644
--- a/source/dataman/CMakeLists.txt
+++ b/source/dataman/CMakeLists.txt
@@ -6,15 +6,15 @@
set(dataman_targets)
add_library(dataman
- DataManBase.cpp DataManBase.h
- DataMan.cpp DataMan.h
- CacheMan.cpp CacheMan.h
- )
+ DataManBase.cpp DataManBase.h
+ DataMan.cpp DataMan.h
+ CacheMan.cpp CacheMan.h
+)
target_include_directories(dataman PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(dataman
- PRIVATE adios2sys
- PUBLIC NLohmannJson
- )
+ PRIVATE adios2sys
+ PUBLIC NLohmannJson
+)
list(APPEND dataman_targets dataman)
# Add the dataman plugins as MODULE libraries instead of SHARED libraries.
@@ -31,37 +31,37 @@ list(APPEND dataman_targets temporalman)
option(ADIOS_USE_DataMan_ZeroMQ "Enable ZeroMQ for DataMan" OFF)
if(ADIOS_USE_DataMan_ZeroMQ)
- find_package(ZeroMQ REQUIRED)
+ find_package(ZeroMQ REQUIRED)
- add_library(zmqman MODULE
- StreamMan.h StreamMan.cpp
- ZmqMan.h ZmqMan.cpp
- )
- target_link_libraries(zmqman PRIVATE dataman ZeroMQ::ZMQ)
- list(APPEND dataman_targets zmqman)
+ add_library(zmqman MODULE
+ StreamMan.h StreamMan.cpp
+ ZmqMan.h ZmqMan.cpp
+ )
+ target_link_libraries(zmqman PRIVATE dataman ZeroMQ::ZMQ)
+ list(APPEND dataman_targets zmqman)
- add_library(mdtmman MODULE
- StreamMan.h StreamMan.cpp
- MdtmMan.h MdtmMan.cpp
- )
- target_link_libraries(mdtmman PRIVATE dataman ZeroMQ::ZMQ)
- list(APPEND dataman_targets mdtmman)
+ add_library(mdtmman MODULE
+ StreamMan.h StreamMan.cpp
+ MdtmMan.h MdtmMan.cpp
+ )
+ target_link_libraries(mdtmman PRIVATE dataman ZeroMQ::ZMQ)
+ list(APPEND dataman_targets mdtmman)
endif()
set(ADIOS_USE_DataMan_ZFP ${ADIOS_USE_ZFP} CACHE INTERNAL "Enable ZFP for DataMan" FORCE)
if(ADIOS_USE_DataMan_ZFP)
- find_package(ZFP REQUIRED)
+ find_package(ZFP REQUIRED)
- add_library(zfpman MODULE ZfpMan.h ZfpMan.cpp)
- target_link_libraries(zfpman PRIVATE dataman zfp::zfp)
+ add_library(zfpman MODULE ZfpMan.h ZfpMan.cpp)
+ target_link_libraries(zfpman PRIVATE dataman zfp::zfp)
- list(APPEND dataman_targets zfpman)
+ list(APPEND dataman_targets zfpman)
endif()
install(
- TARGETS ${dataman_targets} EXPORT adios2
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
- )
+ TARGETS ${dataman_targets} EXPORT adios2
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)
diff --git a/source/dataman/DataManBase.cpp b/source/dataman/DataManBase.cpp
index e386249e7..3012da8bb 100644
--- a/source/dataman/DataManBase.cpp
+++ b/source/dataman/DataManBase.cpp
@@ -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"].get<double>() + duration.count();
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;
+ std::cout << product(p_jmsg["varshape"], dsize(p_jmsg["dtype"])) << "\n";
duration = end - m_start_time;
m_profiling["total_workflow_time"] = duration.count();
m_profiling["workflow_mbs"] =
--
GitLab