Merge branch 'dfp-dfdally-tests-fix' into 'master'

Fix DFP and DFDally make tests to support out-of-tree builds

See merge request codes/codes!68

src/network-workloads/conf/dragonfly-dally/modelnet-test-dragonfly-dally.conf

-LPGROUPS
-{
-   MODELNET_GRP
-   {
-      repetitions="1040";
-# name of this lp changes according to the model
-      nw-lp="8";
-# these lp names will be the same for dragonfly-custom model
-      modelnet_dragonfly_dally="8";
-      modelnet_dragonfly_dally_router="1";
-   }
-}
-PARAMS
-{
-# packet size in the network
-   packet_size="4096";
-   modelnet_order=( "dragonfly_dally","dragonfly_dally_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="4096";
-   # modelnet_scheduler="round-robin";
-
-   num_router_rows="1";
-   # intra-group columns for routers
-   num_router_cols="16";
-   # number of groups in the network
-   num_groups="65";
-# buffer size in bytes for local virtual channels
-   local_vc_size="16384";
-#buffer size in bytes for global virtual channels
-   global_vc_size="16384";
-#buffer size in bytes for compute node virtual channels
-   cn_vc_size="32768";
-#bandwidth in GiB/s for local channels
-   local_bandwidth="2.0";
-# bandwidth in GiB/s for global channels
-   global_bandwidth="2.0";
-# bandwidth in GiB/s for compute node-router channels
-   cn_bandwidth="2.0";
-# Number of row channels
-   num_row_chans="1";
-# Number of column channels
-   num_col_chans="1";
-# ROSS message size
-   message_size="656";
-# number of compute nodes connected to router, dictated by dragonfly config
-# file
-   num_cns_per_router="8";
-# number of global channels per router
-   num_global_channels="8";
-# network config file for intra-group connections
-   intra-group-connections="../src/network-workloads/conf/dragonfly-dally/dfdally_8k_intra";
-# network config file for inter-group connections
-   inter-group-connections="../src/network-workloads/conf/dragonfly-dally/dfdally_8k_inter";
-# routing protocol to be used
-   routing="prog-adaptive";
-   adaptive_threshold="131072";
-   minimal-bias="1";
-   df-dally-vc = "1";
-}

src/network-workloads/conf/dragonfly-dally/modelnet-test-dragonfly-dally.conf.in

@@ -51,9 +51,9 @@ PARAMS
 # number of global channels per router
    num_global_channels="8";
 # network config file for intra-group connections
-   intra-group-connections="../src/network-workloads/conf/dragonfly-dally/dfdally_8k_intra";
+   intra-group-connections="@abs_srcdir@/dfdally_8k_intra";
 # network config file for inter-group connections
-   inter-group-connections="../src/network-workloads/conf/dragonfly-dally/dfdally_8k_inter";
+   inter-group-connections="@abs_srcdir@/dfdally_8k_inter";
 # routing protocol to be used
    routing="prog-adaptive";
    adaptive_threshold="131072";

src/network-workloads/conf/dragonfly-plus/modelnet-test-dragonfly-plus.conf

-LPGROUPS
-{
-   MODELNET_GRP
-   {
-      repetitions="1056";
-# name of this lp changes according to the model
-      nw-lp="8";
-# these lp names will be the same for dragonfly-custom model
-      modelnet_dragonfly_plus="8";
-      modelnet_dragonfly_plus_router="1";
-   }
-}
-PARAMS
-{
-# packet size in the network
-   packet_size="4096";
-# order of LPs, mapping for modelnet grp
-   modelnet_order=( "dragonfly_plus","dragonfly_plus_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="4096";
-# number of spine routers per group
-   num_router_spine="16";
-# number of leaf routers per group
-   num_router_leaf="16";
-# number of links connecting between group levels per router
-   num_level_chans="1";
-# number of groups in the network
-   num_groups="33";
-# buffer size in bytes for local virtual channels
-   local_vc_size="32768";
-# buffer size in bytes for global virtual channels
-   global_vc_size="32768";
-# buffer size in bytes for compute node virtual channels
-   cn_vc_size="32768";
-# bandwidth in GiB/s for local channels
-   local_bandwidth="25.0";
-# bandwidth in GiB/s for global channels
-   global_bandwidth="25.0";
-# bandwidth in GiB/s for compute node-router channels
-   cn_bandwidth="25.0";
-# ROSS message size
-   message_size="640";
-# number of compute nodes connected to router, dictated by dragonfly config file
-   num_cns_per_router="16";
-# number of global channels per router
-   num_global_connections="16";
-# network config file for intra-group connections
-   intra-group-connections="../src/network-workloads/conf/dragonfly-plus/dfp_8k_intra";
-# network config file for inter-group connections
-   inter-group-connections="../src/network-workloads/conf/dragonfly-plus/dfp_8k_inter";
-# routing protocol to be used - 'minimal', 'non-minimal-spine', 'non-minimal-leaf', 'prog-adaptive'
-   routing="prog-adaptive";
-# route scoring protocol to be used - options are 'alpha', 'beta', or 'delta' - 'gamma' has been deprecated
-   route_scoring_metric="delta";
-# minimal route threshold before considering non-minimal paths
-   adaptive_threshold="131072"; #1/16 of 32768
-}
-

src/network-workloads/conf/dragonfly-plus/modelnet-test-dragonfly-plus.conf.in

@@ -47,9 +47,9 @@ PARAMS
 # number of global channels per router
    num_global_connections="16";
 # network config file for intra-group connections
-   intra-group-connections="../src/network-workloads/conf/dragonfly-plus/dfp_8k_intra";
+   intra-group-connections="@abs_srcdir@/dfp_8k_intra";
 # network config file for inter-group connections
-   inter-group-connections="../src/network-workloads/conf/dragonfly-plus/dfp_8k_inter";
+   inter-group-connections="@abs_srcdir@/dfp_8k_inter";
 # routing protocol to be used - 'minimal', 'non-minimal-spine', 'non-minimal-leaf', 'prog-adaptive'
    routing="prog-adaptive";
 # route scoring protocol to be used - options are 'alpha', 'beta', or 'delta' - 'gamma' has been deprecated