Commit 19da3380 authored by Francois Tessier's avatar Francois Tessier
Browse files

Fix Makefile to compile all cpp files

parent 69b6efc9
include make.inc/Makefile.bgq include make.inc/Makefile.bgq
CPP_FILES := $(wildcard *.cpp)
OBJ_FILES := $(CPP_FILES:.cpp=.o)
all:libtapioca.a all:libtapioca.a
libtapioca.a:tapioca.o libtapioca.a:$(OBJ_FILES)
ar rcs $@ $? ar rcs $@ $?
tapioca.o:tapioca.cpp %.o:%.cpp
$(MPICXX) $(MPI_CFLAGS) -c $? -o $@ $(MPI_LDFLAGS) $(MPICXX) $(MPI_CFLAGS) -c $? -o $@ $(MPI_LDFLAGS)
install: install:
......
MPICXX = mpicxx MPICXX = mpicxx
MPI_CFLAGS = -g -O3 -I./topology/ 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_bgq
...@@ -89,6 +89,7 @@ class Tapioca ...@@ -89,6 +89,7 @@ class Tapioca
int64_t DataSizeSentToAggr (int aggrId); int64_t DataSizeSentToAggr (int aggrId);
void InitAggregators (); void InitAggregators ();
void Push (MPI_File fileHandle, MPI_Request *request); void Push (MPI_File fileHandle, MPI_Request *request);
void Pull (MPI_File fileHandle, MPI_Request *request);
void GlobalFence (); void GlobalFence ();
/***********************/ /***********************/
......
...@@ -160,7 +160,7 @@ int Tapioca::Read (MPI_File fileHandle, MPI_Offset offset, void *buf, ...@@ -160,7 +160,7 @@ int Tapioca::Read (MPI_File fileHandle, MPI_Offset offset, void *buf,
} }
void Tapioca::Push (MPI_File fileHandle, MPI_Request *request) void Tapioca::Pull (MPI_File fileHandle, MPI_Request *request)
{ {
int64_t offset, dataSize; int64_t offset, dataSize;
int win, buffer; int win, buffer;
......
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