Remove pre-processing. Topology-awareness based on dir hierarchy

Makefile

@@ -12,7 +12,7 @@ libtapioca.a:$(OBJ_FILES)
 	$(MPICXX) $(MPI_CFLAGS) -c $? -o $@ $(MPI_LDFLAGS)
 
 install:
-	cp -r tapioca.hpp architectures/*.hpp architectures/include/* $(INSTALL_PATH)/include
+	cp -r tapioca.hpp $(TP_INCLUDE) $(INSTALL_PATH)/include
 	cp libtapioca.a $(INSTALL_PATH)/lib
 
 clean:

architectures/bgq_mira.hpp → architectures/linux-rhel_6-ppc64/tp_network.hpp

@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <algorithm>
-#include "topology.hpp"
+#include "../topology.hpp"
 
 #include <spi/include/kernel/location.h>
 #include <spi/include/kernel/process.h>

architectures/cray_xc40_theta.hpp → architectures/linux-sles_12-x86_64/tp_network.hpp

@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "topology.hpp"
+#include "../topology.hpp"
 
 #include <pmi.h>
 

architectures/sample.hpp

-#ifndef SAMPLE_H
-#define SAMPLE_H
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "topology.h"
-
-class Topology: public iTopology {
-public:
-  int NetworkDimensions () {
-    return 0;
-  }
-
-  int RankToCoordinates ( int rank, int* coord ) {
-    return 0;
-  }
-
-  int IONodeId () {
-    return 0;
-  }
-  int BridgeNodeId () {
-    return 0;
-  }
-
-  int DistanceToIONode () {
-    return 0;
-  }
-  
-  int DistanceToRank ( int destRank ) {
-    return 0;
-  }
-
-  int ProcessPerNode () {
-    return 0;
-  }
-};
-
-#endif // SAMPLE_H

make.inc/Makefile.linux-rhel_6-ppc64

 MPICXX = mpixlcxx
 
-MPI_CFLAGS   = -g -O3 -I./architectures/
-MPI_CFLAGS  += -DBGQ -DDEBUG #-DTIMING                                                                                                                                              
-#MPI_CFLAGS  += -I/bgsys/drivers/ppcfloor -I/bgsys/drivers/ppcfloor/spi/include/kernel/cnk
+MPI_CFLAGS   = -g -O3 -I./architectures/$(ARCHI)
+MPI_CFLAGS  += -DDEBUG #-DTIMING
 
-INSTALL_PATH  = $(HOME)/install/$(ARCHI)
+TP_INCLUDE   = architectures/$(ARCHI)/* 
+
+INSTALL_PATH = $(HOME)/install/$(ARCHI)

make.inc/Makefile.linux-sles_12-x86_64

 MPICXX = CC
 
-MPI_CFLAGS   = -g -I./architectures/ -I./architectures/include/
+MPI_CFLAGS   = -g -I./architectures/$(ARCHI) -I./architectures/$(ARCHI)/include/
 MPI_CFLAGS  += -DXC40 -DDEBUG #-DTIMING
 
 MPI_LDFLAGS = -llustreapi -Wl,--whole-archive,-ldmapp,--no-whole-archive
 
+TP_INCLUDE   = architectures/$(ARCHI)/* architectures/$(ARCHI)/include/*
+
 INSTALL_PATH  = $(HOME)/install/$(ARCHI)

tapioca.hpp

@@ -18,11 +18,7 @@
 #include <map>
 #include "mpi.h"
 
-#ifdef BGQ
-#include "bgq_mira.hpp"
-#elif XC40
-#include "cray_xc40_theta.hpp"
-#endif
+#include "tp_network.hpp"
 
 enum MAPPING_STRATEGY
   {