ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

These calls were mistakenly added in r25164.

Просмотр исходного кода 
This commit was SVN r25176.

The following SVN revision numbers were found above:
  r25164 --> open-mpi/ompi@51129cc2a8
Этот коммит содержится в:
Jeff Squyres 2011-09-22 18:20:30 +00:00
родитель 8347385630
Коммит 57323570e3
2 изменённых файлов: 9 добавлений и 18 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
opal/mca/maffinity/base/base.h
Просмотреть файл

@ -109,16 +109,6 @@ OPAL_DECLSPEC int opal_maffinity_base_set(opal_maffinity_base_segment_t *segment
OPAL_DECLSPEC int opal_maffinity_base_node_name_to_id(char *, int *); OPAL_DECLSPEC int opal_maffinity_base_node_name_to_id(char *, int *);
OPAL_DECLSPEC int opal_maffinity_base_bind(opal_maffinity_base_segment_t *, size_t, int); OPAL_DECLSPEC int opal_maffinity_base_bind(opal_maffinity_base_segment_t *, size_t, int);
/**
* Report a bind failure using the normal mechanisms if a component
* fails to bind memory -- according to the value of the
* maffinity_base_bind_failure_action MCA parameter.
*/
OPAL_DECLSPEC int opal_maffinity_base_report_bind_failure(const char *file,
int line,
const char *msg,
int rc);
/** /**
* Shut down the maffinity MCA framework. * Shut down the maffinity MCA framework.
* *

17
opal/mca/maffinity/hwloc/maffinity_hwloc_module.c
Просмотреть файл

@ -33,6 +33,7 @@
#include "opal/mca/base/mca_base_param.h" #include "opal/mca/base/mca_base_param.h"
#include "opal/mca/maffinity/maffinity.h" #include "opal/mca/maffinity/maffinity.h"
#include "opal/mca/maffinity/base/base.h" #include "opal/mca/maffinity/base/base.h"
#include "opal/mca/hwloc/base/base.h"
#include "maffinity_hwloc.h" #include "maffinity_hwloc.h"
#include "opal/mca/hwloc/hwloc.h" #include "opal/mca/hwloc/hwloc.h"
@ -91,8 +92,8 @@ static int hwloc_module_set(opal_maffinity_base_segment_t *segments,
/* bozo check */ /* bozo check */
if (NULL == opal_hwloc_topology) { if (NULL == opal_hwloc_topology) {
msg = "hwloc_set_area_membind() failure - topology not available"; msg = "hwloc_set_area_membind() failure - topology not available";
return opal_maffinity_base_report_bind_failure(__FILE__, __LINE__, return opal_hwloc_base_report_bind_failure(__FILE__, __LINE__,
msg, rc); msg, rc);
} }
/* This module won't be used unless the process is already /* This module won't be used unless the process is already
@ -122,8 +123,8 @@ static int hwloc_module_set(opal_maffinity_base_segment_t *segments,
hwloc_bitmap_free(cpuset); hwloc_bitmap_free(cpuset);
} }
if (OPAL_SUCCESS != rc) { if (OPAL_SUCCESS != rc) {
return opal_maffinity_base_report_bind_failure(__FILE__, __LINE__, return opal_hwloc_base_report_bind_failure(__FILE__, __LINE__,
msg, rc); msg, rc);
} }
return OPAL_SUCCESS; return OPAL_SUCCESS;
} }
@ -147,8 +148,8 @@ static int hwloc_module_bind(opal_maffinity_base_segment_t *segs,
/* bozo check */ /* bozo check */
if (NULL == opal_hwloc_topology) { if (NULL == opal_hwloc_topology) {
msg = "hwloc_set_area_membind() failure - topology not available"; msg = "hwloc_set_area_membind() failure - topology not available";
return opal_maffinity_base_report_bind_failure(__FILE__, __LINE__, return opal_hwloc_base_report_bind_failure(__FILE__, __LINE__,
msg, rc); msg, rc);
} }
cpuset = hwloc_bitmap_alloc(); cpuset = hwloc_bitmap_alloc();
@ -175,8 +176,8 @@ static int hwloc_module_bind(opal_maffinity_base_segment_t *segs,
hwloc_bitmap_free(cpuset); hwloc_bitmap_free(cpuset);
} }
if (OPAL_SUCCESS != rc) { if (OPAL_SUCCESS != rc) {
return opal_maffinity_base_report_bind_failure(__FILE__, __LINE__, return opal_hwloc_base_report_bind_failure(__FILE__, __LINE__,
msg, rc); msg, rc);
} }
return OPAL_SUCCESS; return OPAL_SUCCESS;
} }