Add test for the (still very experimental) automatic evaluation of collective algorithms

Just to test the last non covered file in smpi.

diff --git a/teshsuite/smpi/allreduce/CMakeLists.txt b/teshsuite/smpi/allreduce/CMakeLists.txt
index 3db2745..257aaee 100644 (file)
--- a/teshsuite/smpi/allreduce/CMakeLists.txt
+++ b/teshsuite/smpi/allreduce/CMakeLists.txt
@@ -16,6 +16,7 @@ set(tesh_files
   ${tesh_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/allreduce_coll.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/allreduce_coll_large.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/allreduce_coll_automatic.tesh
   PARENT_SCOPE)
 set(examples_src
   ${examples_src}

diff --git a/teshsuite/smpi/allreduce/allreduce_coll_automatic.tesh b/teshsuite/smpi/allreduce/allreduce_coll_automatic.tesh
new file mode 100644 (file)
index 0000000..81faff2
--- /dev/null
+++ b/teshsuite/smpi/allreduce/allreduce_coll_automatic.tesh
@@ -0,0 +1,73 @@
+# Smpi Allreduce collectives tests
+! setenv LD_LIBRARY_PATH=../../lib
+! output sort
+
+p Test allreduce
+$ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/allreduce_coll --log=smpi_kernel.thres:warning --log=smpi_coll.thres:error --cfg=smpi/allreduce:automatic --cfg=smpi/async_small_thresh:65536 --cfg=smpi/send_is_detached_thresh:128000 --cfg=smpi/running_power:-1
+> [rank 0] -> Tremblay
+> [rank 1] -> Tremblay
+> [rank 2] -> Tremblay
+> [rank 3] -> Tremblay
+> [rank 4] -> Jupiter
+> [rank 5] -> Jupiter
+> [rank 6] -> Jupiter
+> [rank 7] -> Jupiter
+> [rank 8] -> Fafard
+> [rank 9] -> Fafard
+> [rank 10] -> Fafard
+> [rank 11] -> Fafard
+> [rank 12] -> Ginette
+> [rank 13] -> Ginette
+> [rank 14] -> Ginette
+> [rank 15] -> Ginette
+> [0] sndbuf=[0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 ]
+> [1] sndbuf=[16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 ]
+> [2] sndbuf=[32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 ]
+> [3] sndbuf=[48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 ]
+> [4] sndbuf=[64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 ]
+> [5] sndbuf=[80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 ]
+> [6] sndbuf=[96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 ]
+> [7] sndbuf=[112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 ]
+> [8] sndbuf=[128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 ]
+> [9] sndbuf=[144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 ]
+> [10] sndbuf=[160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 ]
+> [11] sndbuf=[176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 ]
+> [12] sndbuf=[192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 ]
+> [13] sndbuf=[208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 ]
+> [14] sndbuf=[224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 ]
+> [15] sndbuf=[240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 ]
+> [Jupiter:7:(8) 0.420130] /home/degomme/simgrid/src/smpi/colls/smpi_automatic_selector.c:72: [smpi_colls/WARNING] The quickest allreduce was redbcast on rank 7 and took 0.007543
+> [7] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
+> [Jupiter:4:(5) 0.420130] /home/degomme/simgrid/src/smpi/colls/smpi_automatic_selector.c:72: [smpi_colls/WARNING] The quickest allreduce was redbcast on rank 4 and took 0.007482
+> [4] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
+> [Jupiter:6:(7) 0.420130] /home/degomme/simgrid/src/smpi/colls/smpi_automatic_selector.c:72: [smpi_colls/WARNING] The quickest allreduce was redbcast on rank 6 and took 0.007513
+> [6] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
+> [Jupiter:5:(6) 0.420130] /home/degomme/simgrid/src/smpi/colls/smpi_automatic_selector.c:72: [smpi_colls/WARNING] The quickest allreduce was redbcast on rank 5 and took 0.007513
+> [5] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
+> [Ginette:13:(14) 0.420342] /home/degomme/simgrid/src/smpi/colls/smpi_automatic_selector.c:72: [smpi_colls/WARNING] The quickest allreduce was mvapich2_two_level on rank 13 and took 0.007278
+> [13] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
+> [Ginette:12:(13) 0.420342] /home/degomme/simgrid/src/smpi/colls/smpi_automatic_selector.c:72: [smpi_colls/WARNING] The quickest allreduce was mvapich2_two_level on rank 12 and took 0.007247
+> [12] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
+> [Ginette:15:(16) 0.420342] /home/degomme/simgrid/src/smpi/colls/smpi_automatic_selector.c:72: [smpi_colls/WARNING] The quickest allreduce was ompi on rank 15 and took 0.007263
+> [15] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
+> [Ginette:14:(15) 0.420342] /home/degomme/simgrid/src/smpi/colls/smpi_automatic_selector.c:72: [smpi_colls/WARNING] The quickest allreduce was mvapich2_two_level on rank 14 and took 0.007278
+> [14] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
+> [Tremblay:1:(2) 0.421734] /home/degomme/simgrid/src/smpi/colls/smpi_automatic_selector.c:72: [smpi_colls/WARNING] The quickest allreduce was redbcast on rank 1 and took 0.006004
+> [1] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
+> [Tremblay:2:(3) 0.421734] /home/degomme/simgrid/src/smpi/colls/smpi_automatic_selector.c:72: [smpi_colls/WARNING] The quickest allreduce was redbcast on rank 2 and took 0.006004
+> [2] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
+> [Tremblay:3:(4) 0.421734] /home/degomme/simgrid/src/smpi/colls/smpi_automatic_selector.c:72: [smpi_colls/WARNING] The quickest allreduce was redbcast on rank 3 and took 0.006034
+> [3] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
+> [Fafard:11:(12) 0.422884] /home/degomme/simgrid/src/smpi/colls/smpi_automatic_selector.c:72: [smpi_colls/WARNING] The quickest allreduce was mvapich2_two_level on rank 11 and took 0.006523
+> [11] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
+> [Fafard:9:(10) 0.422884] /home/degomme/simgrid/src/smpi/colls/smpi_automatic_selector.c:72: [smpi_colls/WARNING] The quickest allreduce was mvapich2_two_level on rank 9 and took 0.006492
+> [9] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
+> [Fafard:8:(9) 0.422884] /home/degomme/simgrid/src/smpi/colls/smpi_automatic_selector.c:72: [smpi_colls/WARNING] The quickest allreduce was mvapich2_two_level on rank 8 and took 0.006462
+> [8] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
+> [Fafard:10:(11) 0.422884] /home/degomme/simgrid/src/smpi/colls/smpi_automatic_selector.c:72: [smpi_colls/WARNING] The quickest allreduce was mvapich2_two_level on rank 10 and took 0.006492
+> [10] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
+> [Tremblay:0:(1) 0.426869] /home/degomme/simgrid/src/smpi/colls/smpi_automatic_selector.c:72: [smpi_colls/WARNING] For rank 0, the quickest was redbcast : 0.005988 , but global was mvapich2_two_level : 0.008672 at max
+> [0] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
+
+
+

diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake
index 20f317c..1cd1096 100644 (file)
--- a/tools/cmake/Tests.cmake
+++ b/tools/cmake/Tests.cmake
@@ -386,6 +386,7 @@ IF(NOT enable_memcheck)
     FOREACH (ALLREDUCE_COLL_LARGE ompi_ring_segmented)
       ADD_TESH(tesh-smpi-allreduce-coll-large-${ALLREDUCE_COLL_LARGE} --cfg smpi/allreduce:${ALLREDUCE_COLL_LARGE} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/allreduce --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/allreduce allreduce_coll_large.tesh)
     ENDFOREACH()
+    ADD_TESH(tesh-smpi-allreduce-coll-automatic --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/allreduce --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/allreduce allreduce_coll_automatic.tesh)
     FOREACH (ALLTOALL_COLL 2dmesh 3dmesh pair pair_rma pair_one_barrier pair_light_barrier
                            pair_mpi_barrier rdb ring ring_light_barrier
                            ring_mpi_barrier ring_one_barrier