bugfix: Setting OMPI_MPI_THREAD_LEVEL to a value different than

`requested` in `MPI_Init_thread` would invoke the error handler, even
though it is an useful override in some threaded library use cases.

Signed-off-by: Aurelien Bouteiller <[email protected]>

Author: abouteiller

ompi/mpi/c/init_thread.c.in

@@ -39,22 +39,29 @@
 PROTOTYPE ERROR_CLASS init_thread(INT_OUT argc, ARGV argv, INT required,
                                   INT_OUT provided)
 {
-    int err, safe_required = MPI_THREAD_SERIALIZED;
+    int err, err_arg_required = false, safe_required = MPI_THREAD_SERIALIZED;
     char *env;
 
     ompi_hook_base_mpi_init_thread_top(argc, argv, required, provided);
 
     /* Detect an incorrect thread support level, but dont report until we have the minimum
      * infrastructure setup.
      */
-    if( (MPI_THREAD_SINGLE == required) || (MPI_THREAD_SERIALIZED == required) ||
-        (MPI_THREAD_FUNNELED == required) || (MPI_THREAD_MULTIPLE == required) ) {
+    err_arg_required = (required < MPI_THREAD_SINGLE || required > MPI_THREAD_MULTIPLE);
+    if (!err_arg_required) {
+        safe_required = required;
+    }
 
-        if (NULL != (env = getenv("OMPI_MPI_THREAD_LEVEL")))  {
-            safe_required = atoi(env);
-        }
-        else {
-            safe_required = required;
+    /* check for environment overrides for required thread level.  If
+     * there is, check to see that it is a valid/supported thread level.
+     *  if it is lower than argument required, set it anyway, program can
+     * check provided == required to verify that required has been ignored
+     */
+    if (NULL != (env = getenv("OMPI_MPI_THREAD_LEVEL"))) {
+        int env_required = atoi(env);
+        err_arg_required = err_arg_required || (env_required < MPI_THREAD_SINGLE || env_required > MPI_THREAD_MULTIPLE);
+        if (!err_arg_required) {
+            safe_required = env_required;
         }
     }
 
@@ -70,7 +77,7 @@ PROTOTYPE ERROR_CLASS init_thread(INT_OUT argc, ARGV argv, INT required,
         err = ompi_mpi_init(0, NULL, safe_required, provided, false);
     }
 
-    if( safe_required != required ) {
+    if (err_arg_required) {
         /* Trigger the error handler for the incorrect argument. Keep it separate from the
          * check on the ompi_mpi_init return and report a nice, meaningful error message to
          * the user. */