Commit 984b2b17 authored by Francois Tessier's avatar Francois Tessier

Bug fix for filename string copy

parent 31b984fa
...@@ -21,7 +21,7 @@ public: ...@@ -21,7 +21,7 @@ public:
this->masterRank_ = masterRank; this->masterRank_ = masterRank;
MPI_Comm_dup( comm, &this->comm_ ); MPI_Comm_dup( comm, &this->comm_ );
this->buffSize_ = buffSize; this->buffSize_ = buffSize;
strcpy ( this->fileName_, fileName); strncpy ( this->fileName_, fileName, sizeof(fileName) );
MPI_Comm_rank ( this->comm_, &rank ); MPI_Comm_rank ( this->comm_, &rank );
......
...@@ -7,13 +7,14 @@ TARGET="/lus/theta-fs0/projects/Performance/ftessier/HACC" ...@@ -7,13 +7,14 @@ TARGET="/lus/theta-fs0/projects/Performance/ftessier/HACC"
DDT="/soft/debuggers/forge/bin/ddt --connect" DDT="/soft/debuggers/forge/bin/ddt --connect"
STRIPE_COUNT=2 STRIPE_COUNT=2
STRIPE_SIZE=8388608 STRIPE_SIZE=8388608
AGGR_MULT=1
cd $HOME/install/$ARCHI/bin/ cd $HOME/install/$ARCHI/bin/
export TAPIOCA_DEVNULL=false 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=1 export TAPIOCA_NBAGGR=2
export TAPIOCA_BUFFERSIZE=16777216 export TAPIOCA_BUFFERSIZE=16777216
function setLustreFS () function setLustreFS ()
...@@ -35,13 +36,19 @@ function updateSettings() ...@@ -35,13 +36,19 @@ function updateSettings()
SETTINGS="$SETTINGS -e MPICH_RMA_OVER_DMAPP=1" SETTINGS="$SETTINGS -e MPICH_RMA_OVER_DMAPP=1"
SETTINGS="$SETTINGS -e MPICH_MPIIO_AGGREGATOR_PLACEMENT_DISPLAY=1" SETTINGS="$SETTINGS -e MPICH_MPIIO_AGGREGATOR_PLACEMENT_DISPLAY=1"
SETTINGS="$SETTINGS -e MPICH_MPIIO_HINTS=*:cray_cb_nodes_multiplier=1" SETTINGS="$SETTINGS -e MPICH_MPIIO_HINTS=*:cray_cb_nodes_multiplier=$AGGR_MULT"
} }
updateSettings function outputFile ()
{
OUTPUT="$HOME/PUB-IPDPS18/dat/mem_abstraction"
OUTPUT="${OUTPUT}/HACC_XC40_${BIN}_${NODES}_${PPN}"
OUTPUT="${OUTPUT}_${TAPIOCA_STRATEGY}_${TAPIOCA_NBAGGR}_${TAPIOCA_BUFFERSIZE}_${PARTICLES}"
}
PARTICLES=25000 PARTICLES=25000
BIN=miniHACC-AoS BIN=miniHACC-AoS
setLustreFS updateSettings
setLustreFS >> $OUTPUT
$DDT aprun $SETTINGS -n $NPROCS -N $PPN ./$BIN $PARTICLES $DDT aprun $SETTINGS -n $NPROCS -N $PPN ./$BIN $PARTICLES
...@@ -414,8 +414,8 @@ void Tapioca::InitAggregators () ...@@ -414,8 +414,8 @@ void Tapioca::InitAggregators ()
{ {
int aggr, retval; int aggr, retval;
this->memBuffer0.memAlloc ( this->bufferSize_, DDR, this->amAnAggr_, NULL, this->subComm_ ); this->memBuffer0.memAlloc ( this->bufferSize_, DDR, this->amAnAggr_, "", this->subComm_ );
this->memBuffer1.memAlloc ( this->bufferSize_, DDR, this->amAnAggr_, NULL, this->subComm_ ); this->memBuffer1.memAlloc ( this->bufferSize_, DDR, this->amAnAggr_, "", this->subComm_ );
#ifdef DEBUG #ifdef DEBUG
if (this->commRank_ == MASTER) { if (this->commRank_ == MASTER) {
......
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