rem cncl

CMakeLists.txt

@@ -281,7 +281,6 @@ option(WITH_INFRT "Compile PaddlePaddle with INFRT" OFF)
 option(WITH_NCCL "Compile PaddlePaddle with NCCL support" ON)
 option(WITH_RCCL "Compile PaddlePaddle with RCCL support" ON)
 option(WITH_XPU_BKCL "Compile PaddlePaddle with BAIDU KUNLUN XPU BKCL" OFF)
-option(WITH_CNCL "Compile PaddlePaddle with CNCL support" OFF)
 option(WITH_CRYPTO "Compile PaddlePaddle with crypto support" ON)
 option(WITH_ARM "Compile PaddlePaddle with arm support" OFF)
 option(WITH_SW "Compile PaddlePaddle with sw support" OFF)
@@ -430,14 +429,6 @@ if(NOT WITH_XPU AND WITH_XPU_BKCL)
       CACHE STRING "Disable BKCL when compiling without XPU" FORCE)
 endif()
 
-if(NOT WITH_MLU AND WITH_CNCL)
-  message(
-    WARNING "Disable CNCL when compiling without MLU. Force WITH_MLU=OFF.")
-  set(WITH_MLU
-      OFF
-      CACHE STRING "Disable CNCL when compiling without MLU" FORCE)
-endif()
-
 if(WITH_NCCL)
   add_definitions("-DPADDLE_WITH_NCCL")
   include(nccl)

cmake/neuware.cmake

@@ -24,11 +24,4 @@ generate_dummy_static_lib(LIB_NAME "neuware_lib" GENERATOR "neuware.cmake")
 set(NEUWARE_LIB_DEPS ${CNNL_LIB} ${MLUOP_LIB} ${CNRT_LIB} ${CNDRV_LIB}
                      ${CNPAPI_LIB})
 
-if(WITH_CNCL)
-  message(STATUS "Compile with CNCL!")
-  add_definitions(-DPADDLE_WITH_CNCL)
-  set(CNCL_LIB ${NEUWARE_LIB_DIR}/libcncl.so)
-  list(APPEND NEUWARE_LIB_DEPS ${CNCL_LIB})
-endif()
-
 target_link_libraries(neuware_lib ${NEUWARE_LIB_DEPS})

paddle/fluid/framework/var_type_traits.h

@@ -43,10 +43,6 @@
 #include "xpu/bkcl.h"
 #endif
 
-#if defined(PADDLE_WITH_CNCL)
-#include <cncl.h>
-#endif
-
 namespace phi {
 class DenseTensor;
 class SelectedRows;
@@ -199,9 +195,6 @@ using VarTypeRegistry = detail::VarTypeRegistryImpl<
 #if defined(PADDLE_WITH_XPU_BKCL)
     BKCLUniqueId,
     platform::BKCLCommunicator,
-#endif
-#if defined(PADDLE_WITH_CNCL)
-    cnclCliqueId,
 #endif
     std::vector<std::unique_ptr<operators::CUDAGraphWithInOuts>>,
     int,

paddle/fluid/imperative/CMakeLists.txt

@@ -133,16 +133,6 @@ if(NOT WIN32)
       SRCS reducer.cc
       DEPS layer)
   endif()
-  if(WITH_CNCL)
-    cc_library(
-      cncl_context
-      SRCS cncl_context.cc
-      DEPS collective_helper device_context tensor var_type_traits)
-    cc_library(
-      reducer
-      SRCS reducer.cc
-      DEPS layer)
-  endif()
   if(WITH_NCCL
      OR WITH_RCCL
      OR WITH_XPU_BKCL
@@ -167,8 +157,7 @@ if(WITH_GLOO)
          (WITH_NCCL
           OR WITH_RCCL
           OR WITH_XPU_BKCL
-          OR WITH_ASCEND_CL
-          OR WITH_CNCL)
+          OR WITH_ASCEND_CL)
         ))
     cc_library(
       reducer