Commit 589f63c9 authored by Francois Tessier's avatar Francois Tessier
Browse files

Merge branch 'master' of xgitlab.cels.anl.gov:ftessier/TAPIOCA

parents e126fea1 28930113
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
VARS="-e MPICH_RMA_OVER_DMAPP=1" VARS="-e MPICH_RMA_OVER_DMAPP=1"
NODES=8 NODES=8
PPN=16 PPN=2
NPROCS=$((NODES*PPN)) NPROCS=$((NODES*PPN))
TARGET="/lus/theta-fs0/projects/Performance/ftessier/HACC" TARGET="/lus/theta-fs0/projects/Performance/ftessier/HACC"
DDT="/soft/debuggers/forge/bin/ddt --connect" DDT="/soft/debuggers/forge/bin/ddt --connect"
...@@ -13,7 +13,7 @@ export TAPIOCA_DEVNULL=false ...@@ -13,7 +13,7 @@ export TAPIOCA_DEVNULL=false
export TAPIOCA_COMMSPLIT=true export TAPIOCA_COMMSPLIT=true
export TAPIOCA_STRATEGY=TOPOLOGY_AWARE export TAPIOCA_STRATEGY=TOPOLOGY_AWARE
export TAPIOCA_NBAGGR=2 export TAPIOCA_NBAGGR=2
export TAPIOCA_BUFFERSIZE=16777216 export TAPIOCA_BUFFERSIZE=4194304
function updateSettings() function updateSettings()
{ {
......
MPICXX = CC MPICXX = CC
MPI_CFLAGS = -g -O3 -I./topology/ -I./topology/include/ MPI_CFLAGS = -g -I./topology/ -I./topology/include/
MPI_CFLAGS += -DXC40 -DDEBUG #-DTIMING 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
......
...@@ -256,9 +256,10 @@ int Tapioca::Write (MPI_File fileHandle, MPI_Offset offset, void *buf, ...@@ -256,9 +256,10 @@ int Tapioca::Write (MPI_File fileHandle, MPI_Offset offset, void *buf,
this->Push (fileHandle, status); this->Push (fileHandle, status);
//this->iPush (fileHandle, &iRequest); //this->iPush (fileHandle, &iRequest);
} }
#ifdef BGQ
fprintf (stdout, "[INFO] %d increment 2nd currentRound (r: %d, rc: %d, nag: %d)\n", this->commRank_, this->currentRound_, this->roundCounter_, this->nAggr_); fprintf (stdout, "[INFO] %d increment 2nd currentRound (r: %d, rc: %d, nag: %d)\n", this->commRank_, this->currentRound_, this->roundCounter_, this->nAggr_);
this->currentRound_++; this->currentRound_++;
#endif
} }
this->roundCounter_++; this->roundCounter_++;
......
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