Merge pull request #4008 from open-mpi/revert-3960-topic/treematch

Revert "Topic/treematch"

Author: bwbarrett

ompi/mca/topo/treematch/Makefile.am

@@ -13,25 +13,20 @@
 
 if topo_treematch_local
 extra_treematch_files = treematch/tm_bucket.h \
-    treematch/tm_mapping.h \
+    treematch/tm_hwloc.h treematch/tm_mapping.h \
     treematch/tm_timings.h treematch/tm_tree.h \
     treematch/tm_kpartitioning.h treematch/uthash.h\
     treematch/IntConstantInitializedVector.h \
-    treematch/tm_mt.h treematch/fibo.h \
+    treematch/tm_mt.h \
     treematch/tm_thread_pool.h treematch/tm_verbose.h \
-    treematch/tm_malloc.h treematch/k-partitioning.h\
-    treematch/tm_solution.h treematch/tm_topology.h\
-    treematch/PriorityQueue.h \
+    treematch/tm_malloc.h \
     treematch/IntConstantInitializedVector.c \
-    treematch/tm_mt.c treematch/fibo.c \
+    treematch/tm_mt.c \
     treematch/tm_thread_pool.c treematch/tm_verbose.c \
-    treematch/tm_malloc.c treematch/treematch.h \
+    treematch/tm_malloc.c \
     treematch/tm_mapping.c treematch/tm_timings.c \
     treematch/tm_bucket.c treematch/tm_tree.c \
-    treematch/tm_topology.c treematch/tm_kpartitioning.c \
-    treematch/tm_solution.c  treematch/k-partitioning.c \
-    treematch/PriorityQueue.c
-EXTRA_DIST =  treematch/COPYING treematch/LICENSE
+    treematch/tm_hwloc.c treematch/tm_kpartitioning.c
 endif
 
 sources = \

ompi/mca/topo/treematch/topo_treematch_component.c

@@ -62,12 +62,6 @@ mca_topo_treematch_component_2_2_0_t mca_topo_treematch_component =
 
 static int init_query(bool enable_progress_threads, bool enable_mpi_threads)
 {
-    if (OPAL_SUCCESS != opal_hwloc_base_get_topology()) {
-        return OPAL_ERR_NOT_SUPPORTED;
-    }
-    if(NULL == opal_hwloc_topology) {
-        return OPAL_ERR_NOT_SUPPORTED;
-    }
     return OMPI_SUCCESS;
 }
 
@@ -101,4 +95,3 @@ static int mca_topo_treematch_component_register(void)
                                           MCA_BASE_VAR_SCOPE_READONLY, &mca_topo_treematch_component.reorder_mode);
     return OMPI_SUCCESS;
 }
-

ompi/mca/topo/treematch/topo_treematch_dist_graph_create.c

@@ -2,12 +2,13 @@
 #include <stdio.h>
 #include "IntConstantInitializedVector.h"
 
+
 int intCIV_isInitialized(int_CIVector * v, int i)
 {
   if(v->top == 0)
     return 0;
   if(v->from[i] >= 0)
-    if(v->from[i] < v->top && v->to[v->from[i]] == i) 
+    if(v->from[i] < v->top && v->to[v->from[i]] == i)
     return 1;
   return 0;
 }
@@ -44,7 +45,7 @@ int intCIV_set(int_CIVector * v, int i, int val)
       v->top++;
     }
   v->vec[i] = val;
-  return 0;  
+  return 0;
 }
 
 int intCIV_get(int_CIVector * v, int i)

ompi/mca/topo/treematch/treematch/IntConstantInitializedVector.c

@@ -12,4 +12,5 @@ void intCIV_exit(int_CIVector * v);
 int intCIV_set(int_CIVector * v, int i, int val);
 int intCIV_get(int_CIVector * v, int i);
 
+
 #endif /*INTEGER_CONSTANT_INITIALIZED_VECTOR*/