Consolidate NcclxConfig into shared meta/ directory (#2059)

comms/ncclx/v2_27/meta/NcclxConfig.cc → comms/ncclx/meta/NcclxConfig.cc

@@ -214,3 +214,15 @@ Config::Config(const ncclConfig_t* config) {
 }
 
 } // namespace ncclx
+
+// C-style wrapper around the ncclx::Config parsing constructor.
+// Most NCCL code is C-based, so this function translates C++
+// exceptions into ncclResult_t error codes for the C callers.
+ncclResult_t ncclxParseCommConfig(ncclConfig_t* config) {
+  try {
+    config->ncclxConfig = new ncclx::Config(config);
+    return ncclSuccess;
+  } catch (const std::exception&) {
+    return ncclInvalidArgument;
+  }
+}

comms/ncclx/v2_29/meta/NcclxConfig.h → comms/ncclx/meta/NcclxConfig.h

@@ -68,4 +68,5 @@ inline const std::vector<std::string>& knownHintKeys() {
 // exceptions into ncclResult_t error codes for the C callers.
 // Stores the result in config->ncclxConfig.  Must be called
 // exactly once per config.
+// TODO: Move into ncclx namespace as ncclx::parseCommConfig and update callers.
 ncclResult_t ncclxParseCommConfig(ncclConfig_t* config);

comms/ncclx/v2_27/src/Makefile

@@ -42,6 +42,7 @@ LIBSRCFILES := \
 
 LIBSRCFILES += $(wildcard ${NCCLDIR}/meta/*.cc)
 LIBSRCFILES += $(wildcard ${SHAREDDIR}/meta/commDump.cc)
+LIBSRCFILES += $(wildcard ${SHAREDDIR}/meta/NcclxConfig.cc)
 LIBSRCFILES += $(wildcard ${NCCLDIR}/meta/analyzer/*.cc)
 LIBSRCFILES += $(wildcard ${SHAREDDIR}/meta/colltrace/*.cc)
 LIBSRCFILES += $(wildcard ${SHAREDDIR}/meta/logger/*.cc)
@@ -108,6 +109,7 @@ INCLUDES += -Iinclude/plugin
 INCLUDES += -I${NCCLDIR}/
 INCLUDES += -I${SHAREDDIR}/
 INCLUDES += -I${NCCLDIR}/meta
+INCLUDES += -I${SHAREDDIR}/meta
 INCLUDES += -I${NCCLDIR}/meta/wrapper
 INCLUDES += -Idevice
 INCLUDES += -I$(BASE_DIR)

comms/ncclx/v2_27/src/init.cc

@@ -1855,17 +1855,6 @@ static ncclResult_t copyCommConfig(ncclComm_t childComm, ncclComm_t parent) {
   return ncclSuccess;
 }
 
-// C-style wrapper around the ncclx::Config parsing constructor.
-// Most NCCL code is C-based, so this function translates C++
-// exceptions into ncclResult_t error codes for the C callers.
-ncclResult_t ncclxParseCommConfig(ncclConfig_t* config) {
-  try {
-    config->ncclxConfig = new ncclx::Config(config);
-    return ncclSuccess;
-  } catch (const std::exception&) {
-    return ncclInvalidArgument;
-  }
-}
 
 static ncclResult_t parseCommConfig(ncclComm_t comm, ncclConfig_t *config) {
   auto sampleGuardBegin = EVENTS_SCUBA_UTIL_SAMPLE_GUARD("INIT");