From f41757248f5783cb615ec519f9c76b3ccc67a357 Mon Sep 17 00:00:00 2001 From: Francois Tessier Date: Thu, 6 Jul 2017 20:21:29 +0000 Subject: [PATCH] Reorganize the implementation of architecture abstraction --- Makefile | 2 +- {topology => architectures}/bgq_mira.hpp | 0 {topology => architectures}/cray_xc40_theta.hpp | 0 {topology => architectures}/include/lustre/lustre_user.h | 0 .../include/lustre/lustre_user_cxx.patch | 0 {topology => architectures}/include/lustre/lustreapi.h | 0 {topology => architectures}/sample.hpp | 0 {topology => architectures}/topology.hpp | 0 make.inc/Makefile.linux-rhel_6-ppc64 | 2 +- make.inc/Makefile.linux-sles_12-x86_64 | 2 +- 10 files changed, 3 insertions(+), 3 deletions(-) rename {topology => architectures}/bgq_mira.hpp (100%) rename {topology => architectures}/cray_xc40_theta.hpp (100%) rename {topology => architectures}/include/lustre/lustre_user.h (100%) rename {topology => architectures}/include/lustre/lustre_user_cxx.patch (100%) rename {topology => architectures}/include/lustre/lustreapi.h (100%) rename {topology => architectures}/sample.hpp (100%) rename {topology => architectures}/topology.hpp (100%) diff --git a/Makefile b/Makefile index 95256c7..d0f5369 100644 --- 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: diff --git a/topology/bgq_mira.hpp b/architectures/bgq_mira.hpp similarity index 100% rename from topology/bgq_mira.hpp rename to architectures/bgq_mira.hpp diff --git a/topology/cray_xc40_theta.hpp b/architectures/cray_xc40_theta.hpp similarity index 100% rename from topology/cray_xc40_theta.hpp rename to architectures/cray_xc40_theta.hpp diff --git a/topology/include/lustre/lustre_user.h b/architectures/include/lustre/lustre_user.h similarity index 100% rename from topology/include/lustre/lustre_user.h rename to architectures/include/lustre/lustre_user.h diff --git a/topology/include/lustre/lustre_user_cxx.patch b/architectures/include/lustre/lustre_user_cxx.patch similarity index 100% rename from topology/include/lustre/lustre_user_cxx.patch rename to architectures/include/lustre/lustre_user_cxx.patch diff --git a/topology/include/lustre/lustreapi.h b/architectures/include/lustre/lustreapi.h similarity index 100% rename from topology/include/lustre/lustreapi.h rename to architectures/include/lustre/lustreapi.h diff --git a/topology/sample.hpp b/architectures/sample.hpp similarity index 100% rename from topology/sample.hpp rename to architectures/sample.hpp diff --git a/topology/topology.hpp b/architectures/topology.hpp similarity index 100% rename from topology/topology.hpp rename to architectures/topology.hpp diff --git a/make.inc/Makefile.linux-rhel_6-ppc64 b/make.inc/Makefile.linux-rhel_6-ppc64 index da01fe9..c847d13 100644 --- a/make.inc/Makefile.linux-rhel_6-ppc64 +++ b/make.inc/Makefile.linux-rhel_6-ppc64 @@ -1,6 +1,6 @@ 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 diff --git a/make.inc/Makefile.linux-sles_12-x86_64 b/make.inc/Makefile.linux-sles_12-x86_64 index ab3419d..0359097 100644 --- a/make.inc/Makefile.linux-sles_12-x86_64 +++ b/make.inc/Makefile.linux-sles_12-x86_64 @@ -1,6 +1,6 @@ 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 -- 2.26.2