checking of multiply included/excluded processes in
group_range_incl/excl has now been separated from the implementation. This commit was SVN r9311.
Этот коммит содержится в:
родитель
bab5b2a63e
Коммит
b8c9adc833
@ -298,11 +298,6 @@ int ompi_group_range_incl(ompi_group_t* group, int n_triplets, int ranges[][3],
|
||||
/* positive stride */
|
||||
index = first_rank;
|
||||
while (index <= last_rank) {
|
||||
/* make sure rank has not already been selected */
|
||||
if (elements_int_list[index] != -1) {
|
||||
free(elements_int_list);
|
||||
return MPI_ERR_RANK;
|
||||
}
|
||||
elements_int_list[index] = new_group_size;
|
||||
index += stride;
|
||||
new_group_size++;
|
||||
@ -312,11 +307,6 @@ int ompi_group_range_incl(ompi_group_t* group, int n_triplets, int ranges[][3],
|
||||
/* negative stride */
|
||||
index = first_rank;
|
||||
while (index >= last_rank) {
|
||||
/* make sure rank has not already been selected */
|
||||
if (elements_int_list[index] != -1) {
|
||||
free(elements_int_list);
|
||||
return MPI_ERR_RANK;
|
||||
}
|
||||
elements_int_list[index] = new_group_size;
|
||||
index += stride;
|
||||
new_group_size++;
|
||||
@ -325,10 +315,6 @@ int ompi_group_range_incl(ompi_group_t* group, int n_triplets, int ranges[][3],
|
||||
} else { /* first_rank == last_rank */
|
||||
|
||||
index = first_rank;
|
||||
if (elements_int_list[index] != -1) {
|
||||
free(elements_int_list);
|
||||
return MPI_ERR_RANK;
|
||||
}
|
||||
elements_int_list[index] = new_group_size;
|
||||
new_group_size++;
|
||||
}
|
||||
@ -406,11 +392,6 @@ int ompi_group_range_excl(ompi_group_t* group, int n_triplets, int ranges[][3],
|
||||
if (first_rank < last_rank) {
|
||||
/* positive stride */
|
||||
for (index = first_rank; index <= last_rank; index += stride) {
|
||||
/* make sure rank has not already been selected */
|
||||
if (elements_int_list[index] != -1) {
|
||||
free(elements_int_list);
|
||||
return MPI_ERR_RANK;
|
||||
}
|
||||
elements_int_list[index] = new_group_size;
|
||||
new_group_size++;
|
||||
}
|
||||
@ -418,11 +399,6 @@ int ompi_group_range_excl(ompi_group_t* group, int n_triplets, int ranges[][3],
|
||||
} else if (first_rank > last_rank) {
|
||||
/* negative stride */
|
||||
for (index = first_rank; index >= last_rank; index += stride) {
|
||||
/* make sure rank has not already been selected */
|
||||
if (elements_int_list[index] != -1) {
|
||||
free(elements_int_list);
|
||||
return MPI_ERR_RANK;
|
||||
}
|
||||
elements_int_list[index] = new_group_size;
|
||||
new_group_size++;
|
||||
}
|
||||
@ -430,10 +406,6 @@ int ompi_group_range_excl(ompi_group_t* group, int n_triplets, int ranges[][3],
|
||||
} else {
|
||||
/* first_rank == last_rank */
|
||||
index = first_rank;
|
||||
if (elements_int_list[index] != -1) {
|
||||
free(elements_int_list);
|
||||
return MPI_ERR_RANK;
|
||||
}
|
||||
elements_int_list[index] = new_group_size;
|
||||
new_group_size++;
|
||||
}
|
||||
|
@ -39,11 +39,9 @@ static const char FUNC_NAME[] = "MPI_Group_range_excl";
|
||||
int MPI_Group_range_excl(MPI_Group group, int n_triplets, int ranges[][3],
|
||||
MPI_Group *new_group)
|
||||
{
|
||||
int err, i, group_size;
|
||||
int err, i, group_size,index,*elements_int_list;
|
||||
|
||||
|
||||
group_size = ompi_group_size ( group );
|
||||
|
||||
/* can't act on NULL group */
|
||||
if( MPI_PARAM_CHECK ) {
|
||||
OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
|
||||
@ -52,6 +50,17 @@ int MPI_Group_range_excl(MPI_Group group, int n_triplets, int ranges[][3],
|
||||
FUNC_NAME);
|
||||
}
|
||||
|
||||
group_size = ompi_group_size ( group );
|
||||
elements_int_list = (int *)
|
||||
malloc(sizeof(int) * group_size);
|
||||
if (NULL == elements_int_list) {
|
||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_OTHER,
|
||||
FUNC_NAME);
|
||||
}
|
||||
for (i = 0; i < group_size; i++) {
|
||||
elements_int_list[i] = -1;
|
||||
}
|
||||
|
||||
for (i = 0; i < n_triplets; i++) {
|
||||
if ((0 > ranges[i][0]) || (ranges[i][0] > group_size )) {
|
||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_RANK,
|
||||
@ -65,15 +74,48 @@ int MPI_Group_range_excl(MPI_Group group, int n_triplets, int ranges[][3],
|
||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_RANK,
|
||||
FUNC_NAME);
|
||||
}
|
||||
if ( (ranges[i][0] < ranges[i][1]) && ( ranges[i][2] < 0)) {
|
||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_RANK,
|
||||
FUNC_NAME);
|
||||
if ( (ranges[i][0] < ranges[i][1])) {
|
||||
if( ( ranges[i][2] < 0) ) {
|
||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_RANK,
|
||||
FUNC_NAME);
|
||||
}
|
||||
/* positive stride */
|
||||
for (index = ranges[i][0]; index <= ranges[i][1]; index += ranges[i][2]) {
|
||||
/* make sure rank has not already been selected */
|
||||
if (elements_int_list[index] != -1) {
|
||||
free(elements_int_list);
|
||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_RANK,
|
||||
FUNC_NAME);
|
||||
}
|
||||
}
|
||||
}
|
||||
if ( (ranges[i][0] > ranges[i][1]) && (ranges[i][2] > 0)) {
|
||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_RANK,
|
||||
FUNC_NAME);
|
||||
if ( (ranges[i][0] > ranges[i][1])) {
|
||||
if((ranges[i][2] > 0)) {
|
||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_RANK,
|
||||
FUNC_NAME);
|
||||
}
|
||||
/* negative stride */
|
||||
for (index = ranges[i][0]; index >= ranges[i][1]; index += ranges[i][2]) {
|
||||
/* make sure rank has not already been selected */
|
||||
if (elements_int_list[index] != -1) {
|
||||
free(elements_int_list);
|
||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_RANK,
|
||||
FUNC_NAME);
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
/* first_rank == last_rank */
|
||||
index = ranges[i][0];
|
||||
if (elements_int_list[index] != -1) {
|
||||
free(elements_int_list);
|
||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_RANK,
|
||||
FUNC_NAME);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
free (elements_int_list);
|
||||
}
|
||||
|
||||
err = ompi_group_range_excl(group,n_triplets,ranges,new_group);
|
||||
|
@ -39,10 +39,10 @@ static const char FUNC_NAME[] = "MPI_Group_range_incl";
|
||||
int MPI_Group_range_incl(MPI_Group group, int n_triplets, int ranges[][3],
|
||||
MPI_Group *new_group)
|
||||
{
|
||||
int err, i;
|
||||
int err, i,index;
|
||||
int group_size;
|
||||
int *elements_int_list;
|
||||
|
||||
group_size = ompi_group_size ( group);
|
||||
/* can't act on NULL group */
|
||||
if( MPI_PARAM_CHECK ) {
|
||||
OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
|
||||
@ -52,6 +52,16 @@ int MPI_Group_range_incl(MPI_Group group, int n_triplets, int ranges[][3],
|
||||
FUNC_NAME);
|
||||
}
|
||||
|
||||
group_size = ompi_group_size ( group);
|
||||
elements_int_list =
|
||||
(int *) malloc(sizeof(int) * group_size);
|
||||
if (NULL == elements_int_list) {
|
||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_OTHER, FUNC_NAME);
|
||||
}
|
||||
for (i = 0; i < group_size; i++) {
|
||||
elements_int_list[i] = -1;
|
||||
}
|
||||
|
||||
for ( i=0; i < n_triplets; i++) {
|
||||
if(( 0 > ranges[i][0] ) || (ranges[i][0] > group_size )) {
|
||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_RANK,
|
||||
@ -65,15 +75,52 @@ int MPI_Group_range_incl(MPI_Group group, int n_triplets, int ranges[][3],
|
||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_RANK,
|
||||
FUNC_NAME);
|
||||
}
|
||||
if ( (ranges[i][0] < ranges[i][1]) && (ranges[i][2] < 0)) {
|
||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_RANK,
|
||||
FUNC_NAME);
|
||||
if ( (ranges[i][0] < ranges[i][1]) ){
|
||||
if( (ranges[i][2] < 0) ) {
|
||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_RANK,
|
||||
FUNC_NAME);
|
||||
}
|
||||
/* positive stride */
|
||||
index = ranges[i][0];
|
||||
while (index <= ranges[i][1]) {
|
||||
/* make sure rank has not already been selected */
|
||||
if (elements_int_list[index] != -1) {
|
||||
free(elements_int_list);
|
||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_RANK,
|
||||
FUNC_NAME);
|
||||
}
|
||||
index += ranges[i][2];
|
||||
} /* end while loop */
|
||||
}
|
||||
if ( (ranges[i][0] > ranges[i][1]) && (ranges[i][2] > 0) ){
|
||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_RANK,
|
||||
if ( (ranges[i][0] > ranges[i][1])) {
|
||||
if ( (ranges[i][2] > 0) ){
|
||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_RANK,
|
||||
FUNC_NAME);
|
||||
}
|
||||
/* negative stride */
|
||||
index = ranges[i][0];
|
||||
while (index >= ranges[i][1]) {
|
||||
/* make sure rank has not already been selected */
|
||||
if (elements_int_list[index] != -1) {
|
||||
free(elements_int_list);
|
||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_RANK,
|
||||
FUNC_NAME);
|
||||
}
|
||||
index += ranges[i][2];
|
||||
} /* end while loop */
|
||||
}
|
||||
else { /* first_rank == last_rank */
|
||||
|
||||
index = ranges[i][0];
|
||||
if (elements_int_list[index] != -1) {
|
||||
free(elements_int_list);
|
||||
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_RANK,
|
||||
FUNC_NAME);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
free ( elements_int_list);
|
||||
}
|
||||
|
||||
err = ompi_group_range_incl ( group, n_triplets, ranges, new_group );
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user