Defined new symbols

Author: AdvaitTahilyani

cmake/converse.cmake

@@ -38,6 +38,7 @@ set(conv-core-cxx-sources
     src/conv-core/convcore.C
     src/conv-core/cpm.C
     src/conv-core/cpthreads.C
+    src/conv-core/cputopology.C
     src/conv-core/cpuaffinity.C
     src/conv-core/debug-conv.C
     src/conv-core/futures.C
@@ -161,10 +162,13 @@ set(conv-util-cxx-sources
     src/util/pup_toNetwork4.C
     src/util/pup_util.C
     src/util/pup_xlater.C
-    #src/util/spanningTree.C
+    src/util/topomanager/TopoManager.C
+    src/util/spanningTree.C
     ${conv-perf-cxx-sources}
 )
 
+#Uncommenting spanning tree to satisfy ckrdma dep errors
+
 if(CMK_CAN_LINK_FORTRAN)
     add_library(conv-utilf pup_f.f90)
     add_custom_command(TARGET conv-utilf
@@ -241,8 +245,17 @@ add_library(charm_cxx_utils STATIC
 
 add_library(converse INTERFACE)
 
+add_library(topomanager STATIC
+    ${tmgr-cxx-sources}
+    ${tmgr-h-sources})
+
+target_include_directories(topomanager PUBLIC
+    src/util/topomanager
+    ${CMAKE_BINARY_DIR}/include)
+
 target_link_libraries(converse INTERFACE
     reconverse
+    topomanager
     charm_cxx_utils
     hwloc
 )

src/scripts/Make.depends

@@ -1216,6 +1216,13 @@ cputopology.o: cputopology.C converse.h conv-header.h conv-config.h \
 
 crc32.o: crc32.C crc32.h
 
+cputopology.o: cputopology.C converse.h conv-header.h conv-config.h \
+ conv-autoconfig.h conv-common.h conv-mach-common.h conv-mach.h \
+ conv-mach-opt.h lrts-common.h cmiqueue.h pup_c.h pup_c_functions.h \
+ lrtslock.h queueing.h conv-cpm.h conv-cpath.h conv-qd.h conv-random.h \
+ conv-lists.h conv-trace.h persistent.h cmirdmautils.h debug-conv.h \
+ sockRoutines.h
+
 custom_partitioner.o: custom_partitioner.C charm++.h charm.h converse.h \
  conv-header.h conv-config.h conv-autoconfig.h conv-common.h \
  conv-mach-common.h conv-mach.h conv-mach-opt.h lrts-common.h cmiqueue.h \

src/scripts/Makefile

@@ -448,7 +448,7 @@ endif
 LIBCONV_CORE=convcore.o hrctimer.o conv-conds.o conv-taskQ.o queueing.o msgmgr.o \
 	cpm.o cpthreads.o futures.o cldb.o random.o \
 	debug-conv.o debug-conv++.o conv-ccs.o ccs-builtins.o middle-ccs.o \
-	traceCore.o traceCoreCommon.o \
+	traceCore.o cputopology.o traceCoreCommon.o \
 	converseProjections.o machineProjections.o \
 	quiescence.o isomalloc.o mem-arena.o memory-darwin-clang.o \
 	global-nop.o cmipool.o cpuaffinity.o cputopology.o  \