Adding support for nearest neighbor comm.

configure.ac

@@ -30,6 +30,7 @@ AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_CXX
 AC_PROG_CXXCPP
+AX_CXX_COMPILE_STDCXX(11, noext, mandatory)
 AC_PROG_RANLIB
 
 PKG_PROG_PKG_CONFIG

src/network-workloads/conf/dragonfly-custom/dfdally_8k.conf

@@ -52,9 +52,9 @@ PARAMS
 # number of global channels per router
    num_global_channels="8";
 # network config file for intra-group connections
-   intra-group-connections="/home/mmubarak/codes-online/codes/src/network-workloads/conf/dragonfly-custom/dfdally_8k_intra";
+   intra-group-connections="/Users/mmubarak/Documents/software_development/codes-neil/codes/src/network-workloads/conf/dragonfly-custom/dfdally_8k_intra";
 # network config file for inter-group connections
-   inter-group-connections="/home/mmubarak/codes-online/codes/src/network-workloads/conf/dragonfly-custom/dfdally_8k_inter";
+   inter-group-connections="/Users/mmubarak/Documents/software_development/codes-neil/codes/src/network-workloads/conf/dragonfly-custom/dfdally_8k_inter";
 # routing protocol to be used
 #    routing="minimal";
    routing="prog-adaptive";

src/networks/model-net/dragonfly-custom.C

@@ -25,7 +25,7 @@
 #include <cortex/topology.h>
 #endif
 
-#define DUMP_CONNECTIONS 1
+#define DUMP_CONNECTIONS 0
 #define CREDIT_SIZE 8
 #define DFLY_HASH_TABLE_SIZE 4999
 // debugging parameters

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

@@ -22,6 +22,7 @@
 #include "codes_config.h"
 #include "lammps.h"
 #include "nekbone_swm_user_code.h"
+#include "nearest_neighbor_swm_user_code.h"
 
 #define ALLREDUCE_SHORT_MSG_SIZE 2048
 
@@ -764,6 +765,11 @@ static void workload_caller(void * arg)
         NEKBONESWMUserCode * nekbone_swm = static_cast<NEKBONESWMUserCode*>(sctx->swm_obj);
         nekbone_swm->call();
     }
+    else if(strcmp(sctx->workload_name, "nearest_neighbor") == 0)
+    {
+       NearestNeighborSWMUserCode * nn_swm = static_cast<NearestNeighborSWMUserCode*>(sctx->swm_obj);
+       nn_swm->call();
+    }
 }
 static int comm_online_workload_load(const char * params, int app_id, int rank)
 {
@@ -797,6 +803,10 @@ static int comm_online_workload_load(const char * params, int app_id, int rank)
     {
         path.append("/workload.json"); 
     }
+    else if(strcmp(o_params->workload_name, "nearest_neighbor") == 0)
+    {
+        path.append("/skeleton.json"); 
+    }
     else
         tw_error(TW_LOC, "\n Undefined workload type %s ", o_params->workload_name);
 
@@ -822,6 +832,11 @@ static int comm_online_workload_load(const char * params, int app_id, int rank)
         NEKBONESWMUserCode * nekbone_swm = new NEKBONESWMUserCode(root, generic_ptrs);
         my_ctx->sctx.swm_obj = (void*)nekbone_swm;
     }
+    else if(strcmp(o_params->workload_name, "nearest_neighbor") == 0)
+    {
+        NearestNeighborSWMUserCode * nn_swm = new NearestNeighborSWMUserCode(root, generic_ptrs);
+        my_ctx->sctx.swm_obj = (void*)nn_swm;
+    }
 
     if(global_prod_thread == NULL)
     {