Adding smaller test case for dragonfly custom model

configure.ac

@@ -197,5 +197,5 @@ fi
 AC_CONFIG_FILES([Makefile])
 
 AC_OUTPUT([maint/codes.pc])
-AC_OUTPUT([src/network-workloads/conf/dragonfly-custom/modelnet-test-dragonfly-theta.conf])
+AC_OUTPUT([src/network-workloads/conf/dragonfly-custom/modelnet-test-dragonfly-1728-nodes.conf])
 

src/network-workloads/conf/dragonfly-custom/modelnet-test-dragonfly-theta.conf.in → src/network-workloads/conf/dragonfly-custom/modelnet-test-dragonfly-1728-nodes.conf.in

@@ -4,9 +4,9 @@ LPGROUPS
    {
       repetitions="864";
 # name of this lp changes according to the model
-      nw-lp="4";
+      nw-lp="2";
 # these lp names will be the same for dragonfly-custom model
-      modelnet_dragonfly_custom="4";
+      modelnet_dragonfly_custom="2";
       modelnet_dragonfly_custom_router="1";
    }
 }
@@ -44,7 +44,7 @@ PARAMS
    message_size="592";
 # number of compute nodes connected to router, dictated by dragonfly config
 # file
-   num_cns_per_router="4";
+   num_cns_per_router="2";
 # number of global channels per router 
    num_global_channels="10";
 # network config file for intra-group connections 

src/network-workloads/conf/dragonfly-custom/modelnet-test-dragonfly-custom-768-nodes.conf.in

+LPGROUPS
+{
+   MODELNET_GRP
+   {
+      repetitions="768";
+# name of this lp changes according to the model
+      nw-lp="2";
+# these lp names will be the same for dragonfly-custom model
+      modelnet_dragonfly_custom="2";
+      modelnet_dragonfly_custom_router="1";
+   }
+}
+PARAMS
+{
+# packet size in the network 
+   packet_size="1024";
+   modelnet_order=( "dragonfly_custom","dragonfly_custom_router" );
+   # scheduler options
+   modelnet_scheduler="fcfs";
+# chunk size in the network (when chunk size = packet size, packets will not be
+# divided into chunks)
+   chunk_size="1024";
+   # modelnet_scheduler="round-robin";
+   # number of routers within each group
+   # this is dictated by the dragonfly configuration files
+   # intra-group rows for routers
+   num_router_rows="16";
+   # intra-group columns for routers
+   num_router_cols="6";
+   # number of groups in the network
+   num_groups="8";
+# buffer size in bytes for local virtual channels 
+   local_vc_size="8192";
+#buffer size in bytes for global virtual channels 
+   global_vc_size="16384";
+#buffer size in bytes for compute node virtual channels 
+   cn_vc_size="8192";
+#bandwidth in GiB/s for local channels 
+   local_bandwidth="5.25";
+# bandwidth in GiB/s for global channels 
+   global_bandwidth="18.75";
+# bandwidth in GiB/s for compute node-router channels 
+   cn_bandwidth="8.0";
+# ROSS message size 
+   message_size="592";
+# number of compute nodes connected to router, dictated by dragonfly config
+# file
+   num_cns_per_router="2";
+# number of global channels per router 
+   num_global_channels="10";
+# network config file for intra-group connections 
+   intra-group-connections="@abs_srcdir@/intra-custom-small";
+# network config file for inter-group connections
+   inter-group-connections="@abs_srcdir@/inter-custom-small";
+# routing protocol to be used 
+   routing="prog-adaptive";
+}

src/network-workloads/conf/dragonfly-custom/modelnet-test-dragonfly-theta.conf

+LPGROUPS
+{
+   MODELNET_GRP
+   {
+      repetitions="864";
+# name of this lp changes according to the model
+      nw-lp="4";
+# these lp names will be the same for dragonfly-custom model
+      modelnet_dragonfly_custom="4";
+      modelnet_dragonfly_custom_router="1";
+   }
+}
+PARAMS
+{
+# packet size in the network 
+   packet_size="1024";
+   modelnet_order=( "dragonfly_custom","dragonfly_custom_router" );
+   # scheduler options
+   modelnet_scheduler="fcfs";
+# chunk size in the network (when chunk size = packet size, packets will not be
+# divided into chunks)
+   chunk_size="1024";
+   # modelnet_scheduler="round-robin";
+   # number of routers within each group
+   # this is dictated by the dragonfly configuration files
+   num_router_rows="6";
+   # number of router columns 
+   num_router_cols="16";
+   # number of groups in the network
+   num_groups="9";
+# buffer size in bytes for local virtual channels 
+   local_vc_size="8192";
+#buffer size in bytes for global virtual channels 
+   global_vc_size="16384";
+#buffer size in bytes for compute node virtual channels 
+   cn_vc_size="8192";
+#bandwidth in GiB/s for local channels 
+   local_bandwidth="5.25";
+# bandwidth in GiB/s for global channels 
+   global_bandwidth="18.75";
+# bandwidth in GiB/s for compute node-router channels 
+   cn_bandwidth="16.0";
+# ROSS message size 
+   message_size="592";
+# number of compute nodes connected to router, dictated by dragonfly config
+# file
+   num_cns_per_router="4";
+# number of global channels per router 
+   num_global_channels="10";
+# network config file for intra-group connections 
+   intra-group-connections="../src/network-workloads/conf/dragonfly-custom/intra-theta";
+# network config file for inter-group connections
+   inter-group-connections="../src/network-workloads/conf/dragonfly-custom/inter-theta";
+# routing protocol to be used 
+   routing="adaptive";
+}

tests/Makefile.subdir

@@ -32,6 +32,7 @@ TESTS += tests/lp-io-test.sh \
  tests/modelnet-test-dragonfly.sh \
  tests/modelnet-test-slimfly.sh \
  tests/modelnet-test-dragonfly-synthetic.sh \
+ tests/modelnet-test-dragonfly-custom-synthetic.sh \
  tests/modelnet-test-fattree-synthetic.sh \
  tests/modelnet-test-slimfly-synthetic.sh \
  tests/modelnet-p2p-bw-loggp.sh \

tests/modelnet-test-dragonfly-custom-synthetic.sh

@@ -5,7 +5,9 @@ if [ -z $srcdir ]; then
               exit 1
  fi
 
-src/network-workloads/model-net-synthetic-custom-dfly --sync=1 --num_messages=1 -- src/network-workloads/conf/dragonfly-custom/modelnet-test-dragonfly-theta.conf 
+src/network-workloads/model-net-synthetic-custom-dfly --sync=1 --num_messages=1 -- src/network-workloads/conf/dragonfly-custom/modelnet-test-dragonfly-1728-nodes.conf
+
+mpirun -np 2 src/network-workloads/model-net-mpi-replay --sync=3 --num_net_traces=27 --workload_file=/tmp/df_AMG_n27_dumpi/dumpi-2014.03.03.14.55.00- --workload_type="dumpi" -- src/network-workloads/conf/dragonfly-custom/modelnet-test-dragonfly-1728-nodes.conf