Revert "test moving mpi3 comm_world init"

This reverts commit 712f0e4.

Author: hppritcha

ompi/instance/instance.c

@@ -701,10 +701,6 @@ static int ompi_mpi_instance_init_common (int argc, char **argv)
         return ompi_instance_print_error ("ompi_mpi_init: ompi_comm_cid_init failed", ret);
     }
 
-    if (OMPI_SUCCESS != (ret = ompi_comm_init_mpi3 ())) {
-        return ompi_instance_print_error ("ompi_comm_init_mpi3 () failed", ret);
-    }
-
     /* Next timing measurement */
     OPAL_TIMING_ENV_NEXT(init_common, "modex-barrier");
 

ompi/runtime/ompi_mpi_init.c

@@ -353,6 +353,12 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided,
 
     ompi_hook_base_mpi_init_top_post_opal(argc, argv, requested, provided);
 
+    /* initialize communicator subsystem */
+    if (OMPI_SUCCESS != (ret = ompi_comm_init_mpi3 ())) {
+        error = "ompi_mpi_init: ompi_comm_init_mpi3 failed";
+        goto error;
+    }
+
     /* Bozo argument check */
     if (NULL == argv && argc > 1) {
         ret = OMPI_ERR_BAD_PARAM;