Commit 8ec4774c authored by Martin Khannouz's avatar Martin Khannouz Committed by Berenger Bramas

Fix python script and R script

parent e3eb1880
......@@ -38,6 +38,7 @@ compute_efficiency <- function(data, n)
#sdata <- subset(data, npart == n & height == h & model == m)
sdata <- subset(data, npart == n)
# Compute task efficiency
#tt_1 <- subset(sdata, event == "task_time" & nthreads == 1)
tt_1 <- subset(sdata, event == "task_time" & nnode == 1)
......@@ -98,11 +99,13 @@ gen_efficiency <- function(data_init, algo_wanted, model_wanted)
gen_efficiencies_plot(output, sdata)
}
}
gen_efficiencies <- function(dbfile)
{
data_init <- get_data_subset(dbfile, 0L, 0L, "False")
data_init <- subset(data_init, algo != get_one_node_reference_algorithm())
data <- melt(data_init, id=c("model", "algo", "nnode", "nthreads", "npart","height","bsize"))
data <- rename(data, c("variable"="event", "value"="duration"))
all_algorithm <- unique(data$algo)
......
......@@ -159,11 +159,7 @@ def main():
a = re.findall("[-+]?\d*\.\d+|\d+", line)
if len(a) == 1:
global_time = a[0]
elif re.search("Total Particles", line):
a = re.findall("[-+]?\d*\.\d+|\d+", line)
if len(a) == 1:
config.num_particules = int(a[0])
elif re.search("Total Particles", line):
elif re.search("Total particles", line):
a = re.findall("[-+]?\d*\.\d+|\d+", line)
if len(a) == 1:
config.num_particules = int(a[0])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment