Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changes for post-v5.0.5 release #12703

Merged
merged 2 commits into from
Jul 24, 2024
Merged

Changes for post-v5.0.5 release #12703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2987c5b
VERSION: bump version after v5.0.5 release
wenduwan Jul 23, 2024
679fad7
Check that requests belong to similar sessions
bosilca Jul 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

major=5
minor=0
release=5
release=6

# MPI Standard Compliance Level
mpi_standard_version=3
Expand All @@ -41,7 +41,7 @@ flex_min_version=2.5.4
# requirement is that it must be entirely printable ASCII characters
# and have no white space.

greek=
greek=a1

# If repo_rev is empty, then the repository version number will be
# obtained during "make dist" via the "git describe --tags --always"
Expand Down
6 changes: 1 addition & 5 deletions ompi/communicator/communicator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
* Copyright (c) 2018-2024 Triad National Security, LLC. All rights
* reserved.
* Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved.
* Copyright (c) 2024 NVIDIA Corporation. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -609,11 +610,6 @@ static inline struct ompi_proc_t* ompi_comm_peer_lookup (const ompi_communicator
return ompi_group_peer_lookup(comm->c_remote_group,peer_id);
}

static inline bool ompi_comm_instances_same(const ompi_communicator_t *comm1, const ompi_communicator_t *comm2)
{
return comm1->instance == comm2->instance;
}

