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

Added more output info about socket:core pair in paffinity / rankfile components

Просмотр исходного кода 
This commit was SVN r18589.
Этот коммит содержится в:
Lenny Verkhovsky 2008-06-05 10:28:44 +00:00
родитель 332e6c89ab
Коммит a8b5dcb204
1 изменённых файлов: 18 добавлений и 15 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

33
opal/mca/paffinity/base/paffinity_base_service.c
Просмотреть файл

@ -34,7 +34,7 @@ static int opal_paffinity_base_socket_to_cpu_set(char **socket_list, int socket_
char **range; char **range;
int range_cnt; int range_cnt;
int lower_range, upper_range; int lower_range, upper_range;
int processor_id, num_processors; int processor_id, num_processors, socket=-1, core=-1;
int max_processor_id; int max_processor_id;
int rc; int rc;
opal_paffinity_base_cpu_set_t cpumask; opal_paffinity_base_cpu_set_t cpumask;
@ -50,8 +50,9 @@ static int opal_paffinity_base_socket_to_cpu_set(char **socket_list, int socket_
if (OPAL_SUCCESS != ( rc = opal_paffinity_base_set(cpumask))) { if (OPAL_SUCCESS != ( rc = opal_paffinity_base_set(cpumask))) {
return OPAL_ERROR; return OPAL_ERROR;
} }
opal_paffinity_base_map_to_socket_core(processor_id, &socket, &core);
opal_output_verbose(5, opal_paffinity_base_output, opal_output_verbose(5, opal_paffinity_base_output,
"paffinity slot assignment: rank %ld runs on cpu #%d (any socket)",rank, processor_id); "paffinity slot assignment: rank %ld runs on cpu #%d ( %d : %d )",rank, processor_id, socket, core);
} }
continue; continue;
} }
@ -68,9 +69,10 @@ static int opal_paffinity_base_socket_to_cpu_set(char **socket_list, int socket_
if (OPAL_SUCCESS != ( rc = opal_paffinity_base_set(cpumask))) { if (OPAL_SUCCESS != ( rc = opal_paffinity_base_set(cpumask))) {
return OPAL_ERROR; return OPAL_ERROR;
} }
opal_paffinity_base_map_to_socket_core(processor_id, &socket, &core);
opal_output_verbose(5, opal_paffinity_base_output, opal_output_verbose(5, opal_paffinity_base_output,
"paffinity slot assignment: rank %ld runs on cpu #%d", "paffinity slot assignment: rank %ld runs on cpu #%d ( %d : %d )",
rank, processor_id); rank, processor_id, socket, core);
break; break;
case 2: case 2:
lower_range = atoi(range[0]); lower_range = atoi(range[0]);
@ -85,9 +87,10 @@ static int opal_paffinity_base_socket_to_cpu_set(char **socket_list, int socket_
if (OPAL_SUCCESS != (rc = opal_paffinity_base_set(cpumask))) { if (OPAL_SUCCESS != (rc = opal_paffinity_base_set(cpumask))) {
return OPAL_ERROR; return OPAL_ERROR;
} }
opal_paffinity_base_map_to_socket_core(processor_id, &socket, &core);
opal_output_verbose(5, opal_paffinity_base_output, opal_output_verbose(5, opal_paffinity_base_output,
"paffinity slot assignment: rank %ld runs on cpu #%d (%d-%d)", "paffinity slot assignment: rank %ld runs on cpu #%d ( %d : %d )",
rank, processor_id, lower_range, upper_range); rank, processor_id, socket, core);
} }
break; break;
default: default:
@ -142,7 +145,7 @@ static int opal_paffinity_base_socket_core_to_cpu_set(char **socket_core_list, i
return OPAL_ERROR; return OPAL_ERROR;
} }
opal_output_verbose(5, opal_paffinity_base_output, opal_output_verbose(5, opal_paffinity_base_output,
"paffinity slot assignment: rank %ld runs on cpu #%d (%d:%d)", "paffinity slot assignment: rank %ld runs on cpu #%d ( %d : %d)",
rank, processor_id, socket, core); rank, processor_id, socket, core);
} }
} else { } else {
@ -164,7 +167,7 @@ static int opal_paffinity_base_socket_core_to_cpu_set(char **socket_core_list, i
return OPAL_ERROR; return OPAL_ERROR;
} }
opal_output_verbose(5, opal_paffinity_base_output, opal_output_verbose(5, opal_paffinity_base_output,
"paffinity slot assignment: rank %ld runs on cpu #%d (%d:%d)", "paffinity slot assignment: rank %ld runs on cpu #%d ( %d : %d)",
rank, processor_id, socket, core); rank, processor_id, socket, core);
break; break;
case 2: case 2:
@ -184,7 +187,7 @@ static int opal_paffinity_base_socket_core_to_cpu_set(char **socket_core_list, i
return OPAL_ERROR; return OPAL_ERROR;
} }
opal_output_verbose(5, opal_paffinity_base_output, opal_output_verbose(5, opal_paffinity_base_output,
"paffinity slot assignment: rank %ld runs on cpu #%d (%d:%d)", "paffinity slot assignment: rank %ld runs on cpu #%d ( %d : %d)",
rank, processor_id, socket, core); rank, processor_id, socket, core);
} }
break; break;
@ -222,7 +225,7 @@ static int opal_paffinity_base_socket_core_to_cpu_set(char **socket_core_list, i
return OPAL_ERROR; return OPAL_ERROR;
} }
opal_output_verbose(5, opal_paffinity_base_output, opal_output_verbose(5, opal_paffinity_base_output,
"paffinity slot assignment: rank %ld runs on cpu #%d (%d:%d)", "paffinity slot assignment: rank %ld runs on cpu #%d ( %d : %d)",
rank, processor_id, socket, core); rank, processor_id, socket, core);
break; break;
case 2: case 2:
@ -242,7 +245,7 @@ static int opal_paffinity_base_socket_core_to_cpu_set(char **socket_core_list, i
return OPAL_ERROR; return OPAL_ERROR;
} }
opal_output_verbose(5, opal_paffinity_base_output, opal_output_verbose(5, opal_paffinity_base_output,
"paffinity slot assignment: rank %ld runs on cpu #%d (%d:%d)", "paffinity slot assignment: rank %ld runs on cpu #%d ( %d : %d)",
rank, processor_id, socket, core); rank, processor_id, socket, core);
} }
break; break;
@ -265,7 +268,7 @@ static int opal_paffinity_base_socket_core_to_cpu_set(char **socket_core_list, i
return OPAL_ERROR; return OPAL_ERROR;
} }
opal_output_verbose(5, opal_paffinity_base_output, opal_output_verbose(5, opal_paffinity_base_output,
"paffinity slot assignment: rank %ld runs on cpu #%d (%d:%d)", "paffinity slot assignment: rank %ld runs on cpu #%d ( %d : %d)",
rank, processor_id, socket, core); rank, processor_id, socket, core);
} }
} else { } else {
@ -288,7 +291,7 @@ static int opal_paffinity_base_socket_core_to_cpu_set(char **socket_core_list, i
return OPAL_ERROR; return OPAL_ERROR;
} }
opal_output_verbose(5, opal_paffinity_base_output, opal_output_verbose(5, opal_paffinity_base_output,
"paffinity slot assignment: rank %ld runs on cpu #%d (%d:%d)", "paffinity slot assignment: rank %ld runs on cpu #%d ( %d : %d)",
rank, processor_id, socket, core); rank, processor_id, socket, core);
break; break;
case 2: case 2:
@ -308,8 +311,8 @@ static int opal_paffinity_base_socket_core_to_cpu_set(char **socket_core_list, i
return OPAL_ERROR; return OPAL_ERROR;
} }
opal_output_verbose(5, opal_paffinity_base_output, opal_output_verbose(5, opal_paffinity_base_output,
"paffinity slot assignment: rank %ld runs on cpu #%d (%d:%d)", "paffinity slot assignment: rank %ld runs on cpu #%d ( %d : %d)",
rank, processor_id, socket, core); rank, processor_id, socket, core);
} }
break; break;
default: default: