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

Don't call the delete callback on MPI_COMM_WORLD attributes. #12068

Merged
merged 1 commit into from
Nov 15, 2023
Merged

Don't call the delete callback on MPI_COMM_WORLD attributes. #12068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 1 deletion ompi/attribute/attribute.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
* reserved.
* Copyright (c) 2022 Amazon.com, Inc. or its affiliates.
* All Rights reserved.
* Copyright (c) 2023 NVIDIA Corporation. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -526,11 +527,12 @@ int ompi_attr_create_predefined_keyvals(void);
/**
* \internal
*
* Cache predefined attribute keys used in the World Model
* Cache and release the predefined attribute keys used in the World Model
*
* @returns OMPI_SUCCESS
*/
int ompi_attr_set_predefined_keyvals_for_wm(void);
void ompi_attr_delete_predefined_keyvals_for_wm(void);

/**
* \internal
Expand Down
20 changes: 20 additions & 0 deletions ompi/attribute/attribute_predefined.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
* All Rights reserved.
* Copyright (c) 2022 Triad National Security, LLC. All rights
* reserved.
* Copyright (c) 2023 NVIDIA Corporation. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -109,6 +110,7 @@ static int create_win(int target_keyval);
static int free_win(int keyval);

static int set_f(int keyval, MPI_Fint value);
static int unset_f(int keyval);

/*
* We do not need a lock here as this function is invoked when the
Expand Down Expand Up @@ -188,6 +190,17 @@ int ompi_attr_set_predefined_keyvals_for_wm(void)
return ret;
}

void ompi_attr_delete_predefined_keyvals_for_wm(void)
{
unset_f(MPI_TAG_UB);
unset_f(MPI_HOST);
unset_f(MPI_IO);
unset_f(MPI_WTIME_IS_GLOBAL);
unset_f(MPI_FT);
unset_f(MPI_LASTUSEDCODE);
unset_f(MPI_UNIVERSE_SIZE);
unset_f(MPI_APPNUM);
}

/*
* We do not need a lock here as this function is invoked when the
Expand Down Expand Up @@ -292,3 +305,10 @@ static int set_f(int keyval, MPI_Fint value)
keyval, value,
true);
}

static int unset_f(int keyval)
{
return ompi_attr_delete(COMM_ATTR, MPI_COMM_WORLD,
MPI_COMM_WORLD->c_keyhash,
keyval, true);
}
16 changes: 5 additions & 11 deletions ompi/communicator/comm_init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
* Copyright (c) 2018-2022 Triad National Security, LLC. All rights
* reserved.
* Copyright (c) 2023 Advanced Micro Devices, Inc. All rights reserved.
* Copyright (c) 2023 NVIDIA Corporation. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -311,18 +312,11 @@ static int ompi_comm_finalize (void)

if (ompi_comm_intrinsic_init) {
/* tear down MPI-3 predefined communicators (not initialized unless using MPI_Init) */
/* Free the attributes on comm world. This is not done in the
* destructor as we delete attributes in ompi_comm_free (which
* is not called for comm world) */
if (NULL != ompi_mpi_comm_world.comm.c_keyhash) {
/* Ignore errors when deleting attributes on comm_world */
(void) ompi_attr_delete_all(COMM_ATTR, &ompi_mpi_comm_world.comm, ompi_mpi_comm_world.comm.c_keyhash);
OBJ_RELEASE(ompi_mpi_comm_world.comm.c_keyhash);
}

/* Shut down MPI_COMM_SELF */
OBJ_DESTRUCT( &ompi_mpi_comm_self );
/* Shut down MPI_COMM_WORLD */
ompi_attr_delete_predefined_keyvals_for_wm();
/* Destroy the keyhash even is user defined attributes are still attached. */
OBJ_DESTRUCT(ompi_mpi_comm_world.comm.c_keyhash);
jsquyres marked this conversation as resolved.
Show resolved Hide resolved
ompi_mpi_comm_world.comm.c_keyhash = NULL;
OBJ_DESTRUCT( &ompi_mpi_comm_world );

ompi_comm_intrinsic_init = false;
Expand Down