From 2cd0e737e19b579be9dd76490e265c20573f8d37 Mon Sep 17 00:00:00 2001 From: Francois Tessier Date: Fri, 30 Jun 2017 22:48:39 +0000 Subject: [PATCH] Update the compilation process to take into account the new shared Theta/Mira home directory --- Makefile | 2 +- examples/HACC-IO/Makefile | 13 +++++++---- examples/HACC-IO/Makefile.bgq | 23 ------------------- examples/HACC-IO/Makefile.xc40 | 23 ------------------- examples/make.inc/Makefile.linux-rhel_6-ppc64 | 6 +++++ .../make.inc/Makefile.linux-sles_12-x86_64 | 6 +++++ ...kefile.bgq => Makefile.linux-rhel_6-ppc64} | 2 +- ...ile.xc40 => Makefile.linux-sles_12-x86_64} | 2 +- tapioca.hpp | 10 ++++---- 9 files changed, 28 insertions(+), 59 deletions(-) delete mode 100644 examples/HACC-IO/Makefile.bgq delete mode 100644 examples/HACC-IO/Makefile.xc40 create mode 100644 examples/make.inc/Makefile.linux-rhel_6-ppc64 create mode 100644 examples/make.inc/Makefile.linux-sles_12-x86_64 rename make.inc/{Makefile.bgq => Makefile.linux-rhel_6-ppc64} (88%) rename make.inc/{Makefile.xc40 => Makefile.linux-sles_12-x86_64} (81%) diff --git a/Makefile b/Makefile index f6d318d..95256c7 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -include make.inc/Makefile.bgq +include make.inc/Makefile.$(ARCHI) CPP_FILES := $(wildcard *.cpp) OBJ_FILES := $(CPP_FILES:.cpp=.o) diff --git a/examples/HACC-IO/Makefile b/examples/HACC-IO/Makefile index 8eb9a1e..c711d22 100644 --- a/examples/HACC-IO/Makefile +++ b/examples/HACC-IO/Makefile @@ -1,7 +1,4 @@ -MPICXX = mpixlcxx - -MPI_CFLAGS = -g -O3 -I$(HOME)/install_bgq/include/ -DBGQ -DDEBUG -MPI_LDFLAGS = -L$(HOME)/install_bgq/lib/ -ltapioca +include ../make.inc/Makefile.$(ARCHI) all: miniHACC-AoS miniHACC-SoA miniHACC-AoS-MPIIO miniHACC-SoA-MPIIO @@ -18,6 +15,12 @@ miniHACC-AoS-MPIIO:miniHACC-AoS-MPIIO.cpp miniHACC-SoA-MPIIO:miniHACC-SoA-MPIIO.cpp $(MPICXX) $(MPI_CFLAGS) $? -o $@ $(MPI_LDFLAGS) +install: + mv miniHACC-AoS miniHACC-SoA miniHACC-AoS-MPIIO miniHACC-SoA-MPIIO $(INSTALL_PATH)/bin + clean: - rm miniHACC-AoS miniHACC-SoA miniHACC-AoS-MPIIO miniHACC-SoA-MPIIO + rm $(INSTALL_PATH)/bin/miniHACC-AoS + rm $(INSTALL_PATH)/bin/miniHACC-SoA + rm $(INSTALL_PATH)/bin/miniHACC-AoS-MPIIO + rm $(INSTALL_PATH)/bin/miniHACC-SoA-MPIIO diff --git a/examples/HACC-IO/Makefile.bgq b/examples/HACC-IO/Makefile.bgq deleted file mode 100644 index bdac828..0000000 --- a/examples/HACC-IO/Makefile.bgq +++ /dev/null @@ -1,23 +0,0 @@ -MPICXX = mpicxx - -MPI_CFLAGS = -g -O3 -I$(HOME)/install_bgq/include/ -DBGQ -DDEBUG -MPI_LDFLAGS = -L$(HOME)/install_bgq/lib/ -ltapioca - -all: miniHACC-AoS miniHACC-SoA miniHACC-AoS-MPIIO miniHACC-SoA-MPIIO - -miniHACC-AoS:miniHACC-AoS.cpp - $(MPICXX) $(MPI_CFLAGS) $? -o $@ $(MPI_LDFLAGS) - -miniHACC-SoA:miniHACC-SoA.cpp - $(MPICXX) $(MPI_CFLAGS) $? -o $@ $(MPI_LDFLAGS) - -### MPI I/O -miniHACC-AoS-MPIIO:miniHACC-AoS-MPIIO.cpp - $(MPICXX) $(MPI_CFLAGS) $? -o $@ $(MPI_LDFLAGS) - -miniHACC-SoA-MPIIO:miniHACC-SoA-MPIIO.cpp - $(MPICXX) $(MPI_CFLAGS) $? -o $@ $(MPI_LDFLAGS) - -clean: - rm miniHACC-AoS miniHACC-SoA miniHACC-AoS-MPIIO miniHACC-SoA-MPIIO *.o HACC.dat - diff --git a/examples/HACC-IO/Makefile.xc40 b/examples/HACC-IO/Makefile.xc40 deleted file mode 100644 index f34f7a5..0000000 --- a/examples/HACC-IO/Makefile.xc40 +++ /dev/null @@ -1,23 +0,0 @@ -MPICXX = CC - -MPI_CFLAGS = -g -O3 -I$(HOME)/install/include/ -DXC40 -DDEBUG -MPI_LDFLAGS = -L$(HOME)/install/lib/ -ltapioca -llustreapi -Wl,--whole-archive,-ldmapp,--no-whole-archive - -all: miniHACC-AoS miniHACC-SoA miniHACC-AoS-MPIIO miniHACC-SoA-MPIIO - -miniHACC-AoS:miniHACC-AoS.cpp - $(MPICXX) $(MPI_CFLAGS) $? -o $@ $(MPI_LDFLAGS) - -miniHACC-SoA:miniHACC-SoA.cpp - $(MPICXX) $(MPI_CFLAGS) $? -o $@ $(MPI_LDFLAGS) - -### MPI I/O -miniHACC-AoS-MPIIO:miniHACC-AoS-MPIIO.cpp - $(MPICXX) $(MPI_CFLAGS) $? -o $@ $(MPI_LDFLAGS) - -miniHACC-SoA-MPIIO:miniHACC-SoA-MPIIO.cpp - $(MPICXX) $(MPI_CFLAGS) $? -o $@ $(MPI_LDFLAGS) - -clean: - rm miniHACC-AoS miniHACC-SoA miniHACC-AoS-MPIIO miniHACC-SoA-MPIIO *.o HACC.dat - diff --git a/examples/make.inc/Makefile.linux-rhel_6-ppc64 b/examples/make.inc/Makefile.linux-rhel_6-ppc64 new file mode 100644 index 0000000..cb632c1 --- /dev/null +++ b/examples/make.inc/Makefile.linux-rhel_6-ppc64 @@ -0,0 +1,6 @@ +MPICXX = mpixlcxx + +MPI_CFLAGS = -g -O3 -I$(HOME)/install/$(ARCHI)/include/ -DBGQ -DDEBUG +MPI_LDFLAGS = -L$(HOME)/install/$(ARCHI)/lib/ -ltapioca +INSTALL_PATH = $(HOME)/install/$(ARCHI) + diff --git a/examples/make.inc/Makefile.linux-sles_12-x86_64 b/examples/make.inc/Makefile.linux-sles_12-x86_64 new file mode 100644 index 0000000..f0b136a --- /dev/null +++ b/examples/make.inc/Makefile.linux-sles_12-x86_64 @@ -0,0 +1,6 @@ +MPICXX = CC + +MPI_CFLAGS = -g -O3 -I$(HOME)/install/$(ARCHI)/include/ -DXC40 -DDEBUG +MPI_LDFLAGS = -L$(HOME)/install/$(ARCHI)/lib/ -ltapioca -llustreapi -Wl,--whole-archive,-ldmapp,--no-whole-archive +INSTALL_PATH = $(HOME)/install/$(ARCHI) + diff --git a/make.inc/Makefile.bgq b/make.inc/Makefile.linux-rhel_6-ppc64 similarity index 88% rename from make.inc/Makefile.bgq rename to make.inc/Makefile.linux-rhel_6-ppc64 index 26499be..da01fe9 100644 --- a/make.inc/Makefile.bgq +++ b/make.inc/Makefile.linux-rhel_6-ppc64 @@ -4,4 +4,4 @@ MPI_CFLAGS = -g -O3 -I./topology/ MPI_CFLAGS += -DBGQ -DDEBUG #-DTIMING #MPI_CFLAGS += -I/bgsys/drivers/ppcfloor -I/bgsys/drivers/ppcfloor/spi/include/kernel/cnk -INSTALL_PATH = $(HOME)/install_bgq +INSTALL_PATH = $(HOME)/install/$(ARCHI) diff --git a/make.inc/Makefile.xc40 b/make.inc/Makefile.linux-sles_12-x86_64 similarity index 81% rename from make.inc/Makefile.xc40 rename to make.inc/Makefile.linux-sles_12-x86_64 index 4aa7ff2..ab3419d 100644 --- a/make.inc/Makefile.xc40 +++ b/make.inc/Makefile.linux-sles_12-x86_64 @@ -5,4 +5,4 @@ MPI_CFLAGS += -DXC40 -DDEBUG #-DTIMING MPI_LDFLAGS = -llustreapi -Wl,--whole-archive,-ldmapp,--no-whole-archive -INSTALL_PATH = $(HOME)/install +INSTALL_PATH = $(HOME)/install/$(ARCHI) diff --git a/tapioca.hpp b/tapioca.hpp index f131661..a28956f 100644 --- a/tapioca.hpp +++ b/tapioca.hpp @@ -69,6 +69,11 @@ class Tapioca void MPIIOInfo (MPI_File fileHandle); + /***********************/ + /* TOPOLOGY */ + /***********************/ + Topology topology; + private: /***********************/ /* INITIALIZATION */ @@ -114,11 +119,6 @@ class Tapioca void HandleMPIError (int retval); void PrintTime (double startTime, double endTime, char* func); - /***********************/ - /* TOPOLOGY */ - /***********************/ - Topology topology; - /***********************/ /* VARIABLES */ /***********************/ -- 2.22.2