Commit e8cb9317 authored by Francois Tessier's avatar Francois Tessier

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

parent f4175724
...@@ -12,7 +12,7 @@ libtapioca.a:$(OBJ_FILES) ...@@ -12,7 +12,7 @@ libtapioca.a:$(OBJ_FILES)
$(MPICXX) $(MPI_CFLAGS) -c $? -o $@ $(MPI_LDFLAGS) $(MPICXX) $(MPI_CFLAGS) -c $? -o $@ $(MPI_LDFLAGS)
install: 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 cp libtapioca.a $(INSTALL_PATH)/lib
clean: clean:
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <algorithm> #include <algorithm>
#include "topology.hpp" #include "../topology.hpp"
#include <spi/include/kernel/location.h> #include <spi/include/kernel/location.h>
#include <spi/include/kernel/process.h> #include <spi/include/kernel/process.h>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include "topology.hpp" #include "../topology.hpp"
#include <pmi.h> #include <pmi.h>
......
#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
MPICXX = mpixlcxx MPICXX = mpixlcxx
MPI_CFLAGS = -g -O3 -I./architectures/ MPI_CFLAGS = -g -O3 -I./architectures/$(ARCHI)
MPI_CFLAGS += -DBGQ -DDEBUG #-DTIMING MPI_CFLAGS += -DDEBUG #-DTIMING
#MPI_CFLAGS += -I/bgsys/drivers/ppcfloor -I/bgsys/drivers/ppcfloor/spi/include/kernel/cnk
INSTALL_PATH = $(HOME)/install/$(ARCHI) TP_INCLUDE = architectures/$(ARCHI)/*
INSTALL_PATH = $(HOME)/install/$(ARCHI)
MPICXX = CC 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_CFLAGS += -DXC40 -DDEBUG #-DTIMING
MPI_LDFLAGS = -llustreapi -Wl,--whole-archive,-ldmapp,--no-whole-archive MPI_LDFLAGS = -llustreapi -Wl,--whole-archive,-ldmapp,--no-whole-archive
TP_INCLUDE = architectures/$(ARCHI)/* architectures/$(ARCHI)/include/*
INSTALL_PATH = $(HOME)/install/$(ARCHI) INSTALL_PATH = $(HOME)/install/$(ARCHI)
...@@ -18,11 +18,7 @@ ...@@ -18,11 +18,7 @@
#include <map> #include <map>
#include "mpi.h" #include "mpi.h"
#ifdef BGQ #include "tp_network.hpp"
#include "bgq_mira.hpp"
#elif XC40
#include "cray_xc40_theta.hpp"
#endif
enum MAPPING_STRATEGY enum MAPPING_STRATEGY
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment