Enable Topology for SMP Builds By Default

CMakeLists.txt

@@ -34,6 +34,10 @@ message(STATUS "Switching to Charm CXX Compiler: ${CHARM_ROOT}/bin/charmc")
 set(CMAKE_CXX_COMPILER ${CHARM_CXX_COMPILER})
 set(CMAKE_CXX_FLAGS "-language converse++ -Wall -Wextra" CACHE STRING "Additional arguments to charmc" FORCE)
 
+if(${CHARM_WITH_SMP})
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DCHARMLITE_TOPOLOGY=1")
+endif()
+
 # Charmlite requires a conforming C++11 compiler
 set(CMAKE_CXX_STANDARD ${CHARM_CXX_STANDARD})
 set(CMAKE_CXX_STANDARD_REQUIRED True)

cmake/CharmLite_SetupTests.cmake

@@ -19,7 +19,7 @@ if(${CHARM_WITH_NETWORK} STREQUAL "netlrts")
     set(CHARMRUN_LOCAL_FLAGS "++local")
     set(CHARMRUN_PPN_FLAG "+ppn")
 else()
-    set(CHARMRUN_PPN_FLAG "++ppn")
+    set(CHARMRUN_PPN_FLAG "+setcpuaffinity ++ppn")
 endif()
 
 if(${CHARM_WITH_SMP})

include/charmlite/charmlite.hpp

@@ -58,6 +58,9 @@ namespace cmk {
         _topoTree = ST_RecursivePartition_getTreeInfo(0);
 #endif
         CmiNodeAllBarrier();
+#if CHARMLITE_TOPOLOGY
+        CmiCheckAffinity();
+#endif
     }
 
     inline void send(message_ptr<>&& msg, bool immediate)

include/charmlite/core/common.hpp

@@ -17,6 +17,7 @@
 #include "TopoManager.h"
 #include "spanningTree.h"
 
+void CmiCheckAffinity(void);
 void CmiInitCPUTopology(char** argv);
 void CmiInitMemAffinity(char** argv);
 #endif

src/core.cpp

@@ -91,6 +91,9 @@ namespace cmk {
         // threads wait until _topoTree has been generated
 #endif
         CmiNodeAllBarrier();
+#if CHARMLITE_TOPOLOGY
+        CmiCheckAffinity();
+#endif
         if (CmiInCommThread())
         {
             // the comm thread has to get back to work!