1
1

fix --without-hwloc build failure

All builds since r28682 configured with '--without-hwloc' fail at "make"
time without this fix.

Reviewed by rhc@

This commit was SVN r28769.

The following SVN revision numbers were found above:
  r28682 --> open-mpi/ompi@446e33a5d8
Этот коммит содержится в:
Dave Goodell 2013-07-12 17:21:14 +00:00
родитель b001d31c27
Коммит 3741d62308

Просмотреть файл

@ -246,6 +246,7 @@ static int orte_rmaps_base_open(mca_base_open_flag_t flags)
orte_rmaps_base.mapping = 0; orte_rmaps_base.mapping = 0;
orte_rmaps_base.ranking = 0; orte_rmaps_base.ranking = 0;
#if OPAL_HAVE_HWLOC
/* if a topology file was given, then set our topology /* if a topology file was given, then set our topology
* from it. Even though our actual topology may differ, * from it. Even though our actual topology may differ,
* mpirun only needs to see the compute node topology * mpirun only needs to see the compute node topology
@ -257,6 +258,7 @@ static int orte_rmaps_base_open(mca_base_open_flag_t flags)
return ORTE_ERR_SILENT; return ORTE_ERR_SILENT;
} }
} }
#endif
if (NULL == rmaps_base_mapping_policy) { if (NULL == rmaps_base_mapping_policy) {
ORTE_SET_MAPPING_POLICY(orte_rmaps_base.mapping, ORTE_MAPPING_BYSLOT); ORTE_SET_MAPPING_POLICY(orte_rmaps_base.mapping, ORTE_MAPPING_BYSLOT);