Change de naming of interfaces and files implementing hardware characteristics

architectures/linux-rhel_6-ppc64/tp_network.hpp

@@ -4,7 +4,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <algorithm>
-#include "../topology.hpp"
+#include "tp_network_interface.hpp"
 
 #include <spi/include/kernel/location.h>
 #include <spi/include/kernel/process.h>

architectures/linux-sles_12-x86_64/tp_network.hpp

@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "../topology.hpp"
+#include "tp_network_interface.hpp"
 
 #include <pmi.h>
 

examples/HACC-IO/run_check_xc40.sh

 #!/bin/bash
 
-NODES=512
+NODES=256
 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=96
+export TAPIOCA_NBAGGR=48
 export TAPIOCA_BUFFERSIZE=16777216
 
 function setLustreFS ()
@@ -35,7 +35,7 @@ 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=2"
+    SETTINGS="$SETTINGS -e MPICH_MPIIO_HINTS=*:cray_cb_nodes_multiplier=1"
 }
 
 function outputFile ()

make.inc/Makefile.linux-rhel_6-ppc64

@@ -3,6 +3,8 @@ MPICXX = mpixlcxx
 MPI_CFLAGS   = -g -O3 -I./architectures/$(ARCHI)
 MPI_CFLAGS  += -DDEBUG #-DTIMING
 
-TP_INCLUDE   = architectures/$(ARCHI)/* 
+TP_INCLUDE   = architectures/tp_network_interface.hpp \
+	       architectures/tp_memory_interface.hpp \
+	       architectures/$(ARCHI)/* 
 
 INSTALL_PATH = $(HOME)/install/$(ARCHI)

make.inc/Makefile.linux-sles_12-x86_64

 MPICXX = CC
 
-MPI_CFLAGS   = -g -I./architectures/$(ARCHI) -I./architectures/$(ARCHI)/include/
-MPI_CFLAGS  += -DXC40 -DDEBUG #-DTIMING
+MPI_CFLAGS   = -g -I./architectures -I./architectures/$(ARCHI) -I./architectures/$(ARCHI)/include/
+MPI_CFLAGS  += -DDEBUG #-DTIMING
 
 MPI_LDFLAGS = -llustreapi -Wl,--whole-archive,-ldmapp,--no-whole-archive
 
-TP_INCLUDE   = architectures/$(ARCHI)/* architectures/$(ARCHI)/include/*
+TP_INCLUDE   = architectures/tp_network_interface.hpp \
+               architectures/tp_memory_interface.hpp \
+	       architectures/$(ARCHI)/* \
+	       architectures/$(ARCHI)/include/*
 
 INSTALL_PATH  = $(HOME)/install/$(ARCHI)