Moving lam_group_finalize to lam_mpi_finalize (for symmetry with
lam_group_init). laminfo was failing in an assertion This commit was SVN r810.
Этот коммит содержится в:
родитель
9028eb751d
Коммит
edf0669882
@ -7,13 +7,9 @@
|
|||||||
#include "lam/constants.h"
|
#include "lam/constants.h"
|
||||||
#include "lam/runtime/runtime.h"
|
#include "lam/runtime/runtime.h"
|
||||||
#include "lam/util/output.h"
|
#include "lam/util/output.h"
|
||||||
#include "mpi/group/group.h"
|
|
||||||
|
|
||||||
int lam_finalize(void)
|
int lam_finalize(void)
|
||||||
{
|
{
|
||||||
/* free group resources */
|
|
||||||
lam_group_finalize();
|
|
||||||
|
|
||||||
/* Shut down malloc debug stuff */
|
/* Shut down malloc debug stuff */
|
||||||
lam_malloc_finalize();
|
lam_malloc_finalize();
|
||||||
|
|
||||||
|
@ -7,6 +7,7 @@
|
|||||||
#include "lam/constants.h"
|
#include "lam/constants.h"
|
||||||
#include "lam/runtime/runtime.h"
|
#include "lam/runtime/runtime.h"
|
||||||
#include "mpi.h"
|
#include "mpi.h"
|
||||||
|
#include "mpi/group/group.h"
|
||||||
#include "mpi/runtime/runtime.h"
|
#include "mpi/runtime/runtime.h"
|
||||||
#include "mca/lam/base/base.h"
|
#include "mca/lam/base/base.h"
|
||||||
#include "mca/mpi/ptl/ptl.h"
|
#include "mca/mpi/ptl/ptl.h"
|
||||||
@ -49,6 +50,11 @@ int lam_mpi_finalize(void)
|
|||||||
|
|
||||||
/* Leave LAM */
|
/* Leave LAM */
|
||||||
|
|
||||||
|
/* free group resources */
|
||||||
|
if (LAM_SUCCESS != (ret = lam_group_finalize())) {
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
if (LAM_SUCCESS != (ret = lam_finalize())) {
|
if (LAM_SUCCESS != (ret = lam_finalize())) {
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user