From 93a303ba89359384dd8dec01172314a0f2b9ac16 Mon Sep 17 00:00:00 2001
From: Edgar Gabriel <gabriel@cs.uh.edu>
Date: Thu, 30 Jul 2015 17:30:07 -0500
Subject: [PATCH] Performance tuning: make sure the individual component is
 selected for 1 and 2 process communicators (important for some benchmarks)

---
 ompi/mca/fcoll/base/fcoll_base_file_select.c        | 3 +++
 ompi/mca/fcoll/individual/fcoll_individual_module.c | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/ompi/mca/fcoll/base/fcoll_base_file_select.c b/ompi/mca/fcoll/base/fcoll_base_file_select.c
index 1788d29b51..0d8aa3ff00 100644
--- a/ompi/mca/fcoll/base/fcoll_base_file_select.c
+++ b/ompi/mca/fcoll/base/fcoll_base_file_select.c
@@ -262,6 +262,9 @@ int mca_fcoll_base_query_table (struct mca_io_ompio_file_t *file, char *name)
             file->f_cc_size >= file->f_stripe_size) {
             return 1;
         }
+	if ( 2 >= (int)file->f_size ){
+	    return 1;
+	}
     }
     if (!strcmp (name, "dynamic")) {
         if ((int)file->f_cc_size < file->f_bytes_per_agg &&
diff --git a/ompi/mca/fcoll/individual/fcoll_individual_module.c b/ompi/mca/fcoll/individual/fcoll_individual_module.c
index a85f8148ad..3f29a10a4e 100644
--- a/ompi/mca/fcoll/individual/fcoll_individual_module.c
+++ b/ompi/mca/fcoll/individual/fcoll_individual_module.c
@@ -64,6 +64,9 @@ mca_fcoll_individual_component_file_query (mca_io_ompio_file_t *fh, int *priorit
         if (*priority < 50) {
             *priority = 50;
         }
+	if ( 2 >= fh->f_size ) {
+	    *priority = 100;
+	}
     }
 
     return &individual;