From 1ecdbf0900f64cf1a44fc48777a5ff7177fa4d54 Mon Sep 17 00:00:00 2001 From: Sebastian Eibl <sebastian.eibl@fau.de> Date: Mon, 16 Sep 2019 14:42:40 +0200 Subject: [PATCH] adapted to new sqlite module --- .../GranularGas/MESA_PD_KernelLoadBalancing.cpp | 8 ++++---- apps/benchmarks/GranularGas/MESA_PD_LoadBalancing.cpp | 8 ++++---- apps/benchmarks/GranularGas/PE_LoadBalancing.cpp | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/benchmarks/GranularGas/MESA_PD_KernelLoadBalancing.cpp b/apps/benchmarks/GranularGas/MESA_PD_KernelLoadBalancing.cpp index f4bedea10..fa70bf38c 100644 --- a/apps/benchmarks/GranularGas/MESA_PD_KernelLoadBalancing.cpp +++ b/apps/benchmarks/GranularGas/MESA_PD_KernelLoadBalancing.cpp @@ -76,7 +76,7 @@ #include <pe/amr/level_determination/MinMaxLevelDetermination.h> #include <pe/amr/weight_assignment/MetisAssignmentFunctor.h> #include <pe/amr/weight_assignment/WeightAssignmentFunctor.h> -#include <postprocessing/sqlite/SQLite.h> +#include <sqlite/SQLite.h> #include <vtk/VTKOutput.h> #include <functional> @@ -603,9 +603,9 @@ int main( int argc, char ** argv ) addDomainPropertiesToSQL(*forest, integerProperties, realProperties, stringProperties); addSlurmPropertiesToSQL(integerProperties, realProperties, stringProperties); - runId = postprocessing::storeRunInSqliteDB( params.sqlFile, integerProperties, stringProperties, realProperties ); - postprocessing::storeTimingPoolInSqliteDB( params.sqlFile, runId, *tpImbalancedReduced, "imbalanced" ); - postprocessing::storeTimingPoolInSqliteDB( params.sqlFile, runId, *tpBalancedReduced, "balanced" ); + runId = sqlite::storeRunInSqliteDB( params.sqlFile, integerProperties, stringProperties, realProperties ); + sqlite::storeTimingPoolInSqliteDB( params.sqlFile, runId, *tpImbalancedReduced, "imbalanced" ); + sqlite::storeTimingPoolInSqliteDB( params.sqlFile, runId, *tpBalancedReduced, "balanced" ); } if (params.storeNodeTimings) { diff --git a/apps/benchmarks/GranularGas/MESA_PD_LoadBalancing.cpp b/apps/benchmarks/GranularGas/MESA_PD_LoadBalancing.cpp index 7e8ea524c..b4a09a77f 100644 --- a/apps/benchmarks/GranularGas/MESA_PD_LoadBalancing.cpp +++ b/apps/benchmarks/GranularGas/MESA_PD_LoadBalancing.cpp @@ -70,7 +70,7 @@ #include <pe/amr/level_determination/MinMaxLevelDetermination.h> #include <pe/amr/weight_assignment/MetisAssignmentFunctor.h> #include <pe/amr/weight_assignment/WeightAssignmentFunctor.h> -#include <postprocessing/sqlite/SQLite.h> +#include <sqlite/SQLite.h> #include <vtk/VTKOutput.h> #include <functional> @@ -571,9 +571,9 @@ int main( int argc, char ** argv ) addDomainPropertiesToSQL(*forest, integerProperties, realProperties, stringProperties); addSlurmPropertiesToSQL(integerProperties, realProperties, stringProperties); - runId = postprocessing::storeRunInSqliteDB( params.sqlFile, integerProperties, stringProperties, realProperties ); - postprocessing::storeTimingPoolInSqliteDB( params.sqlFile, runId, *tpImbalancedReduced, "imbalanced" ); - postprocessing::storeTimingPoolInSqliteDB( params.sqlFile, runId, *tpImbalancedReduced, "balanced" ); + runId = sqlite::storeRunInSqliteDB( params.sqlFile, integerProperties, stringProperties, realProperties ); + sqlite::storeTimingPoolInSqliteDB( params.sqlFile, runId, *tpImbalancedReduced, "imbalanced" ); + sqlite::storeTimingPoolInSqliteDB( params.sqlFile, runId, *tpImbalancedReduced, "balanced" ); } if (params.storeNodeTimings) diff --git a/apps/benchmarks/GranularGas/PE_LoadBalancing.cpp b/apps/benchmarks/GranularGas/PE_LoadBalancing.cpp index 84e2e8f41..132b6a433 100644 --- a/apps/benchmarks/GranularGas/PE_LoadBalancing.cpp +++ b/apps/benchmarks/GranularGas/PE_LoadBalancing.cpp @@ -42,7 +42,7 @@ #include <core/OpenMP.h> #include <core/timing/TimingTree.h> #include <core/waLBerlaBuildInfo.h> -#include <postprocessing/sqlite/SQLite.h> +#include <sqlite/SQLite.h> #include <vtk/VTKOutput.h> #include <functional> @@ -448,9 +448,9 @@ int main( int argc, char ** argv ) mesa_pd::addDomainPropertiesToSQL(*forest, integerProperties, realProperties, stringProperties); mesa_pd::addSlurmPropertiesToSQL(integerProperties, realProperties, stringProperties); - runId = postprocessing::storeRunInSqliteDB( params.sqlFile, integerProperties, stringProperties, realProperties ); - postprocessing::storeTimingPoolInSqliteDB( params.sqlFile, runId, *tpImbalancedReduced, "imbalanced" ); - postprocessing::storeTimingPoolInSqliteDB( params.sqlFile, runId, *tpImbalancedReduced, "balanced" ); + runId = sqlite::storeRunInSqliteDB( params.sqlFile, integerProperties, stringProperties, realProperties ); + sqlite::storeTimingPoolInSqliteDB( params.sqlFile, runId, *tpImbalancedReduced, "imbalanced" ); + sqlite::storeTimingPoolInSqliteDB( params.sqlFile, runId, *tpImbalancedReduced, "balanced" ); } if (params.storeNodeTimings) { -- GitLab