Commit 2cd0e737 authored by Francois Tessier's avatar Francois Tessier

Update the compilation process to take into account the new shared Theta/Mira home directory

parent d9d34e10
include make.inc/Makefile.bgq include make.inc/Makefile.$(ARCHI)
CPP_FILES := $(wildcard *.cpp) CPP_FILES := $(wildcard *.cpp)
OBJ_FILES := $(CPP_FILES:.cpp=.o) OBJ_FILES := $(CPP_FILES:.cpp=.o)
......
MPICXX = mpixlcxx include ../make.inc/Makefile.$(ARCHI)
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 all: miniHACC-AoS miniHACC-SoA miniHACC-AoS-MPIIO miniHACC-SoA-MPIIO
...@@ -18,6 +15,12 @@ miniHACC-AoS-MPIIO:miniHACC-AoS-MPIIO.cpp ...@@ -18,6 +15,12 @@ miniHACC-AoS-MPIIO:miniHACC-AoS-MPIIO.cpp
miniHACC-SoA-MPIIO:miniHACC-SoA-MPIIO.cpp miniHACC-SoA-MPIIO:miniHACC-SoA-MPIIO.cpp
$(MPICXX) $(MPI_CFLAGS) $? -o $@ $(MPI_LDFLAGS) $(MPICXX) $(MPI_CFLAGS) $? -o $@ $(MPI_LDFLAGS)
install:
mv miniHACC-AoS miniHACC-SoA miniHACC-AoS-MPIIO miniHACC-SoA-MPIIO $(INSTALL_PATH)/bin
clean: 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
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
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
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)
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)
...@@ -4,4 +4,4 @@ MPI_CFLAGS = -g -O3 -I./topology/ ...@@ -4,4 +4,4 @@ MPI_CFLAGS = -g -O3 -I./topology/
MPI_CFLAGS += -DBGQ -DDEBUG #-DTIMING MPI_CFLAGS += -DBGQ -DDEBUG #-DTIMING
#MPI_CFLAGS += -I/bgsys/drivers/ppcfloor -I/bgsys/drivers/ppcfloor/spi/include/kernel/cnk #MPI_CFLAGS += -I/bgsys/drivers/ppcfloor -I/bgsys/drivers/ppcfloor/spi/include/kernel/cnk
INSTALL_PATH = $(HOME)/install_bgq INSTALL_PATH = $(HOME)/install/$(ARCHI)
...@@ -5,4 +5,4 @@ MPI_CFLAGS += -DXC40 -DDEBUG #-DTIMING ...@@ -5,4 +5,4 @@ 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
INSTALL_PATH = $(HOME)/install INSTALL_PATH = $(HOME)/install/$(ARCHI)
...@@ -69,6 +69,11 @@ class Tapioca ...@@ -69,6 +69,11 @@ class Tapioca
void MPIIOInfo (MPI_File fileHandle); void MPIIOInfo (MPI_File fileHandle);
/***********************/
/* TOPOLOGY */
/***********************/
Topology topology;
private: private:
/***********************/ /***********************/
/* INITIALIZATION */ /* INITIALIZATION */
...@@ -114,11 +119,6 @@ class Tapioca ...@@ -114,11 +119,6 @@ class Tapioca
void HandleMPIError (int retval); void HandleMPIError (int retval);
void PrintTime (double startTime, double endTime, char* func); void PrintTime (double startTime, double endTime, char* func);
/***********************/
/* TOPOLOGY */
/***********************/
Topology topology;
/***********************/ /***********************/
/* VARIABLES */ /* VARIABLES */
/***********************/ /***********************/
......
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