Reorganize the implementation of architecture abstraction

f4175724 · Francois Tessier · b6c05379 · f4175724 · f4175724 · f4175724
Commit f4175724 authored Jul 06, 2017 by Francois Tessier
10 changed files
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ libtapioca.a:$(OBJ_FILES)
 	$(MPICXX) $(MPI_CFLAGS) -c $? -o $@ $(MPI_LDFLAGS)

 install:
-	cp -r tapioca.hpp topology/*.hpp topology/include/* $(INSTALL_PATH)/include
+	cp -r tapioca.hpp architectures/*.hpp architectures/include/* $(INSTALL_PATH)/include
 	cp libtapioca.a $(INSTALL_PATH)/lib

 clean:

--- a/topology/bgq_mira.hpp
+++ b/topology/bgq_mira.hpp
--- a/topology/cray_xc40_theta.hpp
+++ b/topology/cray_xc40_theta.hpp
--- a/topology/include/lustre/lustre_user.h
+++ b/topology/include/lustre/lustre_user.h
--- a/topology/include/lustre/lustre_user_cxx.patch
+++ b/topology/include/lustre/lustre_user_cxx.patch
--- a/topology/include/lustre/lustreapi.h
+++ b/topology/include/lustre/lustreapi.h
--- a/topology/sample.hpp
+++ b/topology/sample.hpp
--- a/topology/topology.hpp
+++ b/topology/topology.hpp
--- a/make.inc/Makefile.linux-rhel_6-ppc64
+++ b/make.inc/Makefile.linux-rhel_6-ppc64
 MPICXX = mpixlcxx

-MPI_CFLAGS   = -g -O3 -I./topology/
+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


--- a/make.inc/Makefile.linux-sles_12-x86_64
+++ b/make.inc/Makefile.linux-sles_12-x86_64
 MPICXX = CC

-MPI_CFLAGS   = -g -I./topology/ -I./topology/include/
+MPI_CFLAGS   = -g -I./architectures/ -I./architectures/include/
 MPI_CFLAGS  += -DXC40 -DDEBUG #-DTIMING

 MPI_LDFLAGS = -llustreapi -Wl,--whole-archive,-ldmapp,--no-whole-archive