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

orte_rmaps_numa_node_t -> opal_rmaps_numa_node_t

Просмотр исходного кода 
This commit was SVN r32380.
Этот коммит содержится в:
George Bosilca 2014-07-31 19:58:47 +00:00
родитель c366554048
Коммит daa076995a
4 изменённых файлов: 17 добавлений и 17 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -97,13 +97,13 @@ OPAL_DECLSPEC int opal_hwloc_base_set_binding_policy(opal_binding_policy_t *poli
*/
OPAL_DECLSPEC void opal_hwloc_base_get_local_cpuset(void);
struct orte_rmaps_numa_node_t {
struct opal_rmaps_numa_node_t {
opal_list_item_t super;
int index;
float dist_from_closed;
};
typedef struct orte_rmaps_numa_node_t orte_rmaps_numa_node_t;
OBJ_CLASS_DECLARATION(orte_rmaps_numa_node_t);
typedef struct opal_rmaps_numa_node_t opal_rmaps_numa_node_t;
OBJ_CLASS_DECLARATION(opal_rmaps_numa_node_t);
/**
* Enum for what memory allocation policy we want for user allocations.

2
opal/mca/hwloc/base/hwloc_base_frame.c
Просмотреть файл

@ -494,7 +494,7 @@ OBJ_CLASS_INSTANCE(opal_hwloc_topo_data_t,
topo_data_const,
topo_data_dest);
OBJ_CLASS_INSTANCE(orte_rmaps_numa_node_t,
OBJ_CLASS_INSTANCE(opal_rmaps_numa_node_t,
opal_list_item_t,
NULL,
NULL);

18
opal/mca/hwloc/base/hwloc_base_util.c
Просмотреть файл

@ -1898,8 +1898,8 @@ int opal_hwloc_base_cset2mapstr(char *str, int len,
static int dist_cmp_fn (opal_list_item_t **a, opal_list_item_t **b)
{
orte_rmaps_numa_node_t *aitem = *((orte_rmaps_numa_node_t **) a);
orte_rmaps_numa_node_t *bitem = *((orte_rmaps_numa_node_t **) b);
opal_rmaps_numa_node_t *aitem = *((opal_rmaps_numa_node_t **) a);
opal_rmaps_numa_node_t *bitem = *((opal_rmaps_numa_node_t **) b);
if (aitem->dist_from_closed > bitem->dist_from_closed) {
return 1;
@ -1915,7 +1915,7 @@ static void sort_by_dist(hwloc_topology_t topo, char* device_name, opal_list_t *
hwloc_obj_t device_obj = NULL;
hwloc_obj_t obj = NULL, root = NULL;
const struct hwloc_distances_s* distances;
orte_rmaps_numa_node_t *numa_node;
opal_rmaps_numa_node_t *numa_node;
int close_node_index;
float latency;
unsigned int j;
@ -1972,7 +1972,7 @@ static void sort_by_dist(hwloc_topology_t topo, char* device_name, opal_list_t *
/* fill list of numa nodes */
for (j = 0; j < distances->nbobjs; j++) {
latency = distances->latency[close_node_index + distances->nbobjs * j];
numa_node = OBJ_NEW(orte_rmaps_numa_node_t);
numa_node = OBJ_NEW(opal_rmaps_numa_node_t);
numa_node->index = j;
numa_node->dist_from_closed = latency;
opal_list_append(sorted_list, &numa_node->super);
@ -2005,7 +2005,7 @@ int opal_hwloc_get_sorted_numa_list(hwloc_topology_t topo, char* device_name, op
opal_list_item_t *item;
opal_hwloc_summary_t *sum;
opal_hwloc_topo_data_t *data;
orte_rmaps_numa_node_t *numa, *copy_numa;
opal_rmaps_numa_node_t *numa, *copy_numa;
int count;
obj = hwloc_get_root_obj(topo);
@ -2020,8 +2020,8 @@ int opal_hwloc_get_sorted_numa_list(hwloc_topology_t topo, char* device_name, op
sum = (opal_hwloc_summary_t*)item;
if (HWLOC_OBJ_NODE == sum->type) {
if (opal_list_get_size(&sum->sorted_by_dist_list) > 0) {
OPAL_LIST_FOREACH(numa, &(sum->sorted_by_dist_list), orte_rmaps_numa_node_t) {
copy_numa = OBJ_NEW(orte_rmaps_numa_node_t);
OPAL_LIST_FOREACH(numa, &(sum->sorted_by_dist_list), opal_rmaps_numa_node_t) {
copy_numa = OBJ_NEW(opal_rmaps_numa_node_t);
copy_numa->index = numa->index;
copy_numa->dist_from_closed = numa->dist_from_closed;
opal_list_append(sorted_list, &copy_numa->super);
@ -2041,8 +2041,8 @@ int opal_hwloc_get_sorted_numa_list(hwloc_topology_t topo, char* device_name, op
}
sort_by_dist(topo, device_name, sorted_list);
/* store this info in summary object for later usage */
OPAL_LIST_FOREACH(numa, sorted_list, orte_rmaps_numa_node_t) {
copy_numa = OBJ_NEW(orte_rmaps_numa_node_t);
OPAL_LIST_FOREACH(numa, sorted_list, opal_rmaps_numa_node_t) {
copy_numa = OBJ_NEW(opal_rmaps_numa_node_t);
copy_numa->index = numa->index;
copy_numa->dist_from_closed = numa->dist_from_closed;
opal_list_append(&(sum->sorted_by_dist_list), &copy_numa->super);

8
orte/mca/rmaps/mindist/rmaps_mindist_module.c
Просмотреть файл

@ -61,7 +61,7 @@ static int mindist_map(orte_job_t *jdata)
opal_list_t numa_list;
opal_list_item_t *item;
opal_list_item_t *numa_item;
orte_rmaps_numa_node_t *numa;
opal_rmaps_numa_node_t *numa;
orte_node_t *node;
orte_proc_t *proc;
int nprocs_mapped;
@ -253,7 +253,7 @@ static int mindist_map(orte_job_t *jdata)
if (opal_list_get_size(&numa_list) > 0) {
j = 0;
required = 0;
OPAL_LIST_FOREACH(numa, &numa_list, orte_rmaps_numa_node_t) {
OPAL_LIST_FOREACH(numa, &numa_list, opal_rmaps_numa_node_t) {
/* get the hwloc object for this numa */
if (NULL == (obj = opal_hwloc_base_get_obj_by_type(node->topology, HWLOC_OBJ_NODE, 0, numa->index, OPAL_HWLOC_AVAILABLE))) {
ORTE_ERROR_LOG(ORTE_ERR_NOT_FOUND);
@ -355,7 +355,7 @@ static int mindist_map(orte_job_t *jdata)
if (opal_list_get_size(&numa_list) > 0) {
numa_item = opal_list_get_first(&numa_list);
k = 0;
obj = hwloc_get_obj_by_type(node->topology, HWLOC_OBJ_NODE,((orte_rmaps_numa_node_t*)numa_item)->index);
obj = hwloc_get_obj_by_type(node->topology, HWLOC_OBJ_NODE,((opal_rmaps_numa_node_t*)numa_item)->index);
npus = opal_hwloc_base_get_npus(node->topology, obj);
for (j = 0; j < (int)num_procs_to_assign && nprocs_mapped < (int)app->num_procs; j++) {
if (NULL == (proc = orte_rmaps_base_setup_proc(jdata, node, i))) {
@ -370,7 +370,7 @@ static int mindist_map(orte_job_t *jdata)
if (numa_item == opal_list_get_end(&numa_list)) {
numa_item = opal_list_get_first(&numa_list);
}
obj = hwloc_get_obj_by_type(node->topology, HWLOC_OBJ_NODE,((orte_rmaps_numa_node_t*)numa_item)->index);
obj = hwloc_get_obj_by_type(node->topology, HWLOC_OBJ_NODE,((opal_rmaps_numa_node_t*)numa_item)->index);
npus = opal_hwloc_base_get_npus(node->topology, obj);
k = 0;
}