Move EnvVar ro source file and change nccl_param Makefile to adapt different hardware

Author: chenqing

flagcx/adaptor/tuner/Makefile

@@ -3,6 +3,44 @@ CXX = g++
 CXXFLAGS = -fPIC -Wall -Wextra -O2 -std=c++11
 LDFLAGS = -shared -pthread
 
+# set to 0 if not provided
+USE_NVIDIA ?= 0
+USE_ASCEND ?= 0
+USE_ILUVATAR_COREX ?= 0
+USE_CAMBRICON ?= 0
+USE_GLOO ?= 0
+USE_BOOTSTRAP ?= 0
+USE_METAX ?= 0
+USE_MUSA ?= 0
+USE_KUNLUNXIN ?=0
+USE_AMD ?= 0
+USE_DU ?= 0
+USE_MPI ?= 0
+USE_UCX ?= 0
+USE_IBUC ?= 0
+
+ifeq ($(USE_NVIDIA), 1)
+	CXXFLAGS += -DUSE_NVIDIA_ADAPTOR
+else ifeq ($(USE_ASCEND), 1)
+	CXXFLAGS += -DUSE_ASCEND_ADAPTOR
+else ifeq ($(USE_ILUVATAR_COREX), 1)
+	CXXFLAGS = -DUSE_ILUVATAR_COREX_ADAPTOR
+else ifeq ($(USE_CAMBRICON), 1)
+	CXXFLAGS = -DUSE_CAMBRICON_ADAPTOR
+else ifeq ($(USE_METAX), 1)
+	CXXFLAGS = -DUSE_METAX_ADAPTOR
+else ifeq ($(USE_MUSA), 1)
+	CXXFLAGS = -DUSE_MUSA_ADAPTOR
+else ifeq ($(USE_KUNLUNXIN), 1)
+	CXXFLAGS = -DUSE_KUNLUNXIN_ADAPTOR
+else ifeq ($(USE_DU), 1)
+	CXXFLAGS = -DUSE_DU_ADAPTOR
+else ifeq ($(USE_AMD), 1)
+	CXXFLAGS = -DUSE_AMD_ADAPTOR -D__HIP_PLATFORM_AMD__
+else
+	CXXFLAGS = -DUSE_NVIDIA_ADAPTOR
+endif
+
 # Target shared library name
 TARGET = libnccl_param.so
 

flagcx/adaptor/tuner/tuner_util.cc

@@ -1,6 +1,47 @@
 #include "tuner/tuner_util.h"
 
 
+//Environment variables for different hardware
+#ifdef USE_NVIDIA_ADAPTOR
+
+static EnvVar algo(
+    "NCCL_ALGO",
+    {"ring", "tree"},
+    "ring"
+);
+
+static EnvVar proto(
+    "NCCL_PROTO",
+    {"LL", "LL128", "Simple"},
+    "Simple"
+);
+
+static EnvVar thread(
+    "NCCL_NTHREADS",
+    {"128", "256"},
+    "256"
+);
+
+static EnvVar minChannel(
+    "NCCL_MIN_NCHANNELS",
+    {"16", "32"},
+    "16"
+);
+
+static EnvVar chunkSize(
+    "NCCL_P2P_NVL_CHUNKSIZE",
+    {"1024", "2048"},
+    "1024"
+);
+
+std::vector<EnvVar> vars = {algo, proto, thread, minChannel, chunkSize};
+
+#else
+
+std::vector<EnvVar> vars = {};
+
+#endif
+
 // Safely copy std::string to char buffer, ensuring NUL termination and truncation
 static void safeStrCopy(char *dst, size_t dstSize, const std::string &src) {
     if (dstSize == 0) return;

flagcx/adaptor/tuner/tuner_util.h

@@ -19,42 +19,6 @@ struct EnvVar {
 flagcxResult_t generateCandidate(std::vector<struct flagcxEnvConfig> &cfgList);
 static void safeStrCopy(char *dst, size_t dstSize, const std::string &src);
 
-#ifdef USE_NVIDIA_ADAPTOR
-
-static EnvVar algo(
-    "NCCL_ALGO",
-    {"ring", "tree"},
-    "ring"
-);
-
-static EnvVar proto(
-    "NCCL_PROTO",
-    {"LL", "LL128", "Simple"},
-    "Simple"
-);
-
-static EnvVar thread(
-    "NCCL_NTHREADS",
-    {"128", "256"},
-    "256"
-);
-
-static EnvVar minChannel(
-    "NCCL_MIN_NCHANNELS",
-    {"16", "32"},
-    "16"
-);
-
-static EnvVar chunkSize(
-    "NCCL_P2P_NVL_CHUNKSIZE",
-    {"1024", "2048"},
-    "1024"
-);
-static std::vector<EnvVar> vars = {algo, proto, thread, minChannel, chunkSize};
-
-#else
-static std::vector<EnvVar> vars = {};
-
-#endif
+extern std::vector<EnvVar> vars;
 
 #endif // end include guard