Commit 3c6c2340 authored by Neil McGlohon's avatar Neil McGlohon

Fix slimfly tests

When converting slimfly version to support fitfly, the names of the
workload LPs changed to nw-lp.

Additionally, changing the default sf_type to be 0 (slimfly) instead
of 1 (fitfly)
parent f24bd5c2
......@@ -3,7 +3,7 @@ LPGROUPS
MODELNET_GRP
{
repetitions="50";
server="3";
nw-lp="3";
modelnet_slimfly="3";
slimfly_router="1";
}
......
......@@ -179,7 +179,7 @@ static const st_model_types *svr_get_model_stat_types(void)
void svr_register_model_types()
{
st_model_type_register("server", svr_get_model_stat_types());
st_model_type_register("nw-lp", svr_get_model_stat_types());
}
const tw_optdef app_opt [] =
......@@ -202,7 +202,7 @@ const tw_lptype* svr_get_lp_type()
static void svr_add_lp_type()
{
lp_type_register("server", svr_get_lp_type());
lp_type_register("nw-lp", svr_get_lp_type());
}
/* convert GiB/s and bytes to ns */
......@@ -894,7 +894,7 @@ int main(
net_id = *net_ids;
free(net_ids);
num_servers_per_rep = codes_mapping_get_lp_count("MODELNET_GRP", 1, "server", NULL, 1);
num_servers_per_rep = codes_mapping_get_lp_count("MODELNET_GRP", 1, "nw-lp", NULL, 1);
configuration_get_value_int(&config, "PARAMS", "num_terminals", NULL, &num_terminals);
configuration_get_value_int(&config, "PARAMS", "num_routers", NULL, &num_routers_per_grp);
num_groups = (num_routers_per_grp * 2);
......
......@@ -486,13 +486,13 @@ static void slimfly_read_config(const char * anno, slimfly_param *params){
// shorthand
slimfly_param *p = params;
p->sf_type = 1;
p->sf_type = 0;
configuration_get_value_int(&config, "PARAMS", "sf_type", anno, &p->sf_type);
if(!g_tw_mynode) printf("SF type is %d\n", p->sf_type);
p->num_rails = 1;
configuration_get_value_int(&config, "PARAMS", "num_rails", anno, &p->num_rails);
if(!g_tw_mynode) printf("FT num rails is %d\n", p->num_rails);
if(!g_tw_mynode) printf("SF num rails is %d\n", p->num_rails);
p->ports_per_nic = 1;
if(p->num_rails > 1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment