Skip to content

ompi/instance: fix cleanup function registration order #13073

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

Closed
wants to merge 1 commit into from
Closed

ompi/instance: fix cleanup function registration order #13073

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
12 changes: 8 additions & 4 deletions ompi/instance/instance.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
* reserved.
* Copyright (c) 2023 Jeffrey M. Squyres. All rights reserved.
* Copyright (c) 2024 NVIDIA Corporation. All rights reserved.
* Copyright (c) 2025 SiPearl. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -381,6 +382,10 @@ static int ompi_mpi_instance_init_common (int argc, char **argv)
opal_finalize_domain_init (&ompi_instance_common_domain, "ompi_mpi_instance_init_common");
opal_finalize_set_domain (&ompi_instance_common_domain);

/* Append PML cleanup into the finalize of this domain ('ompi_instance_common_domain')
before RTE init */
ompi_mpi_instance_append_finalize (ompi_mpi_instance_cleanup_pml);

if (OPAL_SUCCESS != (ret = opal_arch_set_fortran_logical_size(sizeof(ompi_fortran_logical_t)))) {
return ompi_instance_print_error ("ompi_mpi_init: opal_arch_set_fortran_logical_size failed", ret);
}
Expand Down Expand Up @@ -638,8 +643,6 @@ static int ompi_mpi_instance_init_common (int argc, char **argv)
return ompi_instance_print_error ("ompi_group_init() failed", ret);
}

ompi_mpi_instance_append_finalize (ompi_mpi_instance_cleanup_pml);

/* initialize communicator subsystem */
if (OMPI_SUCCESS != (ret = ompi_comm_init ())) {
opal_mutex_unlock (&instance_lock);
Expand Down Expand Up @@ -906,8 +909,6 @@ static int ompi_mpi_instance_finalize_common (void)
mca_mpool_base_tree_print (ompi_debug_show_mpi_alloc_mem_leaks);
}

opal_finalize_cleanup_domain (&ompi_instance_common_domain);

if (NULL != ompi_mpi_main_thread) {
OBJ_RELEASE(ompi_mpi_main_thread);
ompi_mpi_main_thread = NULL;
Expand Down Expand Up @@ -936,6 +937,9 @@ static int ompi_mpi_instance_finalize_common (void)

ompi_rte_initialized = false;

/* Should be called in reverse order of init, i.e. after RTE finalize */
opal_finalize_cleanup_domain (&ompi_instance_common_domain);

for (int i = 0 ; ompi_lazy_frameworks[i] ; ++i) {
if (0 < ompi_lazy_frameworks[i]->framework_refcnt) {
/* May have been "opened" multiple times. We want it closed now! */
Expand Down
Loading