Merge pull request #3959 from edgargabriel/topic/performance-fixes

Topic/performance fixes

ompi/mca/common/ompio/common_ompio_file_open.c

@@ -129,11 +129,6 @@ int mca_common_ompio_file_open (ompi_communicator_t *comm,
         goto fn_fail;
     }
 
-    if (OMPI_SUCCESS != (ret = mca_fcoll_base_file_select (ompio_fh,
-                                                           NULL))) {
-        opal_output(1, "mca_fcoll_base_file_select() failed\n");
-        goto fn_fail;
-    }
 
     ompio_fh->f_sharedfp_component = NULL; /*component*/
     ompio_fh->f_sharedfp           = NULL; /*module*/
@@ -165,6 +160,12 @@ int mca_common_ompio_file_open (ompi_communicator_t *comm,
         goto fn_fail;
     }
 
+    if (OMPI_SUCCESS != (ret = mca_fcoll_base_file_select (ompio_fh,
+                                                           NULL))) {
+        opal_output(1, "mca_fcoll_base_file_select() failed\n");
+        goto fn_fail;
+    }
+
 
     if ( true == use_sharedfp ) {
 	/* open the file once more for the shared file pointer if required.           
@@ -420,7 +421,7 @@ int mca_common_ompio_set_file_defaults (mca_io_ompio_file_t *fh)
 
         /* Default file View */
         fh->f_iov_type = MPI_DATATYPE_NULL;
-        fh->f_stripe_size = mca_io_ompio_bytes_per_agg;
+        fh->f_stripe_size = 0;
 	/*Decoded iovec of the file-view*/
 	fh->f_decoded_iov = NULL;
         fh->f_etype = NULL;

ompi/mca/fcoll/base/fcoll_base_file_select.c

@@ -9,7 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2008-2016 University of Houston. All rights reserved.
+ * Copyright (c) 2008-2017 University of Houston. All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -279,7 +279,8 @@ int mca_fcoll_base_query_table (struct mca_io_ompio_file_t *file, char *name)
     }
     if (!strcmp (name, "two_phase")) {
         if ((int)file->f_cc_size < file->f_bytes_per_agg &&
-            file->f_cc_size < file->f_stripe_size) {
+            (0 == file->f_stripe_size || file->f_cc_size < file->f_stripe_size) && 
+	    (LUSTRE != file->f_fstype) ) {
             return 1;
         }
     }

ompi/mca/fcoll/dynamic/fcoll_dynamic_module.c

@@ -61,8 +61,8 @@ mca_fcoll_dynamic_component_file_query (mca_io_ompio_file_t *fh, int *priority)
     }
 
     if (mca_fcoll_base_query_table (fh, "dynamic")) {
-        if (*priority < 50) {
-            *priority = 50;
+        if (*priority < 30) {
+            *priority = 30;
         }
     }
 

ompi/mca/fcoll/individual/fcoll_individual_module.c

@@ -61,8 +61,8 @@ mca_fcoll_individual_component_file_query (mca_io_ompio_file_t *fh, int *priorit
     }
 
     if (mca_fcoll_base_query_table (fh, "individual")) {
-        if (*priority < 50) {
-            *priority = 50;
+        if (*priority < 30) {
+            *priority = 30;
         }
 	if ( 2 >= fh->f_size ) {
 	    *priority = 100;

ompi/mca/fcoll/static/fcoll_static_module.c

@@ -61,8 +61,8 @@ mca_fcoll_static_component_file_query (mca_io_ompio_file_t *fh, int *priority)
     }
 
     if (mca_fcoll_base_query_table (fh, "static")) {
-        if (*priority < 50) {
-            *priority = 50;
+        if (*priority < 30) {
+            *priority = 30;
         }
     }
 

ompi/mca/io/ompio/io_ompio_aggregators.c

@@ -63,7 +63,7 @@ int mca_io_ompio_simple_grouping(mca_io_ompio_file_t *fh,
     int k=0, p=0, g=0;
     int total_procs = 0; 
 
-    if ( 0 < fh->f_stripe_size ) {
+    if ( 0 >= fh->f_stripe_size ) {
         stripe_size = OMPIO_DEFAULT_STRIPE_SIZE;
     }