Merge branch 'slimfly-merge' into 'master'

Slimfly LP-IO Update

Fixed issue #152 .
Updated Slim Fly workload README accordingly

See merge request !6

src/network-workloads/README_synthetic_slimfly.txt

@@ -19,12 +19,14 @@ HOW TO RUN:
 
 ROSS optimistic mode:
 mpirun -n 4 src/network-workloads/model-net-synthetic-slimfly --sync=3 --traffic=1 
+--lp-io-dir=mn_synthetic --lp-io-use-suffix=1
 --load=0.95 -- ../../jenkins/codes/src/network-workloads/conf/modelnet-synthetic-slimfly-min.conf
 
 ROSS serial mode:
 
 ./src/network-workloads/model-net-synthetic-slimfly --sync=1 --traffic=1 
---load=0.95 -- ../../jenkins/codes/src/network-workloads/conf/modelnet-synthetic-slimfly-min.conf
+--lp-io-dir=mn_synthetic --lp-io-use-suffix=1
+--load=0.95 -- ../src/network-workloads/conf/modelnet-synthetic-slimfly-min.conf
 
 options:
 

src/network-workloads/model-net-synthetic-slimfly.c

@@ -40,6 +40,11 @@ int *worst_dest;						//Array mapping worst case destination for each router
 int num_terminals;
 int total_routers;
 
+static char lp_io_dir[356] = {'\0'};
+static lp_io_handle io_handle;
+static unsigned int lp_io_use_suffix = 0;
+static int do_lp_io = 0;
+
 /* whether to pull instead of push */
 static int do_pull = 0;
 
@@ -114,6 +119,7 @@ tw_lptype svr_lp = {
     (pre_run_f) NULL,
     (event_f) svr_event,
     (revent_f) svr_rev_event,
+    (commit_f) NULL,
     (final_f)  svr_finalize,
     (map_f) codes_mapping,
     sizeof(svr_state),
@@ -124,8 +130,10 @@ const tw_optdef app_opt [] =
         TWOPT_GROUP("Model net synthetic traffic " ),
         TWOPT_UINT("traffic", traffic, "UNIFORM RANDOM=1, NEAREST NEIGHBOR=2 "),
         TWOPT_STIME("arrival_time", arrival_time, "INTER-ARRIVAL TIME"),
-        TWOPT_STIME("load", load, "percentage of packet inter-arrival rate to simulate"),
-        TWOPT_END(),
+        TWOPT_STIME("load", load, "percentage of packet inter-arrival rate to simulate"), 
+        TWOPT_CHAR("lp-io-dir", lp_io_dir, "Where to place io output (unspecified -> no output"),
+        TWOPT_UINT("lp-io-use-suffix", lp_io_use_suffix, "Whether to append uniq suffix to lp-io directory (default 0)"),
+	TWOPT_END(),
 };
 
 const tw_lptype* svr_get_lp_type()
@@ -431,14 +439,9 @@ int main(
     int rank;
     int num_nets;
     int *net_ids;
-    char* anno;
-
-    lp_io_handle handle;
-
+ 
     tw_opt_add(app_opt);
     tw_init(&argc, &argv);
-    offset = 1;
-
 
     if(argc < 2)
     {
@@ -455,18 +458,10 @@ int main(
     svr_add_lp_type();
     codes_mapping_setup();
     net_ids = model_net_configure(&num_nets);
-    assert(num_nets==1);
+//    assert(num_nets==1);
     net_id = *net_ids;
     free(net_ids);
 
-//slimfly 
-/*    if(net_id != DRAGONFLY)
-    {
-	printf("\n The test works with dragonfly model configuration only! ");
-        MPI_Finalize();
-        return 0;
-    }
-*/
     num_servers_per_rep = codes_mapping_get_lp_count("MODELNET_GRP", 1, "server", NULL, 1);
     configuration_get_value_int(&config, "PARAMS", "num_terminals", NULL, &num_terminals);
     configuration_get_value_int(&config, "PARAMS", "num_routers", NULL, &num_routers_per_grp);
@@ -475,10 +470,19 @@ int main(
     num_nodes_per_grp = num_routers_per_grp * num_servers_per_rep;
     total_routers = num_routers_per_grp * num_routers_per_grp * 2;
 
-    if(lp_io_prepare("modelnet-test", LP_IO_UNIQ_SUFFIX, &handle, MPI_COMM_WORLD) < 0)
+/*    if(lp_io_prepare("modelnet-test", LP_IO_UNIQ_SUFFIX, &handle, MPI_COMM_WORLD) < 0)
     {
         return(-1);
     }
+*/
+
+    if(lp_io_dir[0])
+    {
+        do_lp_io = 1;
+        int flags = lp_io_use_suffix ? LP_IO_UNIQ_SUFFIX : 0;
+        int ret = lp_io_prepare(lp_io_dir, flags, &io_handle, MPI_COMM_WORLD);
+        assert(ret == 0 || !"lp_io_prepare failure");
+    }
 
     //WORST_CASE Initialization array
    if(traffic == WORST_CASE)
@@ -494,8 +498,15 @@ int main(
 #endif
    }
 
-    tw_run();
-    model_net_report_stats(net_id);
+   tw_run();
+
+ 
+   if (do_lp_io){
+       int ret = lp_io_flush(io_handle, MPI_COMM_WORLD);
+       assert(ret == 0 || !"lp_io_flush failure");
+   }
+
+   model_net_report_stats(net_id);
 
     if(rank == 0)
     {
@@ -511,11 +522,12 @@ int main(
 #endif
     }
 
-    if(lp_io_flush(handle, MPI_COMM_WORLD) < 0)
+/*    if(lp_io_flush(handle, MPI_COMM_WORLD) < 0)
     {
+        assert(ret == 0 || !"lp_io_flush failure");
         return(-1);
     }
-
+*/
     tw_end();
 
     if(rank == 0)