From 5468b9d0932e5c143373fee8f2dadd58f8e7cb91 Mon Sep 17 00:00:00 2001
From: Francois Tessier <ftessier@anl.gov>
Date: Thu, 6 Jul 2017 21:45:18 +0000
Subject: [PATCH] Change de naming of interfaces and files implementing
 hardware characteristics

---
 architectures/linux-rhel_6-ppc64/tp_network.hpp          | 2 +-
 architectures/linux-sles_12-x86_64/tp_network.hpp        | 2 +-
 architectures/tp_memory_interface.hpp                    | 0
 architectures/{topology.hpp => tp_network_interface.hpp} | 0
 examples/HACC-IO/run_check_xc40.sh                       | 6 +++---
 make.inc/Makefile.linux-rhel_6-ppc64                     | 4 +++-
 make.inc/Makefile.linux-sles_12-x86_64                   | 9 ++++++---
 7 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100644 architectures/tp_memory_interface.hpp
 rename architectures/{topology.hpp => tp_network_interface.hpp} (100%)

diff --git a/architectures/linux-rhel_6-ppc64/tp_network.hpp b/architectures/linux-rhel_6-ppc64/tp_network.hpp
index 4403fc0..5479987 100644
--- a/architectures/linux-rhel_6-ppc64/tp_network.hpp
+++ b/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>
diff --git a/architectures/linux-sles_12-x86_64/tp_network.hpp b/architectures/linux-sles_12-x86_64/tp_network.hpp
index 6d33fe7..9272acb 100644
--- a/architectures/linux-sles_12-x86_64/tp_network.hpp
+++ b/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>
 
diff --git a/architectures/tp_memory_interface.hpp b/architectures/tp_memory_interface.hpp
new file mode 100644
index 0000000..e69de29
diff --git a/architectures/topology.hpp b/architectures/tp_network_interface.hpp
similarity index 100%
rename from architectures/topology.hpp
rename to architectures/tp_network_interface.hpp
diff --git a/examples/HACC-IO/run_check_xc40.sh b/examples/HACC-IO/run_check_xc40.sh
index 0fbb321..be83be3 100755
--- a/examples/HACC-IO/run_check_xc40.sh
+++ b/examples/HACC-IO/run_check_xc40.sh
@@ -1,6 +1,6 @@
 #!/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 ()
diff --git a/make.inc/Makefile.linux-rhel_6-ppc64 b/make.inc/Makefile.linux-rhel_6-ppc64
index 70e5102..b548c55 100644
--- a/make.inc/Makefile.linux-rhel_6-ppc64
+++ b/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)
diff --git a/make.inc/Makefile.linux-sles_12-x86_64 b/make.inc/Makefile.linux-sles_12-x86_64
index 2f7729f..6ffbfc6 100644
--- a/make.inc/Makefile.linux-sles_12-x86_64
+++ b/make.inc/Makefile.linux-sles_12-x86_64
@@ -1,10 +1,13 @@
 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)
-- 
2.26.2