fix broken test #25
Merged
fix broken test #25
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gold2718
approved these changes
Dec 24, 2023
recv.c
Outdated
| @@ -12,7 +12,8 @@ | |||
|
|
|||
| static int mpi_match_send(void *r, void *tag) | |||
| { | |||
| return( *((int *)tag) == MPI_ANY_TAG || | |||
| // printf("mpi_match_send %d %d\n",*(int *)tag, ((Req *) r)->tag); | |||
There was a problem hiding this comment.
This can (and should IMHO) be removed.
send.c
Outdated
| @@ -11,7 +11,8 @@ | |||
|
|
|||
| static int mpi_match_recv(void *r, void *tag) | |||
| { | |||
| return( ((Req *)r)->tag == MPI_ANY_TAG || | |||
| // printf("mpi_match_recv %d %d\n",*((int *) tag), ((Req *)r)->tag); | |||
There was a problem hiding this comment.
This can (and should IMHO) be removed.
send.c
Outdated
| if (( match=AP_list_search_func(mycomm->recvlist,mpi_match_recv,&tag))) | ||
| { | ||
| rreq=(Req *)AP_listitem_data(match); | ||
| AP_list_delete_item(mycomm->recvlist,match); | ||
|
|
||
| // memcpy(rreq->buf,buf,count * datatype); | ||
| copy_data2(buf, count, datatype, rreq->buf, count, datatype); | ||
| // printf("calling copy datatype %d %d %d %d\n",(int) datatype, count, rreq->type, rreq->count); |
There was a problem hiding this comment.
Please remove all debugging print statements.
type.c
Outdated
Comment on lines
223
to
234
|
|
||
|
|
||
| /* | ||
| int MPI_Type_get_envelope(MPI_Datatype type, int *num_integers, int *num_addresses, int *num_datatypes, int *combiner) | ||
| { | ||
| *num_integers = | ||
|
|
||
| } | ||
|
|
||
| */ | ||
|
|
||
|
|
There was a problem hiding this comment.
Is this needed for anything? If not, please remove.
type.c
Outdated
Comment on lines
836
to
1080
| printf("<"); | ||
| count = array_of_ints[0]; | ||
| for (i = 0; i < count; i++) { // count | ||
| blocklength = array_of_ints[i + 1]; // array of blocklength | ||
| tmpPrevExtent = prevExtentTot; | ||
| tmpPrevExtent += array_of_adds[i]; // + displacement in byte | ||
| printf( "BL : %d - ", blocklength); | ||
| for (j = 0; j < blocklength; j++) { | ||
| tmpPrevExtent = printdatatype( array_of_dtypes[0], tmpPrevExtent); | ||
| printf(", "); | ||
| tmpPrevExtent += subExtent; | ||
| } | ||
| } | ||
| printf(">, "); | ||
|
|
||
| prevExtentTot = tmpPrevExtent; | ||
|
|
||
| break; | ||
| } | ||
| case MPI_COMBINER_INDEXED_BLOCK:{ | ||
| MPI_Aint tmpPrevExtent; | ||
| int count; | ||
| MPI_Type_get_contents( datatype, num_ints, num_adds, num_dtypes, array_of_ints, array_of_adds, array_of_dtypes ); | ||
|
|
||
| MPI_Type_extent(array_of_dtypes[0], &subExtent); // no need to do in loop because same type | ||
|
|
||
| printf("<"); | ||
| count = array_of_ints[0]; | ||
| for (i = 0; i < count; i++) { // count | ||
| tmpPrevExtent = prevExtentTot; | ||
| tmpPrevExtent += array_of_ints[i + 2] * subExtent; // + displacement * size of block | ||
| printf( "BL : %d - ", array_of_ints[i + 1]); | ||
| for (j = 0; j < array_of_ints[1]; j++) { // blocklength | ||
| tmpPrevExtent = printdatatype( array_of_dtypes[0], tmpPrevExtent); | ||
| printf(", "); | ||
| tmpPrevExtent += subExtent; | ||
| } | ||
| } | ||
| printf(">, "); | ||
|
|
||
| prevExtentTot = tmpPrevExtent; | ||
|
|
||
| break; | ||
| } | ||
| case MPI_COMBINER_STRUCT: | ||
| case MPI_COMBINER_STRUCT_INTEGER:{ | ||
| MPI_Aint tmpPrevExtent; | ||
| MPI_Type_get_contents( datatype, num_ints, num_adds, num_dtypes, array_of_ints, array_of_adds, array_of_dtypes ); | ||
|
|
||
| printf( "{"); | ||
| for (i = 0; i < array_of_ints[0]; i++) { // count | ||
| tmpPrevExtent = prevExtentTot + array_of_adds[i]; // origin + displacement | ||
| printf( "BL : %d - ", array_of_ints[i + 1]); | ||
| tmpPrevExtent = printdatatype( array_of_dtypes[i], tmpPrevExtent); | ||
| tmpPrevExtent += subExtent; | ||
| printf(", "); | ||
| } | ||
| printf("}, "); | ||
|
|
||
| prevExtentTot = tmpPrevExtent; | ||
|
|
||
| break; | ||
| } | ||
| case MPI_COMBINER_SUBARRAY: | ||
| // I don't know what is interresting to display here... | ||
| printf("... subarray not handled ..."); | ||
| break; | ||
| case MPI_COMBINER_DARRAY: | ||
| // Same | ||
| printf("... darray not handled ..."); | ||
| break; | ||
| case MPI_COMBINER_RESIZED: | ||
| MPI_Type_get_contents( datatype, num_ints, num_adds, num_dtypes, array_of_ints, array_of_adds, array_of_dtypes ); | ||
|
|
||
| prevExtentTot = printdatatype( array_of_dtypes[0], prevExtentTot); | ||
|
|
||
| printf(", \n"); | ||
|
|
||
| break; | ||
| default: | ||
| printf( "Unrecognized combiner type\n" ); | ||
| } | ||
|
|
||
| free( array_of_ints ); | ||
| free( array_of_adds ); | ||
| free( array_of_dtypes ); | ||
|
|
||
| return prevExtentTot; | ||
| } | ||
|
|
||
| void printMapDatatype(MPI_Datatype datatype) { | ||
| MPI_Aint lb, ub; | ||
| MPI_Type_lb(datatype, &lb); | ||
| MPI_Type_ub(datatype, &ub); | ||
|
|
||
| printf("\"(LB, %ld), ", lb); | ||
| printdatatype(datatype, 0); | ||
| printf("(UB, %ld)\"\n", ub); | ||
| } | ||
| */ |
There was a problem hiding this comment.
All this commented out code is confusing. Either remove it or maybe bracket it with something like #ifdef DEBUG_PRINT.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes issue #11
The issue was that the recv datatype sent to the irecv call was ignored by the copy data called in the send call. In order to fix this I added datatype and count to the Req structure so that they can be used in the send.