coll/tuned: simplify arguments to dynamic file create/destroy

Previously we passed n_collectives which we hard-coded to COLLCOUNT.
Now we just include coll_base_functions.h and use COLLCOUNT directly.

Author: Luke Robison

ompi/mca/coll/tuned/coll_tuned_component.c

@@ -230,7 +230,7 @@ static int tuned_open(void)
             OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:component_open Reading collective rules file [%s]",
                          ompi_coll_tuned_dynamic_rules_filename));
             rc = ompi_coll_tuned_read_rules_config_file( ompi_coll_tuned_dynamic_rules_filename,
-                                                         &(mca_coll_tuned_component.all_base_rules), COLLCOUNT);
+                                                         &(mca_coll_tuned_component.all_base_rules));
             if( rc >= 0 ) {
                 OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:module_open Read %d valid rules\n", rc));
             } else {
@@ -257,7 +257,7 @@ static int tuned_close(void)
     OPAL_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:component_close: done!"));
 
     if( NULL != mca_coll_tuned_component.all_base_rules ) {
-        ompi_coll_tuned_free_all_rules(mca_coll_tuned_component.all_base_rules, COLLCOUNT);
+        ompi_coll_tuned_free_all_rules(mca_coll_tuned_component.all_base_rules);
         mca_coll_tuned_component.all_base_rules = NULL;
     }
 

ompi/mca/coll/tuned/coll_tuned_dynamic_file.c

@@ -27,6 +27,7 @@
 #include "mpi.h"
 #include "ompi/mca/mca.h"
 #include "coll_tuned.h"
+#include "ompi/mca/coll/base/coll_base_functions.h"
 
 /* need to include our own topo prototypes so we can malloc data on the comm correctly */
 #include "ompi/mca/coll/base/coll_base_topo.h"
@@ -67,7 +68,7 @@ static int fileline=0; /* used for verbose error messages */
  *
  */
 
-int ompi_coll_tuned_read_rules_config_file (char *fname, ompi_coll_alg_rule_t** rules, int n_collectives)
+int ompi_coll_tuned_read_rules_config_file (char *fname, ompi_coll_alg_rule_t** rules)
 {
     long NCOL = 0,      /* number of collectives for which rules are provided  */
          COLID = 0,     /* identifies the collective type to associate the rules with */
@@ -106,19 +107,14 @@ int ompi_coll_tuned_read_rules_config_file (char *fname, ompi_coll_alg_rule_t**
         return (-2);
     }
 
-    if (n_collectives<1) {
-        OPAL_OUTPUT((ompi_coll_tuned_stream,"Gave %d as max number of collectives in the rule table configuration file for tuned collectives!... ignoring!\n", n_collectives));
-        return (-3);
-    }
-
     fptr = fopen (fname, "r");
     if (!fptr) {
         OPAL_OUTPUT((ompi_coll_tuned_stream,"Cannot read rules file [%s]\n", fname));
         goto on_file_error;
     }
 
     /* make space and init the algorithm rules for each of the n_collectives MPI collectives */
-    alg_rules = ompi_coll_tuned_mk_alg_rules (n_collectives);
+    alg_rules = ompi_coll_tuned_mk_alg_rules(COLLCOUNT);
     if (NULL == alg_rules) {
         OPAL_OUTPUT((ompi_coll_tuned_stream,"Cannot allocate rules for file [%s]\n", fname));
         goto on_file_error;
@@ -134,8 +130,8 @@ int ompi_coll_tuned_read_rules_config_file (char *fname, ompi_coll_alg_rule_t**
         OPAL_OUTPUT((ompi_coll_tuned_stream,"Could not read number of collectives in configuration file around line %d\n", fileline));
         goto on_file_error;
     }
-    if (NCOL>n_collectives) {
-        OPAL_OUTPUT((ompi_coll_tuned_stream,"Number of collectives in configuration file %ld is greater than number of MPI collectives possible %d ??? error around line %d\n", NCOL, n_collectives, fileline));
+    if (NCOL>COLLCOUNT) {
+        OPAL_OUTPUT((ompi_coll_tuned_stream,"Number of collectives in configuration file %ld is greater than number of MPI collectives possible %d ??? error around line %d\n", NCOL, COLLCOUNT, fileline));
         goto on_file_error;
     }
 
@@ -146,8 +142,8 @@ int ompi_coll_tuned_read_rules_config_file (char *fname, ompi_coll_alg_rule_t**
             OPAL_OUTPUT((ompi_coll_tuned_stream,"Could not read next Collective id in configuration file around line %d\n", fileline));
             goto on_file_error;
         }
-        if (COLID>=n_collectives) {
-            OPAL_OUTPUT((ompi_coll_tuned_stream,"Collective id in configuration file %ld is greater than MPI collectives possible %d. Error around line %d\n", COLID, n_collectives, fileline));
+        if (COLID>=COLLCOUNT) {
+            OPAL_OUTPUT((ompi_coll_tuned_stream,"Collective id in configuration file %ld is greater than MPI collectives possible %d. Error around line %d\n", COLID, COLLCOUNT, fileline));
             goto on_file_error;
         }
 
@@ -296,7 +292,7 @@ int ompi_coll_tuned_read_rules_config_file (char *fname, ompi_coll_alg_rule_t**
     OPAL_OUTPUT((ompi_coll_tuned_stream,"Fix errors as listed above and try again.\n"));
 
     /* deallocate memory if allocated */
-    if (alg_rules) ompi_coll_tuned_free_all_rules (alg_rules, n_collectives);
+    if (alg_rules) ompi_coll_tuned_free_all_rules (alg_rules);
 
     /* close file */
     if (fptr) fclose (fptr);

ompi/mca/coll/tuned/coll_tuned_dynamic_file.h

@@ -27,7 +27,7 @@
 
 BEGIN_C_DECLS
 
-int ompi_coll_tuned_read_rules_config_file (char *fname, ompi_coll_alg_rule_t** rules, int n_collectives);
+int ompi_coll_tuned_read_rules_config_file (char *fname, ompi_coll_alg_rule_t** rules);
 
 
 END_C_DECLS

ompi/mca/coll/tuned/coll_tuned_dynamic_rules.c

@@ -256,12 +256,12 @@ int ompi_coll_tuned_free_coms_in_alg_rule (ompi_coll_alg_rule_t* alg_p)
 }
 
 
-int ompi_coll_tuned_free_all_rules (ompi_coll_alg_rule_t* alg_p, int n_algs)
+int ompi_coll_tuned_free_all_rules (ompi_coll_alg_rule_t* alg_p)
 {
     int i;
     int rc = 0;
 
-    for( i = 0; i < n_algs; i++ ) {
+    for( i = 0; i < COLLCOUNT; i++ ) {
         rc += ompi_coll_tuned_free_coms_in_alg_rule (&(alg_p[i]));
     }
 

ompi/mca/coll/tuned/coll_tuned_dynamic_rules.h

@@ -87,7 +87,7 @@ int ompi_coll_tuned_dump_all_rules (ompi_coll_alg_rule_t* alg_p, int n_rules);
 /* free alloced memory routines, used by file and tuned component/module */
 int ompi_coll_tuned_free_msg_rules_in_com_rule (ompi_coll_com_rule_t* com_p);
 int ompi_coll_tuned_free_coms_in_alg_rule (ompi_coll_alg_rule_t* alg_p);
-int ompi_coll_tuned_free_all_rules (ompi_coll_alg_rule_t* alg_p, int n_algs);
+int ompi_coll_tuned_free_all_rules (ompi_coll_alg_rule_t* alg_p);
 
 
 /* the IMPORTANT routines, i.e. the ones that do stuff for everyday communicators and collective calls */