Remove most (all) warnings from the new TreeMatch.

Signed-off-by: George Bosilca <[email protected]>

Author: bosilca

ompi/mca/topo/treematch/treematch/PriorityQueue.c

@@ -8,7 +8,7 @@ int compfunc(const FiboNode * const, const FiboNode * const);
 
 
 
-int compFunc(const FiboNode * const node1, const FiboNode * const node2)
+static int compFunc(const FiboNode * const node1, const FiboNode * const node2)
 {
   return 
     ( ( ((QueueElement*)(node1))->key > ((QueueElement*)(node2))->key ) ? -1 : 1); 

ompi/mca/topo/treematch/treematch/tm_bucket.c

@@ -525,7 +525,7 @@ void partial_update_val (int nb_args, void **args, int thread_id){
 
   if(nb_args != 5){
     if(verbose_level >= ERROR)
-      fprintf(stderr,"(Thread: %d) Wrong number of args in %s: %d\n",thread_id, __FUNCTION__, nb_args);
+      fprintf(stderr,"(Thread: %d) Wrong number of args in %s: %d\n",thread_id, __func__, nb_args);
     exit(-1);
   }
 

ompi/mca/topo/treematch/treematch/tm_kpartitioning.c

@@ -6,9 +6,9 @@
 #include <stdio.h>
 #include "config.h"
 
-#if HAVE_LIBSCOTCH
+#if defined(HAVE_LIBSCOTCH)
 #include <scotch.h>
-#endif
+#endif  /* defined(HAVE_LIBSCOTCH) */
 
 
 #define USE_KL_KPART 0
@@ -49,7 +49,7 @@ int tm_get_greedy_flag(){
 }
 
 
-#if HAVE_LIBSCOTCH
+#if defined(HAVE_LIBSCOTCH)
 
 SCOTCH_Graph* com_mat_to_scotch_graph(com_mat_t *com_mat, int n){
   double **mat = com_mat->comm;
@@ -284,7 +284,7 @@ int  *kpartition_scotch(int k, com_mat_t *com_mat, int n, int *constraints, int
   return partition;
 }
 
-#endif /* HAVE_LIBSCOTCH */
+#endif /* defined(HAVE_LIBSCOTCH) */
 
 
 void allocate_vertex(int u, int *res, com_mat_t *com_mat, int n, int *size, int max_size)
@@ -475,7 +475,7 @@ int *kpartition(int k, com_mat_t *com_mat, int n, int *constraints, int nb_const
   /* else */
 
 
-#if HAVE_LIBSCOTCH
+#if defined(HAVE_LIBSCOTCH)
   if(!greedy_flag){
     if(verbose_level >= DEBUG)
       printf("Using Scotch\n");
@@ -485,11 +485,11 @@ int *kpartition(int k, com_mat_t *com_mat, int n, int *constraints, int nb_const
       printf("Using greedy partitionning\n");
     res = kpartition_greedy(k, com_mat, n, constraints, nb_constraints);
   }
-#else
+#else  /* defined(HAVE_LIBSCOTCH) */
   if(verbose_level >= DEBUG)
     printf("Using greedy partitionning\n");
   res = kpartition_greedy(k, com_mat, n, constraints, nb_constraints);
-#endif
+#endif  /* defined(HAVE_LIBSCOTCH) */
   return res;
 }
 
@@ -684,8 +684,8 @@ void free_const_tab(constraint_t *const_tab, int k)
   FREE(const_tab);
 }
 
-
-void check_com_mat(com_mat_t *com_mat){
+#if 0
+static void check_com_mat(com_mat_t *com_mat){
   int i,j;
 
   for( i = 0 ; i < com_mat->n ; i++ )
@@ -694,16 +694,15 @@ void check_com_mat(com_mat_t *com_mat){
 	printf("com_mat->comm[%d][%d]= %f\n",i,j,com_mat->comm[i][j]);
 	exit(-1);
       }
-
-
 }
+#endif
 
-void print_tab(int n){
+static void print_tab(int n){
   for(;n;n--)
     fprintf(stdout,"\t");
 }
 
-void display_partition(int *partition, int *local_vertices, int n, int depth, int k){
+static void display_partition(int *partition, int *local_vertices, int n, int depth, int k){
   int cur_part, j;
   print_tab(depth);fprintf(stdout,"Partitions at depth=%d\n",depth);
   for( cur_part = 0; cur_part < k ; cur_part ++){

ompi/mca/topo/treematch/treematch/tm_malloc.c

@@ -36,7 +36,7 @@ static void init_extra_data(void);
 
 
 
-char *my_strdup(char* string){
+static char *my_strdup(char* string){
   int size = 1+strlen(string);
   char *res = (char*)malloc(size*sizeof(char));
 

ompi/mca/topo/treematch/treematch/tm_mapping.c

@@ -22,9 +22,9 @@
 #include <winbase.h>
 #endif
 
-#if HAVE_LIBSCOTCH
+#if defined(HAVE_LIBSCOTCH)
 #include <scotch.h>
-#endif
+#endif  /* defined(HAVE_LIBSCOTCH) */
 
 #include <sys/mman.h>
 
@@ -58,7 +58,6 @@ int nb_leaves(tm_tree_t *comm_tree);
 int nb_lines(char *filename);
 void print_1D_tab(int *tab,int N);
 tm_solution_t * tm_compute_mapping(tm_topology_t *topology,tm_tree_t *comm_tree);
-void tm_finalize();
 void tm_free_affinity_mat(tm_affinity_mat_t *aff_mat);
 tm_affinity_mat_t *tm_load_aff_mat(char *filename);
 void update_comm_speed(double **comm_speed,int old_size,int new_size);
@@ -172,14 +171,14 @@ long int  init_mat(char *filename,int N, double **mat, double *sum_row){
 }
 
 
-size_t get_filesize(char* filename) {
+static size_t get_filesize(char* filename) {
     struct stat st;
     stat(filename, &st);
     return st.st_size;
 }
 
 
-char *parse_line(int i, double **mat, double *sum_row, int N, char *data, char *filename, long int *nnz){
+static char *parse_line(int i, double **mat, double *sum_row, int N, char *data, char *filename, long int *nnz){
   /* now parse the buffer byte per byte for the current line i until we reach '\n'*/
   unsigned int vl = tm_get_verbose_level();
   long val;
@@ -215,7 +214,7 @@ char *parse_line(int i, double **mat, double *sum_row, int N, char *data, char *
 
 
 /* buffered read with mmap of teh file */
-long int init_mat_mmap(char *filename,int N, double **mat, double *sum_row){
+static long int init_mat_mmap(char *filename,int N, double **mat, double *sum_row){
   int i;
   unsigned int vl = tm_get_verbose_level();
   size_t filesize = get_filesize(filename);
@@ -251,7 +250,7 @@ long int init_mat_mmap(char *filename,int N, double **mat, double *sum_row){
 
 
 
-long int init_mat_long(char *filename,int N, double **mat, double *sum_row){
+static long int init_mat_long(char *filename,int N, double **mat, double *sum_row){
   int i;
   unsigned int vl = tm_get_verbose_level();
   char line[LINE_SIZE];
@@ -425,7 +424,7 @@ int nb_leaves(tm_tree_t *comm_tree)
 }
 
 /* find the first '-1 in the array of size n and put the value there*/
-void set_val(int *tab, int val, int n){
+static void set_val(int *tab, int val, int n){
   int i = 0;
 
   while (i < n ){

ompi/mca/topo/treematch/treematch/tm_mapping.h

@@ -19,7 +19,6 @@ int nb_lines(char *filename);
 int nb_processing_units(tm_topology_t *topology);
 void print_1D_tab(int *tab,int N);
 tm_solution_t * tm_compute_mapping(tm_topology_t *topology,tm_tree_t *comm_tree);
-void tm_finalize();
 void tm_free_affinity_mat(tm_affinity_mat_t *aff_mat);
 tm_affinity_mat_t *tm_load_aff_mat(char *filename);
 void update_comm_speed(double **comm_speed,int old_size,int new_size);

ompi/mca/topo/treematch/treematch/tm_solution.c

@@ -106,7 +106,7 @@ double display_sol_sum_com(tm_topology_t *topology, tm_affinity_mat_t *aff_mat,
       a = cost[depth-distance(topology,sigma[i],sigma[j])];
       if(tm_get_verbose_level() >= DEBUG)
 	printf("T_%d_%d %f*%f=%f\n",i,j,c,a,c*a);
-	sol += c*a;
+      sol += c*a;
     }
 
   for (i = 0; i < N; i++) {
@@ -120,7 +120,7 @@ double display_sol_sum_com(tm_topology_t *topology, tm_affinity_mat_t *aff_mat,
 }
 
 
-double display_sol_max_com(tm_topology_t *topology, tm_affinity_mat_t *aff_mat, int *sigma)
+static double display_sol_max_com(tm_topology_t *topology, tm_affinity_mat_t *aff_mat, int *sigma)
 {
   double a,c,sol;
   int i,j;
@@ -156,7 +156,7 @@ double display_sol_max_com(tm_topology_t *topology, tm_affinity_mat_t *aff_mat,
   return sol;
 }
 
-double display_sol_hop_byte(tm_topology_t *topology, tm_affinity_mat_t *aff_mat, int *sigma)
+static double display_sol_hop_byte(tm_topology_t *topology, tm_affinity_mat_t *aff_mat, int *sigma)
 {
   double c,sol;
   int nb_hops;
@@ -171,7 +171,7 @@ double display_sol_hop_byte(tm_topology_t *topology, tm_affinity_mat_t *aff_mat,
       nb_hops = 2*distance(topology,sigma[i],sigma[j]);
       if(tm_get_verbose_level() >= DEBUG)
 	printf("T_%d_%d %f*%d=%f\n",i,j,c,nb_hops,c*nb_hops);
-	sol += c*nb_hops;
+      sol += c*nb_hops;
     }
 
   for (i = 0; i < N; i++) {
@@ -278,7 +278,7 @@ int in_tab(int *tab, int n, int val){
     if(tab[i] == val)
       return 1;
 
-    return 0;
+  return 0;
 }
 
 void map_Packed(tm_topology_t *topology, int N, int *sigma)

ompi/mca/topo/treematch/treematch/tm_topology.c

@@ -28,7 +28,6 @@ double ** topology_to_arch(hwloc_topology_t topology);
 void   build_synthetic_proc_id(tm_topology_t *topology);
 tm_topology_t  *tm_build_synthetic_topology(int *arity, double *cost, int nb_levels, int *core_numbering, int nb_core_per_nodes);
 void            tm_set_numbering(tm_numbering_t new_val); /* TM_NUMBERING_LOGICAL or TM_NUMBERING_PHYSICAL */
-tm_numbering_t  tm_get_numbering(); /* TM_NUMBERING_LOGICAL or TM_NUMBERING_PHYSICAL */
 
 
 #define LINE_SIZE (1000000)
@@ -135,8 +134,7 @@ int topo_nb_proc(hwloc_topology_t topology,int N)
 }
 
 
-
-double link_cost(int depth)
+static double link_cost(int depth)
 {
   /*
     Bertha values
@@ -154,7 +152,6 @@ double link_cost(int depth)
   */
 }
 
-
 double ** topology_to_arch(hwloc_topology_t topology)
 {
   int nb_proc,i,j;
@@ -198,7 +195,7 @@ int symetric(hwloc_topology_t topology)
    return 1;
 }
 
-void build_process_tab_id(tm_topology_t *topology,  hwloc_obj_t *objs, char* filename){
+static void build_process_tab_id(tm_topology_t *topology,  hwloc_obj_t *objs, char* filename){
   unsigned int i,j;
   unsigned int nb_nodes = topology->nb_proc_units; 
   int vl = tm_get_verbose_level();
@@ -482,7 +479,7 @@ int int_cmp_inc(const void* x1,const void* x2)
 }
 
 
-int topo_check_constraints(tm_topology_t *topology){
+static int topo_check_constraints(tm_topology_t *topology){
   int n = topology->nb_constraints;
   int i;
   int depth = topology->nb_levels-1;
@@ -502,7 +499,7 @@ int topo_check_constraints(tm_topology_t *topology){
 
 /* cpy flag tells if we need to copy the array.
    Set to 1 when called from the application level and 0 when called from inside the library*/
-int tm_topology_set_binding_constraints_cpy(int *constraints, int nb_constraints, tm_topology_t *topology, int cpy_flag){
+static int tm_topology_set_binding_constraints_cpy(int *constraints, int nb_constraints, tm_topology_t *topology, int cpy_flag){
 
   topology -> nb_constraints = nb_constraints;
   if(cpy_flag){