diff --git a/garlic/exp/saiph/scaling.nix b/garlic/exp/saiph/scaling.nix index f69df8f9..64ee9a63 100644 --- a/garlic/exp/saiph/scaling.nix +++ b/garlic/exp/saiph/scaling.nix @@ -56,7 +56,6 @@ let }; #configs = filter (el: if el.nbly == 1 && el.nblz == 1 && el.nodes == 1 && el.gitCommit == "3b52a616d44f4b86880663e2d951ad89c1dcab4f" then false else true) configsAll; - exec = {nextStage, conf, ...}: with conf; stages.exec { inherit nextStage; env = '' diff --git a/garlic/fig/saiph/scaling.R b/garlic/fig/saiph/scaling.R index dc587e3d..f9e1b03c 100644 --- a/garlic/fig/saiph/scaling.R +++ b/garlic/fig/saiph/scaling.R @@ -15,14 +15,15 @@ dataset = jsonlite::stream_in(file(input_file)) %>% # We only need the nblocks and time -df = select(dataset, config.nby, config.nodes, time, total_time) %>% - rename(nby=config.nby, nnodes=config.nodes) +df = select(dataset, config.nby, config.nodes, time, total_time, config.gitCommit) %>% + rename(nby=config.nby, nnodes=config.nodes, gitCommit=config.gitCommit) df$nby = as.factor(df$nby) df$nodes = as.factor(df$nnodes) +df$gitCommit = as.factor(df$gitCommit) # Normalize the time by the median -D=group_by(df, nby, nodes) %>% +D=group_by(df, nby, nodes, gitCommit) %>% mutate(tmedian = median(time)) %>% mutate(ttmedian = median(total_time)) %>% mutate(tnorm = time / tmedian - 1) %>% @@ -37,7 +38,7 @@ print(D) ppi=300 h=5 -w=5 +w=8 png("box.png", width=w*ppi, height=h*ppi, res=ppi) # @@ -94,9 +95,11 @@ p = ggplot(D, aes(x=nby, y=time)) + theme(plot.subtitle=element_text(size=8)) + theme(legend.position = c(0.5, 0.88)) + - geom_point(shape=21, size=3) + + geom_point(aes(color=nodes), shape=21, size=3) + #scale_x_continuous(trans=log2_trans()) + - scale_y_continuous(trans=log2_trans()) + scale_y_continuous(trans=log2_trans()) + + facet_wrap( ~ gitCommit) + # Render the plot print(p) @@ -120,7 +123,8 @@ p = ggplot(D, aes(x=nby, y=time)) + geom_line(aes(y=tmedian, color=nodes, group=nodes)) + geom_line(aes(y=ttmedian, color=nodes, group=nodes)) + #scale_x_continuous(trans=log2_trans()) + - scale_y_continuous(trans=log2_trans()) + scale_y_continuous(trans=log2_trans()) + + facet_wrap( ~ gitCommit) # Render the plot print(p) @@ -142,7 +146,8 @@ p = ggplot(D, aes(x=nby, y=tn)) + geom_point(shape=21, size=3) + geom_line(aes(color=nodes, group=nodes)) + #scale_x_continuous(trans=log2_trans()) + - scale_y_continuous(trans=log2_trans()) + scale_y_continuous(trans=log2_trans()) + + facet_wrap( ~ gitCommit) # Render the plot print(p)