From f519e1d0492e658a31938d15be2e1e70471f905c Mon Sep 17 00:00:00 2001
From: Martin Khannouz <martin.khannouz@inria.fr>
Date: Wed, 22 Jun 2016 11:40:21 +0200
Subject: [PATCH] Fix post traiting issue.
When no value in global_time, it is replace by -1 and then removed from
the dataframe in some R script.
---
Utils/benchmark/gen_normalized_time_plots.R | 1 +
Utils/benchmark/gen_parallel_efficiency_plots.R | 1 +
Utils/benchmark/gen_speed_plots.R | 1 +
Utils/benchmark/gen_speedup_plots.R | 1 +
Utils/benchmark/generate_graph.R | 4 ++--
Utils/benchmark/loutre.py | 2 +-
6 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/Utils/benchmark/gen_normalized_time_plots.R b/Utils/benchmark/gen_normalized_time_plots.R
index bf4003941..cb8a5a112 100644
--- a/Utils/benchmark/gen_normalized_time_plots.R
+++ b/Utils/benchmark/gen_normalized_time_plots.R
@@ -70,6 +70,7 @@ gen_normalized_time_plot <- function(db, d_breaks, model_wanted)
gen_normalized_time <- function(dbfile)
{
data <- get_data_subset(dbfile, 0L, 0L, "False", get_bsize_reference())
+ data <- subset(data, global_time >= 0)
all_model <- unique(data$model)
#Get all algorithm without the reference algorithm
all_algo <- unique(subset(data, algo != get_one_node_reference_algorithm())$algo)
diff --git a/Utils/benchmark/gen_parallel_efficiency_plots.R b/Utils/benchmark/gen_parallel_efficiency_plots.R
index 59a447c54..b698bd38d 100644
--- a/Utils/benchmark/gen_parallel_efficiency_plots.R
+++ b/Utils/benchmark/gen_parallel_efficiency_plots.R
@@ -67,6 +67,7 @@ gen_pareff <- function(dbfile)
file <- paste(dbfile, sep="")
data <- get_data_subset(dbfile, 0L, 0L, "False", get_bsize_reference())
data <- subset(data, algo != get_one_node_reference_algorithm())
+ data <- subset(data, global_time >= 0)
all_model <- unique(data$model)
for (i in 1:length(all_model))
{
diff --git a/Utils/benchmark/gen_speed_plots.R b/Utils/benchmark/gen_speed_plots.R
index 4182f793e..99115221c 100644
--- a/Utils/benchmark/gen_speed_plots.R
+++ b/Utils/benchmark/gen_speed_plots.R
@@ -33,6 +33,7 @@ gen_speed <- function(dbfile)
{
data <- get_data_subset(dbfile, 0L, 0L, "False", get_bsize_reference())
data <- subset(data, algo != get_one_node_reference_algorithm())
+ data <- subset(data, global_time >= 0)
all_model <- unique(data$model)
for (i in 1:length(all_model))
diff --git a/Utils/benchmark/gen_speedup_plots.R b/Utils/benchmark/gen_speedup_plots.R
index b8bc76269..b4de12d16 100644
--- a/Utils/benchmark/gen_speedup_plots.R
+++ b/Utils/benchmark/gen_speedup_plots.R
@@ -54,6 +54,7 @@ gen_speedup <- function(dbfile)
{
data <- get_data_subset(dbfile, 0L, 0L, "False", get_bsize_reference())
data <- subset(data, algo != get_one_node_reference_algorithm())
+ data <- subset(data, global_time >= 0)
all_model <- unique(data$model)
for (i in 1:length(all_model))
diff --git a/Utils/benchmark/generate_graph.R b/Utils/benchmark/generate_graph.R
index 7818e31bf..5d634bc00 100644
--- a/Utils/benchmark/generate_graph.R
+++ b/Utils/benchmark/generate_graph.R
@@ -14,8 +14,8 @@ source("gen_group_size_plots.R")
###
print("Generate Communication volume plot")
gen_comm("loutre.db")
-print("Generate Group size plot")
-gen_group_size("loutre.db")
+#print("Generate Group size plot")
+#gen_group_size("loutre.db")
print("Generate Speed plot")
gen_speed("loutre.db")
#print("Generate times task plot")
diff --git a/Utils/benchmark/loutre.py b/Utils/benchmark/loutre.py
index d91b7ed92..6c5a44d34 100755
--- a/Utils/benchmark/loutre.py
+++ b/Utils/benchmark/loutre.py
@@ -265,7 +265,7 @@ def main():
config=ScalFMMConfig()
rmem = 0
- global_time = 0.0
+ global_time = -1.0
runtime_time = 0.0
task_time = 0.0
idle_time = 0.0
--
GitLab