Merge branch 'incast-fixes' into 'master'

Incast: fixes and cleanup

See merge request !1

swm/src/Makefile.subdir

@@ -7,18 +7,23 @@ include_HEADERS = \
 						 src/nekbone/cubiclattice.h \
 						 src/nearest_neighbor/nearest_neighbor_swm_user_code.h \
 						 src/nearest_neighbor/boost_ptree_array_to_std_vector.h \
+						 src/incast/all_to_one_swm_user_code.h \
 						 src/milc/milc_swm_user_code.h
 
 src_libswm_la_SOURCES = src/lammps/lammps.cpp	\
 						src/nekbone/cubiclattice.cpp	\
 						src/nekbone/nekbone_swm_user_code.cpp	\
 						src/nearest_neighbor/nearest_neighbor_swm_user_code.cpp \
+						src/incast/all_to_one_swm_user_code.cpp \
 						src/milc/milc_swm_user_code.cpp
 
 dist_data_DATA = src/lammps/lammps_workload.json \
 			  src/nearest_neighbor/skeleton.json \
 			  src/nekbone/workload.json \
 			  src/point_to_point/example.json \
+			  src/incast/incast.json \
+			  src/incast/incast1.json \
+			  src/incast/incast2.json \
 			  src/milc/milc_skeleton.json
 
 

swm/src/incast/all_to_one_swm_user_code.cpp

@@ -4,6 +4,7 @@ AllToOneSWMUserCode::AllToOneSWMUserCode(
     boost::property_tree::ptree cfg,
     void**& generic_ptrs
 ) :
+    process_cnt(cfg.get<uint32_t>("jobs.size", 1)),
     dst_rank_id(cfg.get<uint32_t>("jobs.cfg.dst_rank_id",0)),
     scattered_start(cfg.get<bool>("jobs.cfg.scattered_start", false)),
     start_delay_max(cfg.get<uint32_t>("jobs.cfg.start_delay_max", 0)),
@@ -26,7 +27,6 @@ AllToOneSWMUserCode::AllToOneSWMUserCode(
     }
     assert(num == 2);
 
-
     assert(dst_rank_id < process_cnt);
 }
 
@@ -223,7 +223,5 @@ AllToOneSWMUserCode::call()
       } // end of else if(synchronous && (process_id == dst_rank_id) )
 
     SWM_Finalize();
-    assert(0);
-
 }
 

swm/src/incast/all_to_one_swm_user_code.h

@@ -19,6 +19,8 @@
 #ifndef _ALL_TO_ONE_TEMPLATE_USER_CODE_
 #define _ALL_TO_ONE_TEMPLATE_USER_CODE_
 
+#define SWM_APP_TAG_BASE 0
+
 #include <boost/property_tree/ptree.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/tuple/tuple_comparison.hpp>

swm/src/incast/incast.json

+{
+"jobs" : {
+        "dll_path": "${FABSIM_APPS_PATH}/dll/incast.so",
+        "size": 9,
+        "cfg": {
+            "app": "incast",
+            "iteration_cnt": 150, 
+            "compute_delay": 0,
+            "noop_cnt": 0,
+            "msg_size": 13107200,
+            "start_delay_max" : 0,
+            "scattered_start" : false,
+            "synchronous": true,
+            "dst_rank_id":8,
+            "randomize_communication_order": false,
+            "blocking_comm" : false, 
+            "debug" : true, 
+            "src_rank_id_interval": [0,7],
+            "cpu_freq" : 4e9
+       }
+    }
+}

swm/src/incast/incast1.json

 {
 "jobs" : {
-        "dll_path": "${FABSIM_APPS_PATH}/dll/nearest_neighbor.so",
+        "dll_path": "${FABSIM_APPS_PATH}/dll/incast.so",
         "size": 9,
         "cfg": {
             "app": "incast",
@@ -12,10 +12,10 @@
             "scattered_start" : false,
             "synchronous": true,
             "dst_rank_id":8,
-            "randomize_communication_order": 0,
-            "blocking_comm" : "0", 
-            "debug" : "1", 
-            "src_rank_id_interval": [0,7], 
+            "randomize_communication_order": false,
+            "blocking_comm" : false,
+            "debug" : true,
+            "src_rank_id_interval": [0,7],
             "cpu_freq" : 4e9
        }
     }

swm/src/incast/incast2.json

 {
 "jobs" : {
-        "dll_path": "${FABSIM_APPS_PATH}/dll/nearest_neighbor.so",
+        "dll_path": "${FABSIM_APPS_PATH}/dll/incast.so",
         "size": 9,
         "cfg": {
             "app": "incast",
@@ -12,9 +12,9 @@
             "scattered_start" : false,
             "synchronous": true,
             "dst_rank_id":8,
-            "randomize_communication_order": 0,
-            "blocking_comm" : "0", 
-            "debug" : "1", 
+            "randomize_communication_order": false,
+            "blocking_comm" : false,
+            "debug" : true,
             "src_rank_id_interval": [0,7], 
             "cpu_freq" : 4e9
        }