diff --git a/doc/GETTING_STARTED b/doc/GETTING_STARTED index 66420ff3064c05db13c297a14e81f33ff132755c..ca63faac2ba114b5025fecaa7ebeb95e6733df29 100644 --- a/doc/GETTING_STARTED +++ b/doc/GETTING_STARTED @@ -453,7 +453,9 @@ represents a physical router. At least one "dragonfly_router" LP must be present in every LP group with a "modelnet_dragonfly" LP. Further configuration and model setup can be found at -src/model-net/doc/README.dragonfly-custom.txt. +src/model-net/doc/README.dragonfly.txt. +A newer version of dragonfly model that supports a Cray style network is also +available. Instructions can be found at src/model-net/doc/README.dragonfly-custom.txt. = CODES example model diff --git a/src/network-workloads/conf/dragonfly-custom/modelnet-synthetic-custom.conf b/src/network-workloads/conf/dragonfly-custom/modelnet-synthetic-custom.conf new file mode 100644 index 0000000000000000000000000000000000000000..614a09921785ffe9c60aa60576de607dfe789e65 --- /dev/null +++ b/src/network-workloads/conf/dragonfly-custom/modelnet-synthetic-custom.conf @@ -0,0 +1,54 @@ +LPGROUPS +{ + MODELNET_GRP + { + repetitions="1600"; +# name of this lp changes according to the model + server="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_routers="80"; + # number of groups in the network + num_groups="20"; +# 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="4.7"; +# bandwidth in GiB/s for compute node-router channels + cn_bandwidth="8.0"; +# ROSS message size + message_size="584"; +# 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="8"; +# network config file for intra-group connections + intra-group-connections="/Users/mmubarak/Documents/software_development/dragonfly-cray/codes/scripts/gen-cray-topo/intra-custom"; +# network config file for inter-group connections + inter-group-connections="/Users/mmubarak/Documents/software_development/dragonfly-cray/codes/scripts/gen-cray-topo/inter-custom"; +# routing protocol to be used + routing="adaptive"; +} diff --git a/src/network-workloads/conf/modelnet-synthetic-edison.conf b/src/network-workloads/conf/dragonfly-custom/modelnet-synthetic-edison.conf similarity index 100% rename from src/network-workloads/conf/modelnet-synthetic-edison.conf rename to src/network-workloads/conf/dragonfly-custom/modelnet-synthetic-edison.conf diff --git a/src/network-workloads/conf/modelnet-test-dragonfly-custom.conf b/src/network-workloads/conf/dragonfly-custom/modelnet-test-dragonfly-custom.conf similarity index 100% rename from src/network-workloads/conf/modelnet-test-dragonfly-custom.conf rename to src/network-workloads/conf/dragonfly-custom/modelnet-test-dragonfly-custom.conf diff --git a/src/network-workloads/conf/modelnet-test-dragonfly-edison.conf b/src/network-workloads/conf/dragonfly-custom/modelnet-test-dragonfly-edison.conf similarity index 98% rename from src/network-workloads/conf/modelnet-test-dragonfly-edison.conf rename to src/network-workloads/conf/dragonfly-custom/modelnet-test-dragonfly-edison.conf index 36172c22514332af9d1ade77fe5d0072cca3523c..3f7ed23fde8463b24847b1d1cb2a39ff8480a256 100644 --- a/src/network-workloads/conf/modelnet-test-dragonfly-edison.conf +++ b/src/network-workloads/conf/dragonfly-custom/modelnet-test-dragonfly-edison.conf @@ -50,5 +50,5 @@ PARAMS # network config file for inter-group connections inter-group-connections="/Users/mmubarak/Documents/software_development/dragonfly-cray/codes/scripts/gen-cray-topo/inter-edison"; # routing protocol to be used - routing="adaptive"; + routing="non-minimal"; } diff --git a/src/networks/model-net/doc/README.dragonfly-custom.txt b/src/networks/model-net/doc/README.dragonfly-custom.txt index e82b4556d7753f66bc4d0d2ef7fa06aac9876dc7..94d354759f51827f7e6665fd91a5f011e5dc0f0e 100644 --- a/src/networks/model-net/doc/README.dragonfly-custom.txt +++ b/src/networks/model-net/doc/README.dragonfly-custom.txt @@ -59,20 +59,30 @@ [With custom dragonfly network having 6,400 network nodes, 1600 routers and 20 groups. Each group has 80 routers arranged in a 20x4 matrix] - ./bin/model-net-synthetic-custom-dfly --sync=1 -- ../src/network-workloads/conf/modelnet-synthetic-custom.conf + ./bin/model-net-synthetic-custom-dfly --sync=1 -- + ../src/network-workloads/conf/dragonfly-custom/modelnet-synthetic-custom.conf [With edison dragonfly network have 5,702 network nodes, 1440 routers and 15 groups. Each group has 96 routers arranged in 6x16 matrix.] - mpirun -np 4 ./bin/model-net-synthetic-custom-dfly --sync=3 -- ../src/network-workloads/conf/modelnet-synthetic-edison.conf + mpirun -np 4 ./bin/model-net-synthetic-custom-dfly --sync=3 -- + ../src/network-workloads/conf/dragonfly-custom/modelnet-synthetic-edison.conf - Design Forward Network traces: - [With Multigrid network trace having 125 ranks] + [With Edison style dragonfly having 5,760 network nodes and small-scale Multigrid network trace having 125 ranks] ./bin/model-net-mpi-replay --sync=1 --disable_compute=1 --workload_type="dumpi" --workload_file=../../../df_traces/Multigrid/MultiGrid_C_n125_dumpi/dumpi-2014.03.06.23.48.13- --num_net_traces=125 -- + ../src/network-workloads/conf/dragonfly-custom/modelnet-test-dragonfly-edison.conf + + [With Edison style dragonfly and AMG 1,728 application trace] + + ./bin/model-net-mpi-replay --sync=1 --disable_compute=1 + --workload_type="dumpi" + --workload_file=../../../df_traces/AMG/df_AMG_n1728_dumpi/dumpi-2014.03.03.14.55.50- + --num_net_traces=1728 -- ../src/network-workloads/conf/modelnet-test-dragonfly-edison.conf --------- Debugging Tips ------------ diff --git a/src/networks/model-net/dragonfly-custom.C b/src/networks/model-net/dragonfly-custom.C index b025c5128ca251c10150dd51ee4712dc8d09c801..8ec355f6ff62d34d1e1b24be0b81776faf21de1c 100644 --- a/src/networks/model-net/dragonfly-custom.C +++ b/src/networks/model-net/dragonfly-custom.C @@ -26,7 +26,7 @@ // debugging parameters #define TRACK -1 -#define TRACK_PKT 39316 +#define TRACK_PKT -1 #define TRACK_MSG -1 #define DEBUG 0 #define MAX_STATS 65536