From be2d2dd98f954180c105759385adf22b60fce3e7 Mon Sep 17 00:00:00 2001 From: Howard Pritchard Date: Fri, 2 Jul 2021 12:41:29 -0600 Subject: [PATCH] sessions: resolve rebase conflicts Signed-off-by: Howard Pritchard --- ompi/runtime/ompi_mpi_init.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ompi/runtime/ompi_mpi_init.c b/ompi/runtime/ompi_mpi_init.c index 1adae7c69c7..f42ad03e3db 100644 --- a/ompi/runtime/ompi_mpi_init.c +++ b/ompi/runtime/ompi_mpi_init.c @@ -357,12 +357,6 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided, } #endif - /* Figure out the final MPI thread levels. If we were not - compiled for support for MPI threads, then don't allow - MPI_THREAD_MULTIPLE. Set this stuff up here early in the - process so that other components can make decisions based on - this value. */ - ompi_mpi_thread_level(requested, provided); ret = ompi_mpi_instance_init (*provided, &ompi_mpi_info_null.info.super, MPI_ERRORS_ARE_FATAL, &ompi_mpi_instance_default);