Fix BG/Q implementation for topology abstraction

architectures/linux-rhel_6-ppc64/tp_network.hpp

-#ifndef BGQ_MIRA_H
-#define BGQ_MIRA_H
+#ifndef TP_NETWORK_H
+#define TP_NETWORK_H
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -246,4 +246,4 @@ private:
   }
 };
 
-#endif // BGQ_MIRA_H
+#endif // TP_NETWORK_H

examples/HACC-IO/run_check_xc40.sh

 #!/bin/bash
 
-NODES=256
+NODES=1024
 PPN=16
 NPROCS=$((NODES*PPN))
 TARGET="/lus/theta-fs0/projects/Performance/ftessier/HACC"
@@ -13,7 +13,7 @@ cd $HOME/install/$ARCHI/bin/
 export TAPIOCA_DEVNULL=false
 export TAPIOCA_COMMSPLIT=true
 export TAPIOCA_STRATEGY=TOPOLOGY_AWARE
-export TAPIOCA_NBAGGR=48
+export TAPIOCA_NBAGGR=1
 export TAPIOCA_BUFFERSIZE=16777216
 
 function setLustreFS ()
@@ -35,13 +35,13 @@ function updateSettings()
     SETTINGS="$SETTINGS -e MPICH_RMA_OVER_DMAPP=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=3"
 }
 
 function outputFile ()
 {
     OUTPUT="$HOME/PUB-IPDPS18/dat/hacc_rw"
-    OUTPUT="${OUTPUT}/HACC_XC40_${BIN}_${NODES}_${PPN}"
+    OUTPUT="${OUTPUT}/HACC_XC40_FP8N_${BIN}_${NODES}_${PPN}"
     OUTPUT="${OUTPUT}_${TAPIOCA_STRATEGY}_${TAPIOCA_NBAGGR}_${TAPIOCA_BUFFERSIZE}_${PARTICLES}"
 }
 

examples/HACC-IO/run_debug_xc40.sh

+#!/bin/bash
+
+NODES=8
+PPN=16
+NPROCS=$((NODES*PPN))
+TARGET="/lus/theta-fs0/projects/Performance/ftessier/HACC"
+DDT="/soft/debuggers/forge/bin/ddt --connect"
+STRIPE_COUNT=2
+STRIPE_SIZE=8388608
+
+cd $HOME/install/$ARCHI/bin/
+
+export TAPIOCA_DEVNULL=false
+export TAPIOCA_COMMSPLIT=true
+export TAPIOCA_STRATEGY=TOPOLOGY_AWARE
+export TAPIOCA_NBAGGR=1
+export TAPIOCA_BUFFERSIZE=16777216
+
+function setLustreFS ()
+{
+    rm $TARGET/*
+    lfs setstripe --stripe-count $STRIPE_COUNT --stripe-size $STRIPE_SIZE $TARGET
+    lfs getstripe $TARGET
+}
+
+function updateSettings()
+{
+    printenv | egrep "TAPIOCA_"
+    SETTINGS="-e TAPIOCA_DEVNULL=$TAPIOCA_DEVNULL"
+    SETTINGS="$SETTINGS -e TAPIOCA_COMMSPLIT=$TAPIOCA_COMMSPLIT"
+    SETTINGS="$SETTINGS -e TAPIOCA_STRATEGY=$TAPIOCA_STRATEGY"
+    SETTINGS="$SETTINGS -e TAPIOCA_NBAGGR=$TAPIOCA_NBAGGR"
+    SETTINGS="$SETTINGS -e TAPIOCA_BUFFERSIZE=$TAPIOCA_BUFFERSIZE"
+
+    SETTINGS="$SETTINGS -e MPICH_RMA_OVER_DMAPP=1"
+    
+    SETTINGS="$SETTINGS -e MPICH_MPIIO_AGGREGATOR_PLACEMENT_DISPLAY=1"
+    SETTINGS="$SETTINGS -e MPICH_MPIIO_HINTS=*:cray_cb_nodes_multiplier=1"
+}
+
+updateSettings
+
+PARTICLES=25000
+BIN=miniHACC-AoS
+
+setLustreFS
+$DDT aprun $SETTINGS -n $NPROCS -N $PPN ./$BIN $PARTICLES

make.inc/Makefile.linux-rhel_6-ppc64

 MPICXX = mpixlcxx
 
-MPI_CFLAGS   = -g -O3 -I./architectures/$(ARCHI)
+MPI_CFLAGS   = -g -O3 -I./architectures -I./architectures/$(ARCHI)
 MPI_CFLAGS  += -DDEBUG #-DTIMING
 
 TP_INCLUDE   = architectures/tp_network_interface.hpp \