Merge branch 'all-to-one-uncomment' into 'master'

Allowing incast in online-workload source

See merge request !69

src/workload/methods/codes-online-comm-wrkld.C

@@ -23,7 +23,7 @@
 #include "lammps.h"
 #include "nekbone_swm_user_code.h"
 #include "nearest_neighbor_swm_user_code.h"
-// #include "all_to_one_swm_user_code.h"
+#include "all_to_one_swm_user_code.h"
 
 #define ALLREDUCE_SHORT_MSG_SIZE 2048
 
@@ -770,11 +770,11 @@ static void workload_caller(void * arg)
        NearestNeighborSWMUserCode * nn_swm = static_cast<NearestNeighborSWMUserCode*>(sctx->swm_obj);
        nn_swm->call();
     }
-    // else if(strcmp(sctx->workload_name, "incast") == 0 || strcmp(sctx->workload_name, "incast1") == 0 || strcmp(sctx->workload_name, "incast2") == 0)
-    // {
-    //    AllToOneSWMUserCode * incast_swm = static_cast<AllToOneSWMUserCode*>(sctx->swm_obj);
-    //    incast_swm->call();
-    // }
+    else if(strcmp(sctx->workload_name, "incast") == 0 || strcmp(sctx->workload_name, "incast1") == 0 || strcmp(sctx->workload_name, "incast2") == 0)
+    {
+       AllToOneSWMUserCode * incast_swm = static_cast<AllToOneSWMUserCode*>(sctx->swm_obj);
+       incast_swm->call();
+    }
 }
 static int comm_online_workload_load(const char * params, int app_id, int rank)
 {
@@ -812,18 +812,18 @@ static int comm_online_workload_load(const char * params, int app_id, int rank)
     {
         path.append("/skeleton.json"); 
     }
-    // else if(strcmp(o_params->workload_name, "incast") == 0)
-    // {
-    //     path.append("/incast.json"); 
-    // }
-    // else if(strcmp(o_params->workload_name, "incast1") == 0)
-    // {
-    //     path.append("/incast1.json"); 
-    // }
-    // else if(strcmp(o_params->workload_name, "incast2") == 0)
-    // {
-    //     path.append("/incast2.json"); 
-    // }
+    else if(strcmp(o_params->workload_name, "incast") == 0)
+    {
+        path.append("/incast.json"); 
+    }
+    else if(strcmp(o_params->workload_name, "incast1") == 0)
+    {
+        path.append("/incast1.json"); 
+    }
+    else if(strcmp(o_params->workload_name, "incast2") == 0)
+    {
+        path.append("/incast2.json"); 
+    }
     else
         tw_error(TW_LOC, "\n Undefined workload type %s ", o_params->workload_name);
 
@@ -853,11 +853,11 @@ static int comm_online_workload_load(const char * params, int app_id, int rank)
         NearestNeighborSWMUserCode * nn_swm = new NearestNeighborSWMUserCode(root, generic_ptrs);
         my_ctx->sctx.swm_obj = (void*)nn_swm;
     }
-    // else if(strcmp(o_params->workload_name, "incast") == 0 || strcmp(o_params->workload_name, "incast1") == 0 || strcmp(o_params->workload_name, "incast2") == 0)
-    // {
-    //     AllToOneSWMUserCode * incast_swm = new AllToOneSWMUserCode(root, generic_ptrs);
-    //     my_ctx->sctx.swm_obj = (void*)incast_swm;
-    // }
+    else if(strcmp(o_params->workload_name, "incast") == 0 || strcmp(o_params->workload_name, "incast1") == 0 || strcmp(o_params->workload_name, "incast2") == 0)
+    {
+        AllToOneSWMUserCode * incast_swm = new AllToOneSWMUserCode(root, generic_ptrs);
+        my_ctx->sctx.swm_obj = (void*)incast_swm;
+    }
 
     if(global_prod_thread == NULL)
     {