oops

diff --git a/src/smpi/colls/smpi_mvapich2_selector.c b/src/smpi/colls/smpi_mvapich2_selector.c
index 97a876b..f4c2ea7 100644 (file)
--- a/src/smpi/colls/smpi_mvapich2_selector.c
+++ b/src/smpi/colls/smpi_mvapich2_selector.c
@@ -1016,8 +1016,8 @@ xbt_free(mv2_size_alltoall_tuning_table);
 xbt_free(mv2_alltoall_table_ppn_conf);
 
 xbt_free(mv2_gather_thresholds_table);
-  if(mv2_allgather_thresholds_table)
-xbt_free(mv2_allgather_thresholds_table[0]);
+if(mv2_allgather_thresholds_table)
+  xbt_free(mv2_allgather_thresholds_table[0]);
 xbt_free(mv2_size_allgather_tuning_table);
 xbt_free(mv2_allgather_table_ppn_conf);
 xbt_free(mv2_allgather_thresholds_table);

diff --git a/src/smpi/colls/smpi_mvapich2_selector_stampede.h b/src/smpi/colls/smpi_mvapich2_selector_stampede.h
index 28baf73..6c5601e 100644 (file)
--- a/src/smpi/colls/smpi_mvapich2_selector_stampede.h
+++ b/src/smpi/colls/smpi_mvapich2_selector_stampede.h
@@ -340,6 +340,9 @@ static int MPIR_Allgather_RD_Allgather_Comm_MV2( void *sendbuf,
 static void init_mv2_allgather_tables_stampede(){
   int i;
   int agg_table_sum = 0;
+
+  if(smpi_coll_cleanup_callback==NULL)
+    smpi_coll_cleanup_callback=&smpi_coll_cleanup_mvapich2;
   mv2_allgather_tuning_table **table_ptrs = NULL;
   mv2_allgather_num_ppn_conf = 3;
   mv2_allgather_thresholds_table