move the code that sets the thread level information before the btl are

initialized, so that the btl's have this information for correct setup.

This commit was SVN r14258.

ompi/runtime/ompi_mpi_init.c

@@ -572,28 +572,6 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided)
         gettimeofday(&ompistart, NULL);
     }
 
-    /* start PTL's */
-    ret = MCA_PML_CALL(enable(true));
-    if( OMPI_SUCCESS != ret ) {
-        error = "PML control failed";
-        goto error;
-    }
-
-    /* add all ompi_proc_t's to PML */
-    if (NULL == (procs = ompi_proc_world(&nprocs))) {
-        error = "ompi_proc_world() failed";
-        goto error;
-    }
-    ret = MCA_PML_CALL(add_procs(procs, nprocs));
-    free(procs);
-    if( OMPI_SUCCESS != ret ) {
-        error = "PML add procs failed";
-        goto error;
-    }
-
-    MCA_PML_CALL(add_comm(&ompi_mpi_comm_world));
-    MCA_PML_CALL(add_comm(&ompi_mpi_comm_self));
-
     /* Figure out the final MPI thread levels.  If we were not
        compiled for support for MPI threads, then don't allow
        MPI_THREAD_MULTIPLE. */
@@ -621,6 +599,28 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided)
         opal_set_using_threads(true);
     }
 
+    /* start PTL's */
+    ret = MCA_PML_CALL(enable(true));
+    if( OMPI_SUCCESS != ret ) {
+        error = "PML control failed";
+        goto error;
+    }
+
+    /* add all ompi_proc_t's to PML */
+    if (NULL == (procs = ompi_proc_world(&nprocs))) {
+        error = "ompi_proc_world() failed";
+        goto error;
+    }
+    ret = MCA_PML_CALL(add_procs(procs, nprocs));
+    free(procs);
+    if( OMPI_SUCCESS != ret ) {
+        error = "PML add procs failed";
+        goto error;
+    }
+
+    MCA_PML_CALL(add_comm(&ompi_mpi_comm_world));
+    MCA_PML_CALL(add_comm(&ompi_mpi_comm_self));
+
     /* Init coll for the comms */
 
     if (OMPI_SUCCESS !=