- Update for new global function name (lam_group_allocate)
- Silence some minor compiler warnings This commit was SVN r933.
Этот коммит содержится в:
родитель
b9b207888e
Коммит
5e67eb96c8
@ -58,7 +58,7 @@ int MPI_Group_difference(MPI_Group group1, MPI_Group group2,
|
|||||||
} /* end proc loop */
|
} /* end proc loop */
|
||||||
|
|
||||||
/* allocate a new lam_group_t structure */
|
/* allocate a new lam_group_t structure */
|
||||||
new_group_pointer=group_allocate(new_group_size);
|
new_group_pointer=lam_group_allocate(new_group_size);
|
||||||
if( NULL == new_group_pointer ) {
|
if( NULL == new_group_pointer ) {
|
||||||
return MPI_ERR_GROUP;
|
return MPI_ERR_GROUP;
|
||||||
}
|
}
|
||||||
|
@ -41,7 +41,7 @@ int MPI_Group_excl(MPI_Group group, int n, int *ranks,
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
/* get new group struct */
|
/* get new group struct */
|
||||||
new_group_pointer=group_allocate(group_pointer->grp_proc_count-n);
|
new_group_pointer=lam_group_allocate(group_pointer->grp_proc_count-n);
|
||||||
if( NULL == new_group_pointer ) {
|
if( NULL == new_group_pointer ) {
|
||||||
return MPI_ERR_GROUP;
|
return MPI_ERR_GROUP;
|
||||||
}
|
}
|
||||||
|
@ -38,7 +38,7 @@ int MPI_Group_incl(MPI_Group group, int n, int *ranks, MPI_Group *new_group)
|
|||||||
|
|
||||||
|
|
||||||
/* get new group struct */
|
/* get new group struct */
|
||||||
new_group_pointer=group_allocate(n);
|
new_group_pointer=lam_group_allocate(n);
|
||||||
if( NULL == new_group_pointer ) {
|
if( NULL == new_group_pointer ) {
|
||||||
return MPI_ERR_GROUP;
|
return MPI_ERR_GROUP;
|
||||||
}
|
}
|
||||||
|
@ -17,7 +17,7 @@ int MPI_Group_intersection(MPI_Group group1, MPI_Group group2,
|
|||||||
|
|
||||||
/* local variables */
|
/* local variables */
|
||||||
int return_value,my_group_rank;
|
int return_value,my_group_rank;
|
||||||
int group_size,proc,proc1,proc2,cnt;
|
int group_size,proc1,proc2,cnt;
|
||||||
lam_group_t *group1_pointer, *group2_pointer, *new_group_pointer;
|
lam_group_t *group1_pointer, *group2_pointer, *new_group_pointer;
|
||||||
lam_proc_t *proc1_pointer, *proc2_pointer, *my_proc_pointer;
|
lam_proc_t *proc1_pointer, *proc2_pointer, *my_proc_pointer;
|
||||||
|
|
||||||
@ -53,7 +53,7 @@ int MPI_Group_intersection(MPI_Group group1, MPI_Group group2,
|
|||||||
} /* end proc1 loop */
|
} /* end proc1 loop */
|
||||||
|
|
||||||
/* fill in new group */
|
/* fill in new group */
|
||||||
new_group_pointer=group_allocate(group_size);
|
new_group_pointer=lam_group_allocate(group_size);
|
||||||
if( NULL == new_group_pointer ) {
|
if( NULL == new_group_pointer ) {
|
||||||
return MPI_ERR_GROUP;
|
return MPI_ERR_GROUP;
|
||||||
}
|
}
|
||||||
|
@ -123,7 +123,7 @@ int MPI_Group_range_excl(MPI_Group group, int n_triplets, int ranges[][3],
|
|||||||
new_group_size=group_pointer->grp_proc_count-new_group_size;
|
new_group_size=group_pointer->grp_proc_count-new_group_size;
|
||||||
|
|
||||||
/* allocate a new lam_group_t structure */
|
/* allocate a new lam_group_t structure */
|
||||||
new_group_pointer=group_allocate(new_group_size);
|
new_group_pointer=lam_group_allocate(new_group_size);
|
||||||
if( NULL == new_group_pointer ) {
|
if( NULL == new_group_pointer ) {
|
||||||
free(elements_int_list);
|
free(elements_int_list);
|
||||||
return MPI_ERR_GROUP;
|
return MPI_ERR_GROUP;
|
||||||
|
@ -114,7 +114,7 @@ int MPI_Group_range_incl(MPI_Group group, int n_triplets, int ranges[][3],
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* allocate a new lam_group_t structure */
|
/* allocate a new lam_group_t structure */
|
||||||
new_group_pointer=group_allocate(new_group_size);
|
new_group_pointer=lam_group_allocate(new_group_size);
|
||||||
if( NULL == new_group_pointer ) {
|
if( NULL == new_group_pointer ) {
|
||||||
free(elements_int_list);
|
free(elements_int_list);
|
||||||
return MPI_ERR_GROUP;
|
return MPI_ERR_GROUP;
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
int MPI_Group_union(MPI_Group group1, MPI_Group group2, MPI_Group *new_group)
|
int MPI_Group_union(MPI_Group group1, MPI_Group group2, MPI_Group *new_group)
|
||||||
{
|
{
|
||||||
/* local variables */
|
/* local variables */
|
||||||
int return_value, new_group_size, proc, proc1, proc2, found_in_group;
|
int return_value, new_group_size, proc1, proc2, found_in_group;
|
||||||
int my_group_rank, cnt;
|
int my_group_rank, cnt;
|
||||||
lam_group_t *group1_pointer, *group2_pointer, *new_group_pointer;
|
lam_group_t *group1_pointer, *group2_pointer, *new_group_pointer;
|
||||||
lam_proc_t *proc1_pointer, *proc2_pointer, *my_proc_pointer;
|
lam_proc_t *proc1_pointer, *proc2_pointer, *my_proc_pointer;
|
||||||
@ -60,7 +60,7 @@ int MPI_Group_union(MPI_Group group1, MPI_Group group2, MPI_Group *new_group)
|
|||||||
} /* end proc loop */
|
} /* end proc loop */
|
||||||
|
|
||||||
/* get new group struct */
|
/* get new group struct */
|
||||||
new_group_pointer = group_allocate(new_group_size);
|
new_group_pointer = lam_group_allocate(new_group_size);
|
||||||
if (NULL == new_group_pointer) {
|
if (NULL == new_group_pointer) {
|
||||||
return MPI_ERR_GROUP;
|
return MPI_ERR_GROUP;
|
||||||
}
|
}
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user