coll/tuned: use basic algo for reduce_scatter_block by default

Signed-off-by: Gilles Gouaillardet <[email protected]>

Author: ggouaillardet

ompi/mca/coll/tuned/coll_tuned_decision_fixed.c

@@ -13,7 +13,7 @@
  * Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
  * Copyright (c) 2013      Los Alamos National Security, LLC. All rights
  *                         reserved.
- * Copyright (c) 2015      Research Organization for Information Science
+ * Copyright (c) 2015-2018 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
@@ -516,8 +516,8 @@ int ompi_coll_tuned_reduce_scatter_block_intra_dec_fixed(const void *sbuf, void
                                                          mca_coll_base_module_t *module)
 {
     OPAL_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_reduce_scatter_block_intra_dec_fixed"));
-    return ompi_coll_base_reduce_scatter_block_intra_recursivedoubling(sbuf, rbuf, rcount,
-                                                                       dtype, op, comm, module);
+    return ompi_coll_base_reduce_scatter_block_basic(sbuf, rbuf, rcount,
+                                                     dtype, op, comm, module);
 }
 
 /*

ompi/mca/coll/tuned/coll_tuned_reduce_scatter_block_decision.c

@@ -2,6 +2,8 @@
 /*
  * Copyright (c) 2018      Siberian State University of Telecommunications
  *                         and Information Sciences. All rights reserved.
+ * Copyright (c) 2018      Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -31,7 +33,8 @@ static int coll_tuned_reduce_scatter_block_tree_fanout;
 /* valid values for coll_tuned_reduce_scatter_blokc_forced_algorithm */
 static mca_base_var_enum_value_t reduce_scatter_block_algorithms[] = {
     {0, "ignore"},
-    {1, "recursive_doubling"},
+    {1, "basic"},
+    {2, "recursive_doubling"},
     {0, NULL}
 };
 
@@ -118,7 +121,9 @@ int ompi_coll_tuned_reduce_scatter_block_intra_do_this(const void *sbuf, void *r
     switch (algorithm) {
     case (0): return ompi_coll_tuned_reduce_scatter_block_intra_dec_fixed(sbuf, rbuf, rcount,
                                                                           dtype, op, comm, module);
-    case (1): return ompi_coll_base_reduce_scatter_block_intra_recursivedoubling(sbuf, rbuf, rcount,
+    case (1): return ompi_coll_base_reduce_scatter_block_basic(sbuf, rbuf, rcount,
+                                                               dtype, op, comm, module);
+    case (2): return ompi_coll_base_reduce_scatter_block_intra_recursivedoubling(sbuf, rbuf, rcount,
                                                                                  dtype, op, comm, module);
     } /* switch */
     OPAL_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:reduce_scatter_block_intra_do_this attempt to select algorithm %d when only 0-%d is valid?",