From 5c82271daa16d0cff39d4d42789f281846fa4a80 Mon Sep 17 00:00:00 2001 From: Christian Heinrich <christian@gladbachcity.de> Date: Tue, 10 Jan 2017 21:53:16 +0100 Subject: [PATCH] Changed send_is_detached_thres to send-is-detached-thres --- data/final_platforms/old_miriel.xml | 2 +- data/final_platforms/sirocco.xml | 2 +- data/miriel_27_06_2016/calibration/Analysis.Rmd | 2 +- data/miriel_27_06_2016/calibration/testplatform.Rmd | 2 +- data/miriel_27_06_2016/calibration/testplatform.html | 2 +- data/miriel_27_06_2016/calibration/testplatform.md | 2 +- data/miriel_27_06_2016/calibration/testplatform_output.xml | 2 +- data/plafrim_15_06_16/calibration/Analysis.Rmd | 2 +- data/plafrim_15_06_16/calibration/testplatform.Rmd | 2 +- data/plafrim_15_06_16/calibration/testplatform.html | 2 +- data/plafrim_15_06_16/calibration/testplatform.md | 2 +- data/plafrim_15_06_16/calibration/testplatform_output.xml | 2 +- data/sirocco_01_08_2016/calibration/Analysis.Rmd | 2 +- data/sirocco_01_08_2016/calibration/sirocco_output.xml | 2 +- data/sirocco_01_08_2016/calibration/testplatform.Rmd | 2 +- data/sirocco_01_08_2016/calibration/testplatform.html | 2 +- data/sirocco_01_08_2016/calibration/testplatform.md | 2 +- data/taurus_26_07_2016/calibration/Analysis.Rmd | 2 +- .../calibration/taurus-2016-06-09--1_output.xml | 2 +- data/taurus_26_07_2016/calibration/taurus.Rmd | 2 +- data/taurus_26_07_2016/calibration/taurus.html | 2 +- data/taurus_26_07_2016/calibration/taurus.md | 2 +- data/taurus_26_07_2016/calibration/taurus_output.xml | 2 +- src/calibration/Analysis.Rmd | 2 +- src/calibration/examples/Analysis.Rmd | 2 +- src/calibration/examples/stampede.txt | 2 +- src/calibration/examples/stampede_output.xml | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/data/final_platforms/old_miriel.xml b/data/final_platforms/old_miriel.xml index 9d3a849..2997055 100644 --- a/data/final_platforms/old_miriel.xml +++ b/data/final_platforms/old_miriel.xml @@ -26,7 +26,7 @@ <prop id="smpi/bw-factor" value="0:0.057020586149179;1420:0.955647413834744;65536:1.55105118737739;131072:0.683839496893133;450000:0.613154277278705"/> <prop id="smpi/lat-factor" value="0:0.421545218360744;1420:1.15371118224093;65536:1.89572829187563;131072:1.77078433749545;450000:0.698058157888401"/> <prop id="smpi/async-small-thres" value="17408"/> - <prop id="smpi/send_is_detached_thres" value="17408"/> + <prop id="smpi/send-is-detached-thres" value="17408"/> <prop id="smpi/wtime" value="4.08585e-08"/> <prop id="smpi/iprobe" value="2.56968726731199e-07"/> <prop id="smpi/test" value="2.45836195508587e-07"/> diff --git a/data/final_platforms/sirocco.xml b/data/final_platforms/sirocco.xml index 7116cb3..94d1400 100644 --- a/data/final_platforms/sirocco.xml +++ b/data/final_platforms/sirocco.xml @@ -26,7 +26,7 @@ <prop id="smpi/bw-factor" value="0:0.124230489840844;1420:0.311345781078732;65536:0.344336843153613;131072:0.290935589385778;4e+05:0.291581596908999"/> <prop id="smpi/lat-factor" value="0:0.737322772282333;1420:1.16891951785859;65536:1.55145779857452;131072:4.44599650869728;4e+05:4.47543800174862"/> <prop id="smpi/async-small-thres" value="65536"/> -<prop id="smpi/send_is_detached_thres" value="320000"/> +<prop id="smpi/send-is-detached-thres" value="320000"/> <prop id="smpi/wtime" value="3.098699e-08"/> <prop id="smpi/iprobe" value="2.33927297668038e-07"/> <prop id="smpi/test" value="2.28018867924528e-07"/> diff --git a/data/miriel_27_06_2016/calibration/Analysis.Rmd b/data/miriel_27_06_2016/calibration/Analysis.Rmd index 523b137..eaf0b99 100644 --- a/data/miriel_27_06_2016/calibration/Analysis.Rmd +++ b/data/miriel_27_06_2016/calibration/Analysis.Rmd @@ -305,7 +305,7 @@ desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/ois",Limit=Limit, des desc <- ddply(desc,c("Name"),summarize,label=paste(desc,collapse = ';')) as <- xmlNode("prop", attrs = c(id="smpi/async-small-thres", value=eager_threshold)) - de <- xmlNode("prop", attrs = c(id="smpi/send_is_detached_thres", value= detached_threshold)) + de <- xmlNode("prop", attrs = c(id="smpi/send-is-detached-thres", value= detached_threshold)) bw <- xmlNode("prop", attrs = c(id="smpi/bw-factor", value=desc[desc$Name=="smpi/bw-factor",]$label)) lat <- xmlNode("prop", attrs = c(id="smpi/lat-factor", value=desc[desc$Name=="smpi/lat-factor",]$label)) os <- xmlNode("prop", attrs = c(id="smpi/os", value=desc[desc$Name=="smpi/os",]$label)) diff --git a/data/miriel_27_06_2016/calibration/testplatform.Rmd b/data/miriel_27_06_2016/calibration/testplatform.Rmd index 7a6f8ef..5dc60ae 100644 --- a/data/miriel_27_06_2016/calibration/testplatform.Rmd +++ b/data/miriel_27_06_2016/calibration/testplatform.Rmd @@ -391,7 +391,7 @@ The following snippet of XML has to be included at the beginning of your platfor ## <prop id="smpi/bw-factor" value="0:0.0636575813349588;1420:0.983495291166692;65536:1.52596144919948;131072:0.717251283995903;4e+05:0.619663249676955"/> ## <prop id="smpi/lat-factor" value="0:0.424821296069165;1420:1.16678508115501;65536:1.86811479079315;131072:2.0798208704917;4e+05:0.923798288770192"/> ## <prop id="smpi/async-small-thres" value="17408"/> -## <prop id="smpi/send_is_detached_thres" value="17408"/> +## <prop id="smpi/send-is-detached-thres" value="17408"/> ## <prop id="smpi/wtime" value="4.085767e-08"/> ## <prop id="smpi/iprobe" value="2.75181277860327e-07"/> ## <prop id="smpi/test" value="2.60107333333333e-07"/> diff --git a/data/miriel_27_06_2016/calibration/testplatform.html b/data/miriel_27_06_2016/calibration/testplatform.html index ab8e420..d26ab7a 100644 --- a/data/miriel_27_06_2016/calibration/testplatform.html +++ b/data/miriel_27_06_2016/calibration/testplatform.html @@ -547,7 +547,7 @@ Time for one MPI_Test call</p> ## <prop id="smpi/bw-factor" value="0:0.0636575813349588;1420:0.983495291166692;65536:1.52596144919948;131072:0.717251283995903;4e+05:0.619663249676955"/> ## <prop id="smpi/lat-factor" value="0:0.424821296069165;1420:1.16678508115501;65536:1.86811479079315;131072:2.0798208704917;4e+05:0.923798288770192"/> ## <prop id="smpi/async-small-thres" value="17408"/> -## <prop id="smpi/send_is_detached_thres" value="17408"/> +## <prop id="smpi/send-is-detached-thres" value="17408"/> ## <prop id="smpi/wtime" value="4.085767e-08"/> ## <prop id="smpi/iprobe" value="2.75181277860327e-07"/> ## <prop id="smpi/test" value="2.60107333333333e-07"/> diff --git a/data/miriel_27_06_2016/calibration/testplatform.md b/data/miriel_27_06_2016/calibration/testplatform.md index 7a6f8ef..5dc60ae 100644 --- a/data/miriel_27_06_2016/calibration/testplatform.md +++ b/data/miriel_27_06_2016/calibration/testplatform.md @@ -391,7 +391,7 @@ The following snippet of XML has to be included at the beginning of your platfor ## <prop id="smpi/bw-factor" value="0:0.0636575813349588;1420:0.983495291166692;65536:1.52596144919948;131072:0.717251283995903;4e+05:0.619663249676955"/> ## <prop id="smpi/lat-factor" value="0:0.424821296069165;1420:1.16678508115501;65536:1.86811479079315;131072:2.0798208704917;4e+05:0.923798288770192"/> ## <prop id="smpi/async-small-thres" value="17408"/> -## <prop id="smpi/send_is_detached_thres" value="17408"/> +## <prop id="smpi/send-is-detached-thres" value="17408"/> ## <prop id="smpi/wtime" value="4.085767e-08"/> ## <prop id="smpi/iprobe" value="2.75181277860327e-07"/> ## <prop id="smpi/test" value="2.60107333333333e-07"/> diff --git a/data/miriel_27_06_2016/calibration/testplatform_output.xml b/data/miriel_27_06_2016/calibration/testplatform_output.xml index c1fc351..6f0f283 100644 --- a/data/miriel_27_06_2016/calibration/testplatform_output.xml +++ b/data/miriel_27_06_2016/calibration/testplatform_output.xml @@ -6,7 +6,7 @@ <prop id="smpi/bw-factor" value="0:0.0636575813349588;1420:0.983495291166692;65536:1.52596144919948;131072:0.717251283995903;4e+05:0.619663249676955"/> <prop id="smpi/lat-factor" value="0:0.424821296069165;1420:1.16678508115501;65536:1.86811479079315;131072:2.0798208704917;4e+05:0.923798288770192"/> <prop id="smpi/async-small-thres" value="17408"/> - <prop id="smpi/send_is_detached_thres" value="17408"/> + <prop id="smpi/send-is-detached-thres" value="17408"/> <prop id="smpi/wtime" value="4.085767e-08"/> <prop id="smpi/iprobe" value="2.75181277860327e-07"/> <prop id="smpi/test" value="2.60107333333333e-07"/> diff --git a/data/plafrim_15_06_16/calibration/Analysis.Rmd b/data/plafrim_15_06_16/calibration/Analysis.Rmd index 523b137..eaf0b99 100644 --- a/data/plafrim_15_06_16/calibration/Analysis.Rmd +++ b/data/plafrim_15_06_16/calibration/Analysis.Rmd @@ -305,7 +305,7 @@ desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/ois",Limit=Limit, des desc <- ddply(desc,c("Name"),summarize,label=paste(desc,collapse = ';')) as <- xmlNode("prop", attrs = c(id="smpi/async-small-thres", value=eager_threshold)) - de <- xmlNode("prop", attrs = c(id="smpi/send_is_detached_thres", value= detached_threshold)) + de <- xmlNode("prop", attrs = c(id="smpi/send-is-detached-thres", value= detached_threshold)) bw <- xmlNode("prop", attrs = c(id="smpi/bw-factor", value=desc[desc$Name=="smpi/bw-factor",]$label)) lat <- xmlNode("prop", attrs = c(id="smpi/lat-factor", value=desc[desc$Name=="smpi/lat-factor",]$label)) os <- xmlNode("prop", attrs = c(id="smpi/os", value=desc[desc$Name=="smpi/os",]$label)) diff --git a/data/plafrim_15_06_16/calibration/testplatform.Rmd b/data/plafrim_15_06_16/calibration/testplatform.Rmd index d9e433f..8e5c446 100644 --- a/data/plafrim_15_06_16/calibration/testplatform.Rmd +++ b/data/plafrim_15_06_16/calibration/testplatform.Rmd @@ -396,7 +396,7 @@ The following snippet of XML has to be included at the beginning of your platfor ## <prop id="smpi/bw-factor" value="0:0.057020586149179;1420:0.955647413834744;65536:1.55105118737739;131072:0.683839496893133;450000:0.613154277278705"/> ## <prop id="smpi/lat-factor" value="0:0.421545218360744;1420:1.15371118224093;65536:1.89572829187563;131072:1.77078433749545;450000:0.698058157888401"/> ## <prop id="smpi/async-small-thres" value="17408"/> -## <prop id="smpi/send_is_detached_thres" value="17408"/> +## <prop id="smpi/send-is-detached-thres" value="17408"/> ## <prop id="smpi/wtime" value="4.08585e-08"/> ## <prop id="smpi/iprobe" value="2.56968726731199e-07"/> ## <prop id="smpi/test" value="2.45836195508587e-07"/> diff --git a/data/plafrim_15_06_16/calibration/testplatform.html b/data/plafrim_15_06_16/calibration/testplatform.html index 4bd453e..4541020 100644 --- a/data/plafrim_15_06_16/calibration/testplatform.html +++ b/data/plafrim_15_06_16/calibration/testplatform.html @@ -552,7 +552,7 @@ Time for one MPI_Test call</p> ## <prop id="smpi/bw-factor" value="0:0.057020586149179;1420:0.955647413834744;65536:1.55105118737739;131072:0.683839496893133;450000:0.613154277278705"/> ## <prop id="smpi/lat-factor" value="0:0.421545218360744;1420:1.15371118224093;65536:1.89572829187563;131072:1.77078433749545;450000:0.698058157888401"/> ## <prop id="smpi/async-small-thres" value="17408"/> -## <prop id="smpi/send_is_detached_thres" value="17408"/> +## <prop id="smpi/send-is-detached-thres" value="17408"/> ## <prop id="smpi/wtime" value="4.08585e-08"/> ## <prop id="smpi/iprobe" value="2.56968726731199e-07"/> ## <prop id="smpi/test" value="2.45836195508587e-07"/> diff --git a/data/plafrim_15_06_16/calibration/testplatform.md b/data/plafrim_15_06_16/calibration/testplatform.md index d9e433f..8e5c446 100644 --- a/data/plafrim_15_06_16/calibration/testplatform.md +++ b/data/plafrim_15_06_16/calibration/testplatform.md @@ -396,7 +396,7 @@ The following snippet of XML has to be included at the beginning of your platfor ## <prop id="smpi/bw-factor" value="0:0.057020586149179;1420:0.955647413834744;65536:1.55105118737739;131072:0.683839496893133;450000:0.613154277278705"/> ## <prop id="smpi/lat-factor" value="0:0.421545218360744;1420:1.15371118224093;65536:1.89572829187563;131072:1.77078433749545;450000:0.698058157888401"/> ## <prop id="smpi/async-small-thres" value="17408"/> -## <prop id="smpi/send_is_detached_thres" value="17408"/> +## <prop id="smpi/send-is-detached-thres" value="17408"/> ## <prop id="smpi/wtime" value="4.08585e-08"/> ## <prop id="smpi/iprobe" value="2.56968726731199e-07"/> ## <prop id="smpi/test" value="2.45836195508587e-07"/> diff --git a/data/plafrim_15_06_16/calibration/testplatform_output.xml b/data/plafrim_15_06_16/calibration/testplatform_output.xml index 04e0b20..7616d90 100644 --- a/data/plafrim_15_06_16/calibration/testplatform_output.xml +++ b/data/plafrim_15_06_16/calibration/testplatform_output.xml @@ -6,7 +6,7 @@ <prop id="smpi/bw-factor" value="0:0.057020586149179;1420:0.955647413834744;65536:1.55105118737739;131072:0.683839496893133;450000:0.613154277278705"/> <prop id="smpi/lat-factor" value="0:0.421545218360744;1420:1.15371118224093;65536:1.89572829187563;131072:1.77078433749545;450000:0.698058157888401"/> <prop id="smpi/async-small-thres" value="17408"/> - <prop id="smpi/send_is_detached_thres" value="17408"/> + <prop id="smpi/send-is-detached-thres" value="17408"/> <prop id="smpi/wtime" value="4.08585e-08"/> <prop id="smpi/iprobe" value="2.56968726731199e-07"/> <prop id="smpi/test" value="2.45836195508587e-07"/> diff --git a/data/sirocco_01_08_2016/calibration/Analysis.Rmd b/data/sirocco_01_08_2016/calibration/Analysis.Rmd index 8c421f9..b4b75ab 100644 --- a/data/sirocco_01_08_2016/calibration/Analysis.Rmd +++ b/data/sirocco_01_08_2016/calibration/Analysis.Rmd @@ -306,7 +306,7 @@ desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/ois",Limit=Limit, des desc <- ddply(desc,c("Name"),summarize,label=paste(desc,collapse = ';')) as <- xmlNode("prop", attrs = c(id="smpi/async-small-thres", value=eager_threshold)) - de <- xmlNode("prop", attrs = c(id="smpi/send_is_detached_thres", value= detached_threshold)) + de <- xmlNode("prop", attrs = c(id="smpi/send-is-detached-thres", value= detached_threshold)) bw <- xmlNode("prop", attrs = c(id="smpi/bw-factor", value=desc[desc$Name=="smpi/bw-factor",]$label)) lat <- xmlNode("prop", attrs = c(id="smpi/lat-factor", value=desc[desc$Name=="smpi/lat-factor",]$label)) os <- xmlNode("prop", attrs = c(id="smpi/os", value=desc[desc$Name=="smpi/os",]$label)) diff --git a/data/sirocco_01_08_2016/calibration/sirocco_output.xml b/data/sirocco_01_08_2016/calibration/sirocco_output.xml index eb72ead..df5ab18 100644 --- a/data/sirocco_01_08_2016/calibration/sirocco_output.xml +++ b/data/sirocco_01_08_2016/calibration/sirocco_output.xml @@ -6,7 +6,7 @@ <prop id="smpi/bw-factor" value="0:0.124230489840844;1420:0.311345781078732;65536:0.344336843153613;131072:0.290935589385778;4e+05:0.291581596908999"/> <prop id="smpi/lat-factor" value="0:0.737322772282333;1420:1.16891951785859;65536:1.55145779857452;131072:4.44599650869728;4e+05:4.47543800174862"/> <prop id="smpi/async-small-thres" value="65536"/> - <prop id="smpi/send_is_detached_thres" value="320000"/> + <prop id="smpi/send-is-detached-thres" value="320000"/> <prop id="smpi/wtime" value="3.098699e-08"/> <prop id="smpi/iprobe" value="2.33927297668038e-07"/> <prop id="smpi/test" value="2.28018867924528e-07"/> diff --git a/data/sirocco_01_08_2016/calibration/testplatform.Rmd b/data/sirocco_01_08_2016/calibration/testplatform.Rmd index e9aecf0..fde70bf 100644 --- a/data/sirocco_01_08_2016/calibration/testplatform.Rmd +++ b/data/sirocco_01_08_2016/calibration/testplatform.Rmd @@ -522,7 +522,7 @@ The following snippet of XML has to be included at the beginning of your platfor ## <prop id="smpi/bw-factor" value="0:0.124230489840844;1420:0.311345781078732;65536:0.344336843153613;131072:0.290935589385778;4e+05:0.291581596908999"/> ## <prop id="smpi/lat-factor" value="0:0.737322772282333;1420:1.16891951785859;65536:1.55145779857452;131072:4.44599650869728;4e+05:4.47543800174862"/> ## <prop id="smpi/async-small-thres" value="65536"/> -## <prop id="smpi/send_is_detached_thres" value="320000"/> +## <prop id="smpi/send-is-detached-thres" value="320000"/> ## <prop id="smpi/wtime" value="3.098699e-08"/> ## <prop id="smpi/iprobe" value="2.33927297668038e-07"/> ## <prop id="smpi/test" value="2.28018867924528e-07"/> diff --git a/data/sirocco_01_08_2016/calibration/testplatform.html b/data/sirocco_01_08_2016/calibration/testplatform.html index d7bd98f..ec4bd8a 100644 --- a/data/sirocco_01_08_2016/calibration/testplatform.html +++ b/data/sirocco_01_08_2016/calibration/testplatform.html @@ -678,7 +678,7 @@ Time for one MPI_Test call</p> ## <prop id="smpi/bw-factor" value="0:0.124230489840844;1420:0.311345781078732;65536:0.344336843153613;131072:0.290935589385778;4e+05:0.291581596908999"/> ## <prop id="smpi/lat-factor" value="0:0.737322772282333;1420:1.16891951785859;65536:1.55145779857452;131072:4.44599650869728;4e+05:4.47543800174862"/> ## <prop id="smpi/async-small-thres" value="65536"/> -## <prop id="smpi/send_is_detached_thres" value="320000"/> +## <prop id="smpi/send-is-detached-thres" value="320000"/> ## <prop id="smpi/wtime" value="3.098699e-08"/> ## <prop id="smpi/iprobe" value="2.33927297668038e-07"/> ## <prop id="smpi/test" value="2.28018867924528e-07"/> diff --git a/data/sirocco_01_08_2016/calibration/testplatform.md b/data/sirocco_01_08_2016/calibration/testplatform.md index e9aecf0..fde70bf 100644 --- a/data/sirocco_01_08_2016/calibration/testplatform.md +++ b/data/sirocco_01_08_2016/calibration/testplatform.md @@ -522,7 +522,7 @@ The following snippet of XML has to be included at the beginning of your platfor ## <prop id="smpi/bw-factor" value="0:0.124230489840844;1420:0.311345781078732;65536:0.344336843153613;131072:0.290935589385778;4e+05:0.291581596908999"/> ## <prop id="smpi/lat-factor" value="0:0.737322772282333;1420:1.16891951785859;65536:1.55145779857452;131072:4.44599650869728;4e+05:4.47543800174862"/> ## <prop id="smpi/async-small-thres" value="65536"/> -## <prop id="smpi/send_is_detached_thres" value="320000"/> +## <prop id="smpi/send-is-detached-thres" value="320000"/> ## <prop id="smpi/wtime" value="3.098699e-08"/> ## <prop id="smpi/iprobe" value="2.33927297668038e-07"/> ## <prop id="smpi/test" value="2.28018867924528e-07"/> diff --git a/data/taurus_26_07_2016/calibration/Analysis.Rmd b/data/taurus_26_07_2016/calibration/Analysis.Rmd index 8c421f9..b4b75ab 100644 --- a/data/taurus_26_07_2016/calibration/Analysis.Rmd +++ b/data/taurus_26_07_2016/calibration/Analysis.Rmd @@ -306,7 +306,7 @@ desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/ois",Limit=Limit, des desc <- ddply(desc,c("Name"),summarize,label=paste(desc,collapse = ';')) as <- xmlNode("prop", attrs = c(id="smpi/async-small-thres", value=eager_threshold)) - de <- xmlNode("prop", attrs = c(id="smpi/send_is_detached_thres", value= detached_threshold)) + de <- xmlNode("prop", attrs = c(id="smpi/send-is-detached-thres", value= detached_threshold)) bw <- xmlNode("prop", attrs = c(id="smpi/bw-factor", value=desc[desc$Name=="smpi/bw-factor",]$label)) lat <- xmlNode("prop", attrs = c(id="smpi/lat-factor", value=desc[desc$Name=="smpi/lat-factor",]$label)) os <- xmlNode("prop", attrs = c(id="smpi/os", value=desc[desc$Name=="smpi/os",]$label)) diff --git a/data/taurus_26_07_2016/calibration/taurus-2016-06-09--1_output.xml b/data/taurus_26_07_2016/calibration/taurus-2016-06-09--1_output.xml index c90a9e9..52e5766 100644 --- a/data/taurus_26_07_2016/calibration/taurus-2016-06-09--1_output.xml +++ b/data/taurus_26_07_2016/calibration/taurus-2016-06-09--1_output.xml @@ -6,7 +6,7 @@ <prop id="smpi/bw-factor" value="0:0.00874688662522859;1420:0.147211715861806;33500:0.107192502175564;65536:0.187807186806016;320000:0.0958499316204859"/> <prop id="smpi/lat-factor" value="0:2.12853331297438;1420:5.19380442595492;33500:4.24573375719345;65536:6.9874709829732;320000:6.23567954616888"/> <prop id="smpi/async-small-thres" value="65536"/> - <prop id="smpi/send_is_detached_thres" value="320000"/> + <prop id="smpi/send-is-detached-thres" value="320000"/> <prop id="smpi/wtime" value="4.195637e-08"/> <prop id="smpi/iprobe" value="3.49479752916953e-07"/> <prop id="smpi/test" value="2.46327639751553e-07"/> diff --git a/data/taurus_26_07_2016/calibration/taurus.Rmd b/data/taurus_26_07_2016/calibration/taurus.Rmd index 5c36364..0e959fa 100644 --- a/data/taurus_26_07_2016/calibration/taurus.Rmd +++ b/data/taurus_26_07_2016/calibration/taurus.Rmd @@ -559,7 +559,7 @@ The following snippet of XML has to be included at the beginning of your platfor ## <prop id="smpi/bw-factor" value="0:0.00874688662522859;1420:0.147211715861806;33500:0.107192502175564;65536:0.187807186806016;320000:0.0958499316204859"/> ## <prop id="smpi/lat-factor" value="0:2.12853331297438;1420:5.19380442595492;33500:4.24573375719345;65536:6.9874709829732;320000:6.23567954616888"/> ## <prop id="smpi/async-small-thres" value="65536"/> -## <prop id="smpi/send_is_detached_thres" value="320000"/> +## <prop id="smpi/send-is-detached-thres" value="320000"/> ## <prop id="smpi/wtime" value="4.195637e-08"/> ## <prop id="smpi/iprobe" value="3.49479752916953e-07"/> ## <prop id="smpi/test" value="2.46327639751553e-07"/> diff --git a/data/taurus_26_07_2016/calibration/taurus.html b/data/taurus_26_07_2016/calibration/taurus.html index 815fbb6..3029d0f 100644 --- a/data/taurus_26_07_2016/calibration/taurus.html +++ b/data/taurus_26_07_2016/calibration/taurus.html @@ -715,7 +715,7 @@ Time for one MPI_Test call</p> ## <prop id="smpi/bw-factor" value="0:0.00874688662522859;1420:0.147211715861806;33500:0.107192502175564;65536:0.187807186806016;320000:0.0958499316204859"/> ## <prop id="smpi/lat-factor" value="0:2.12853331297438;1420:5.19380442595492;33500:4.24573375719345;65536:6.9874709829732;320000:6.23567954616888"/> ## <prop id="smpi/async-small-thres" value="65536"/> -## <prop id="smpi/send_is_detached_thres" value="320000"/> +## <prop id="smpi/send-is-detached-thres" value="320000"/> ## <prop id="smpi/wtime" value="4.195637e-08"/> ## <prop id="smpi/iprobe" value="3.49479752916953e-07"/> ## <prop id="smpi/test" value="2.46327639751553e-07"/> diff --git a/data/taurus_26_07_2016/calibration/taurus.md b/data/taurus_26_07_2016/calibration/taurus.md index 5c36364..0e959fa 100644 --- a/data/taurus_26_07_2016/calibration/taurus.md +++ b/data/taurus_26_07_2016/calibration/taurus.md @@ -559,7 +559,7 @@ The following snippet of XML has to be included at the beginning of your platfor ## <prop id="smpi/bw-factor" value="0:0.00874688662522859;1420:0.147211715861806;33500:0.107192502175564;65536:0.187807186806016;320000:0.0958499316204859"/> ## <prop id="smpi/lat-factor" value="0:2.12853331297438;1420:5.19380442595492;33500:4.24573375719345;65536:6.9874709829732;320000:6.23567954616888"/> ## <prop id="smpi/async-small-thres" value="65536"/> -## <prop id="smpi/send_is_detached_thres" value="320000"/> +## <prop id="smpi/send-is-detached-thres" value="320000"/> ## <prop id="smpi/wtime" value="4.195637e-08"/> ## <prop id="smpi/iprobe" value="3.49479752916953e-07"/> ## <prop id="smpi/test" value="2.46327639751553e-07"/> diff --git a/data/taurus_26_07_2016/calibration/taurus_output.xml b/data/taurus_26_07_2016/calibration/taurus_output.xml index a269c9d..aaa1a10 100644 --- a/data/taurus_26_07_2016/calibration/taurus_output.xml +++ b/data/taurus_26_07_2016/calibration/taurus_output.xml @@ -6,5 +6,5 @@ <prop id="smpi/bw-factor"/> <prop id="smpi/lat-factor"/> <prop id="smpi/async-small-thres" value="65536"/> - <prop id="smpi/send_is_detached_thres" value="260000"/> + <prop id="smpi/send-is-detached-thres" value="260000"/> </config> diff --git a/src/calibration/Analysis.Rmd b/src/calibration/Analysis.Rmd index 8c421f9..b4b75ab 100644 --- a/src/calibration/Analysis.Rmd +++ b/src/calibration/Analysis.Rmd @@ -306,7 +306,7 @@ desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/ois",Limit=Limit, des desc <- ddply(desc,c("Name"),summarize,label=paste(desc,collapse = ';')) as <- xmlNode("prop", attrs = c(id="smpi/async-small-thres", value=eager_threshold)) - de <- xmlNode("prop", attrs = c(id="smpi/send_is_detached_thres", value= detached_threshold)) + de <- xmlNode("prop", attrs = c(id="smpi/send-is-detached-thres", value= detached_threshold)) bw <- xmlNode("prop", attrs = c(id="smpi/bw-factor", value=desc[desc$Name=="smpi/bw-factor",]$label)) lat <- xmlNode("prop", attrs = c(id="smpi/lat-factor", value=desc[desc$Name=="smpi/lat-factor",]$label)) os <- xmlNode("prop", attrs = c(id="smpi/os", value=desc[desc$Name=="smpi/os",]$label)) diff --git a/src/calibration/examples/Analysis.Rmd b/src/calibration/examples/Analysis.Rmd index 523b137..eaf0b99 100644 --- a/src/calibration/examples/Analysis.Rmd +++ b/src/calibration/examples/Analysis.Rmd @@ -305,7 +305,7 @@ desc=rbind(desc, ddply(bp,c("Name"), summarize, Name="smpi/ois",Limit=Limit, des desc <- ddply(desc,c("Name"),summarize,label=paste(desc,collapse = ';')) as <- xmlNode("prop", attrs = c(id="smpi/async-small-thres", value=eager_threshold)) - de <- xmlNode("prop", attrs = c(id="smpi/send_is_detached_thres", value= detached_threshold)) + de <- xmlNode("prop", attrs = c(id="smpi/send-is-detached-thres", value= detached_threshold)) bw <- xmlNode("prop", attrs = c(id="smpi/bw-factor", value=desc[desc$Name=="smpi/bw-factor",]$label)) lat <- xmlNode("prop", attrs = c(id="smpi/lat-factor", value=desc[desc$Name=="smpi/lat-factor",]$label)) os <- xmlNode("prop", attrs = c(id="smpi/os", value=desc[desc$Name=="smpi/os",]$label)) diff --git a/src/calibration/examples/stampede.txt b/src/calibration/examples/stampede.txt index e9ea1bc..cb59a28 100644 --- a/src/calibration/examples/stampede.txt +++ b/src/calibration/examples/stampede.txt @@ -316,7 +316,7 @@ Print results in Simgrid's xml format ``` ``` - ## Error in xmlNode("prop", attrs = c(id = "smpi/send_is_detached_thres", : object 'detached_threshold' not found + ## Error in xmlNode("prop", attrs = c(id = "smpi/send-is-detached-thres", : object 'detached_threshold' not found ``` ``` diff --git a/src/calibration/examples/stampede_output.xml b/src/calibration/examples/stampede_output.xml index 278a58b..a83bfa3 100644 --- a/src/calibration/examples/stampede_output.xml +++ b/src/calibration/examples/stampede_output.xml @@ -6,7 +6,7 @@ <prop id="smpi/bw-factor" value="0:1.0212271015512;4120:1.00592739101783;17408:1.32354721253027"/> <prop id="smpi/lat-factor" value="0:0.000453157054255973;4120:0.149947156921692;17408:0.260476437970144"/> <prop id="smpi/async-small-thres" value="17408"/> - <prop id="smpi/send_is_detached_thres" value="17408"/> + <prop id="smpi/send-is-detached-thres" value="17408"/> <prop id="smpi/wtime" value="3.54637e-08"/> <prop id="smpi/iprobe" value="4.44178571428571e-07"/> <prop id="smpi/test" value="6.73535714285714e-07"/> -- GitLab