#if OPAL_ENABLE_FT_MPI
/*
* Support for MPI_ANY_SOURCE point-to-point operations
Expand Down
25 changes: 4 additions & 21 deletions ompi/mpi/c/testall.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
* and Technology (RIST). All rights reserved.
* Copyright (c) 2021 Triad National Security, LLC. All rights
* reserved.
* Copyright (c) 2024 NVIDIA Corporation. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -57,31 +58,13 @@ int MPI_Testall(int count, MPI_Request requests[], int *flag,
);

if ( MPI_PARAM_CHECK ) {
int i, rc = MPI_SUCCESS;
MPI_Request check_req = NULL;
int rc = MPI_SUCCESS;
OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
if( (NULL == requests) && (0 != count) ) {
rc = MPI_ERR_REQUEST;
} else {
for (i = 0; i < count; i++) {
if (NULL == requests[i]) {
rc = MPI_ERR_REQUEST;
break;
}
if (&ompi_request_empty == requests[i]) {
continue;
} else if (NULL == requests[i]->req_mpi_object.comm) {
continue;
} else if (NULL == check_req) {
check_req = requests[i];
}
else {
if (!ompi_comm_instances_same(requests[i]->req_mpi_object.comm,
check_req->req_mpi_object.comm)) {
rc = MPI_ERR_REQUEST;
break;
}
}
if(!ompi_request_check_same_instance(requests, count) ) {
rc = MPI_ERR_REQUEST;
}
}
if ((NULL == flag) || (count < 0)) {
Expand Down
25 changes: 4 additions & 21 deletions ompi/mpi/c/testany.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
* and Technology (RIST). All rights reserved.
* Copyright (c) 2021 Triad National Security, LLC. All rights
* reserved.
* Copyright (c) 2024 NVIDIA Corporation. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -56,31 +57,13 @@ int MPI_Testany(int count, MPI_Request requests[], int *indx, int *completed, MP
);

if ( MPI_PARAM_CHECK ) {
int i, rc = MPI_SUCCESS;
MPI_Request check_req = NULL;
int rc = MPI_SUCCESS;
OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
if ((NULL == requests) && (0 != count)) {
rc = MPI_ERR_REQUEST;
} else {
for (i = 0; i < count; i++) {
if (NULL == requests[i]) {
rc = MPI_ERR_REQUEST;
break;
}
if (&ompi_request_empty == requests[i]) {
continue;
} else if (NULL == requests[i]->req_mpi_object.comm) {
continue;
} else if (NULL == check_req) {
check_req = requests[i];
}
else {
if (!ompi_comm_instances_same(requests[i]->req_mpi_object.comm,
check_req->req_mpi_object.comm)) {
rc = MPI_ERR_REQUEST;
break;
}
}
if(!ompi_request_check_same_instance(requests, count) ) {
rc = MPI_ERR_REQUEST;
}
}
if (((NULL == indx || NULL == completed) && count > 0) ||
Expand Down
25 changes: 4 additions & 21 deletions ompi/mpi/c/testsome.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
* and Technology (RIST). All rights reserved.
* Copyright (c) 2021 Triad National Security, LLC. All rights
* reserved.
* Copyright (c) 2024 NVIDIA Corporation. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -58,31 +59,13 @@ int MPI_Testsome(int incount, MPI_Request requests[],
);

if ( MPI_PARAM_CHECK ) {
int indx, rc = MPI_SUCCESS;
MPI_Request check_req = NULL;
int rc = MPI_SUCCESS;
OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
if ((NULL == requests) && (0 != incount)) {
rc = MPI_ERR_REQUEST;
} else {
for (indx = 0; indx < incount; ++indx) {
if (NULL == requests[indx]) {
rc = MPI_ERR_REQUEST;
break;
}
if (&ompi_request_empty == requests[indx]) {
continue;
} else if (NULL == requests[indx]->req_mpi_object.comm) {
continue;
} else if (NULL == check_req) {
check_req = requests[indx];
}
else {
if (!ompi_comm_instances_same(requests[indx]->req_mpi_object.comm,
check_req->req_mpi_object.comm)) {
rc = MPI_ERR_REQUEST;
break;
}
}
if(!ompi_request_check_same_instance(requests, incount) ) {
rc = MPI_ERR_REQUEST;
}
}
if (((NULL == outcount || NULL == indices) && incount > 0) ||
Expand Down
25 changes: 4 additions & 21 deletions ompi/mpi/c/waitall.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
* and Technology (RIST). All rights reserved.
* Copyright (c) 2021 Triad National Security, LLC. All rights
* reserved.
* Copyright (c) 2024 NVIDIA Corporation. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -55,31 +56,13 @@ int MPI_Waitall(int count, MPI_Request requests[], MPI_Status statuses[])
);

if ( MPI_PARAM_CHECK ) {
int i, rc = MPI_SUCCESS;
MPI_Request check_req = NULL;
int rc = MPI_SUCCESS;
OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
if( (NULL == requests) && (0 != count) ) {
rc = MPI_ERR_REQUEST;
} else {
for (i = 0; i < count; i++) {
if (NULL == requests[i]) {
rc = MPI_ERR_REQUEST;
break;
}
if (&ompi_request_empty == requests[i]) {
continue;
} else if (NULL == requests[i]->req_mpi_object.comm) {
continue;
} else if (NULL == check_req) {
check_req = requests[i];
}
else {
if (!ompi_comm_instances_same(requests[i]->req_mpi_object.comm,
check_req->req_mpi_object.comm)) {
rc = MPI_ERR_REQUEST;
break;
}
}
if(!ompi_request_check_same_instance(requests, count) ) {
rc = MPI_ERR_REQUEST;
}
}
if (count < 0) {
Expand Down
25 changes: 4 additions & 21 deletions ompi/mpi/c/waitany.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
* and Technology (RIST). All rights reserved.
* Copyright (c) 2021 Triad National Security, LLC. All rights
* reserved.
* Copyright (c) 2024 NVIDIA Corporation. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -56,31 +57,13 @@ int MPI_Waitany(int count, MPI_Request requests[], int *indx, MPI_Status *status
);

if ( MPI_PARAM_CHECK ) {
int i, rc = MPI_SUCCESS;
MPI_Request check_req = NULL;
int rc = MPI_SUCCESS;
OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
if ((NULL == requests) && (0 != count)) {
rc = MPI_ERR_REQUEST;
} else {
for (i = 0; i < count; i++) {
if (NULL == requests[i]) {
rc = MPI_ERR_REQUEST;
break;
}
if (requests[i] == &ompi_request_empty) {
continue;
} else if (NULL == requests[i]->req_mpi_object.comm) {
continue;
} else if (NULL == check_req) {
check_req = requests[i];
}
else {
if (!ompi_comm_instances_same(requests[i]->req_mpi_object.comm,
check_req->req_mpi_object.comm)) {
rc = MPI_ERR_REQUEST;
break;
}
}
if(!ompi_request_check_same_instance(requests, count) ) {
rc = MPI_ERR_REQUEST;
}
}
if ((NULL == indx && count > 0) ||
Expand Down
25 changes: 4 additions & 21 deletions ompi/mpi/c/waitsome.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
* and Technology (RIST). All rights reserved.
* Copyright (c) 2021 Triad National Security, LLC. All rights
* reserved.
* Copyright (c) 2024 NVIDIA Corporation. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -58,31 +59,13 @@ int MPI_Waitsome(int incount, MPI_Request requests[],
);

if ( MPI_PARAM_CHECK ) {
int indx, rc = MPI_SUCCESS;
MPI_Request check_req = NULL;
int rc = MPI_SUCCESS;
OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
if ((NULL == requests) && (0 != incount)) {
rc = MPI_ERR_REQUEST;
} else {
for (indx = 0; indx < incount; ++indx) {
if (NULL == requests[indx]) {
rc = MPI_ERR_REQUEST;
break;
}
if (&ompi_request_empty == requests[indx]) {
continue;
} else if (NULL == requests[indx]->req_mpi_object.comm) {
continue;
} else if (NULL == check_req) {
check_req = requests[indx];
}
else {
if (!ompi_comm_instances_same(requests[indx]->req_mpi_object.comm,
check_req->req_mpi_object.comm)) {
rc = MPI_ERR_REQUEST;
break;
}
}
if(!ompi_request_check_same_instance(requests, incount) ) {
rc = MPI_ERR_REQUEST;
}
}
if (((NULL == outcount || NULL == indices) && incount > 0) ||
Expand Down
23 changes: 23 additions & 0 deletions ompi/request/request.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
* Copyright (c) 2018 Triad National Security, LLC. All rights
* reserved.
* Copyright (c) 2022 IBM Corporation. All rights reserved.
* Copyright (c) 2024 NVIDIA Corporation. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -248,3 +249,25 @@ int ompi_request_persistent_noop_create(ompi_request_t** request)
*request = req;
return OMPI_SUCCESS;
}

bool ompi_request_check_same_instance(ompi_request_t** requests,
int count)
{
ompi_request_t *req, *base = NULL;

for(int idx = 0; idx < count; idx++ ) {
req = requests[idx];
if(OMPI_REQUEST_NULL == req->req_type) /* predefined requests are generic */
continue;
/* Only PML requests have support for MPI sessions */
if(OMPI_REQUEST_PML != req->req_type)
continue;
if(NULL == base) {
base = req;
continue;
}
if(base->req_mpi_object.comm != req->req_mpi_object.comm)
return false;
}
return true;
}
17 changes: 17 additions & 0 deletions ompi/request/request.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
* Copyright (c) 2018 Triad National Security, LLC. All rights
* reserved.
* Copyright (c) 2022 IBM Corporation. All rights reserved.
* Copyright (c) 2024 NVIDIA Corporation. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -556,6 +557,22 @@ static inline int ompi_request_set_callback(ompi_request_t* request,
return OMPI_SUCCESS;
}

/**
* Check if an array of requests contains only requests that belong to the same
* instance or MPI Session. Exclude predefined requests, that are generic and part
* of all instances.
* Right now, only tests for PML requests as they are the only requests that have
* support for MPI Sessions.
*
* @param requests (IN) Array of requests
* @param count (IN) Number of requests
* @return true if all requests are part of the same instance
* or MPI Session, false otherwise.
*
*/
bool ompi_request_check_same_instance(ompi_request_t** requests,
int count);

END_C_DECLS

#endif
Loading