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.

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

sessions: fix some problems with multiple init/fini #12883

Merged
merged 1 commit into from
Oct 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 ompi/instance/instance.c
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,8 @@ void ompi_mpi_instance_release (void)
opal_argv_free (ompi_mpi_instance_pmix_psets);
ompi_mpi_instance_pmix_psets = NULL;

OBJ_DESTRUCT(&ompi_mpi_instance_null);

opal_finalize_cleanup_domain (&ompi_instance_basic_domain);
OBJ_DESTRUCT(&ompi_instance_basic_domain);

Expand Down Expand Up @@ -950,8 +952,6 @@ static int ompi_mpi_instance_finalize_common (void)

ompi_proc_finalize();

OBJ_DESTRUCT(&ompi_mpi_instance_null);

ompi_mpi_instance_release ();

if (0 == opal_initialized) {
Expand Down
4 changes: 4 additions & 0 deletions opal/mca/base/mca_base_var_group.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
* reserved.
* Copyright (c) 2017 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* Copyright (c) 2024 Triad National Security, LLC. All rights
* reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
Expand Down Expand Up @@ -374,6 +376,8 @@ int mca_base_var_group_deregister(int group_index)
for (int i = 0; i < size; ++i) {
OBJ_RELEASE(enums[i]);
}
opal_value_array_set_size(&group->group_enums, 0);


size = opal_value_array_get_size(&group->group_subgroups);
subgroups = OPAL_VALUE_ARRAY_GET_BASE(&group->group_subgroups, int);
Expand Down
Loading