hanhaowen-mt
diff --git a/‎.gitmodules‎
Lines changed: 0 additions & 8 deletions b/‎.gitmodules‎
Lines changed: 0 additions & 8 deletions
diff --git a/‎CMakeLists.txt‎
Lines changed: 68 additions & 3 deletions b/‎CMakeLists.txt‎
Lines changed: 68 additions & 3 deletions
diff --git a/‎README.md‎
Lines changed: 1 addition & 1 deletion b/‎README.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎README_cn.md‎
Lines changed: 2 additions & 2 deletions b/‎README_cn.md‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎README_ja.md‎
Lines changed: 1 addition & 1 deletion b/‎README_ja.md‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎cmake/configure.cmake‎
Lines changed: 13 additions & 0 deletions b/‎cmake/configure.cmake‎
Lines changed: 13 additions & 0 deletions
diff --git a/‎cmake/cupti.cmake‎
Lines changed: 5 additions & 1 deletion b/‎cmake/cupti.cmake‎
Lines changed: 5 additions & 1 deletion
diff --git a/‎cmake/external/cryptopp.cmake‎
Lines changed: 9 additions & 9 deletions b/‎cmake/external/cryptopp.cmake‎
Lines changed: 9 additions & 9 deletions
diff --git a/‎cmake/external/eigen.cmake‎
Lines changed: 70 additions & 0 deletions b/‎cmake/external/eigen.cmake‎
Lines changed: 70 additions & 0 deletions
diff --git a/‎cmake/flags.cmake‎
Lines changed: 5 additions & 0 deletions b/‎cmake/flags.cmake‎
Lines changed: 5 additions & 0 deletions
@@ -110,11 +110,3 @@
 	path = third_party/cccl
 	url = https://github.com/NVIDIA/cccl.git
 	ignore = dirty
-[submodule "third_party/cryptopp"]
-	path = third_party/cryptopp
-	url = https://github.com/weidai11/cryptopp.git
-	ignore = dirty
-[submodule "third_party/cryptopp-cmake"]
-	path = third_party/cryptopp-cmake
-	url = https://github.com/noloader/cryptopp-cmake.git
-	ignore = dirty
@@ -41,13 +41,14 @@ if(NOT CMAKE_BUILD_TYPE)
 endif()
 
 project(paddle CXX C)
-
+# set(CMAKE_VERBOSE_MAKEFILE ON)
 # enable language CUDA
 # TODO(Shibo Tao): remove find_package(CUDA) completely.
 find_package(CUDA QUIET)
 find_package(MKL CONFIG QUIET)
 option(WITH_ONEMKL "Compile PaddlePaddle with oneMKL" OFF)
-option(WITH_GPU "Compile PaddlePaddle with NVIDIA GPU" ${CUDA_FOUND})
+option(WITH_GPU "Compile PaddlePaddle with NVIDIA GPU" OFF)
+option(WITH_MUSA "Compile PaddlePaddle with MUSA" ON)
 option(WITH_MPI "Compile PaddlePaddle with MPI" OFF)
 option(WITH_TENSORRT "Compile PaddlePaddle with NVIDIA TensorRT" OFF)
 option(WITH_XPU "Compile PaddlePaddle with BAIDU KUNLUN XPU" OFF)
@@ -89,6 +90,9 @@ endif()
 if(WITH_GPU AND WITH_ROCM)
   message(FATAL_ERROR "Error when compile CUDA and ROCM at the same time")
 endif()
+if(WITH_GPU AND WITH_MUSA)
+  message(FATAL_ERROR "Error when compile CUDA and MUSA at the same time")
+endif()
 
 if(WITH_GPU AND NOT APPLE)
   enable_language(CUDA)
@@ -252,7 +256,7 @@ option(WITH_TESTING "Compile PaddlePaddle with unit testing" OFF)
 option(WITH_MULTINODE_TESTING "Test multinode apis and ops" OFF)
 option(WITH_MKL "Compile PaddlePaddle with MKL support." ${AVX_FOUND})
 option(WITH_SYSTEM_BLAS "Use system blas library" OFF)
-option(WITH_DISTRIBUTE "Compile with distributed support" OFF)
+option(WITH_DISTRIBUTE "Compile with distributed support" ON)
 option(WITH_BRPC_RDMA "Use brpc rdma as the rpc protocal" OFF)
 option(ON_INFER "Turn on inference optimization and inference-lib generation"
        ON)
@@ -285,6 +289,7 @@ option(WITH_LITE "Compile Paddle Fluid with Lite Engine" OFF)
 option(WITH_CINN "Compile PaddlePaddle with CINN" OFF)
 option(WITH_NCCL "Compile PaddlePaddle with NCCL support" ON)
 option(WITH_RCCL "Compile PaddlePaddle with RCCL support" ON)
+option(WITH_MCCL "Compile PaddlePaddle with MCCL support" ON)
 option(WITH_XPU_BKCL "Compile PaddlePaddle with BAIDU KUNLUN XPU BKCL" OFF)
 option(WITH_CRYPTO "Compile PaddlePaddle with crypto support" ON)
 option(WITH_ARM "Compile PaddlePaddle with arm support" OFF)
@@ -352,6 +357,7 @@ endif()
 if(LINUX
    AND NOT WITH_CUSTOM_DEVICE
    AND NOT WITH_GPU
+   AND NOT WITH_MUSA
    AND NOT WITH_ROCM
    AND NOT WITH_XPU
    AND NOT WITH_XPU_KP
@@ -404,6 +410,14 @@ if(NOT WITH_GPU AND WITH_NCCL)
       CACHE STRING "Disable NCCL when compiling without GPU" FORCE)
 endif()
 
+if(NOT WITH_MUSA AND WITH_MCCL)
+  message(
+    WARNING "Disable MCCL when compiling without MUSA. Force WITH_MCCL=OFF.")
+  set(WITH_MCCL
+      OFF
+      CACHE STRING "Disable MCCL when compiling without MUSA" FORCE)
+endif()
+
 if(NOT WITH_GPU AND WITH_CUDNN_DSO)
   message(
     WARNING
@@ -461,6 +475,19 @@ else()
   endif()
 endif()
 
+if(WITH_MCCL)
+  add_definitions("-DPADDLE_WITH_MCCL")
+  include(mccl)
+else()
+  if(WITH_MUSA)
+    message(
+      WARNING
+        "If the environment is multi-card, the WITH_MCCL option needs to be turned on, otherwise only a single card can be used."
+    )
+  endif()
+endif()
+
+
 if(WITH_BRPC_RDMA)
   message(STATUS "Use brpc with rdma.")
   if(NOT WITH_DISTRIBUTE)
@@ -486,6 +513,11 @@ if(WITH_ROCM)
   include(cupti)
 endif()
 
+if(WITH_MUSA)
+  include(musa)
+  include(mudnn)
+endif()
+
 if(WITH_XPU_KP)
   include(xpu_kp)
 endif()
@@ -498,6 +530,14 @@ if(NOT WITH_ROCM AND WITH_RCCL)
       CACHE STRING "Disable RCCL when compiling without ROCM" FORCE)
 endif()
 
+if(NOT WITH_MUSA AND WITH_MCCL)
+  message(
+    WARNING "Disable MCCL when compiling without MUSA. Force WITH_MCCL=OFF.")
+  set(WITH_MCCL
+      OFF
+      CACHE STRING "Disable MCCL when compiling without MUSA" FORCE)
+endif()
+
 if(WITH_RCCL)
   add_definitions("-DPADDLE_WITH_RCCL")
   include(rccl)
@@ -510,6 +550,18 @@ else()
   endif()
 endif()
 
+if(WITH_MCCL)
+  add_definitions("-DPADDLE_WITH_MCCL")
+  include(mccl)
+else()
+  if(WITH_MUSA)
+    message(
+      WARNING
+        "If the environment is multi-card, the WITH_MCCL option needs to be turned on, otherwise only a single card can be used."
+    )
+  endif()
+endif()
+
 if(WITH_HETERPS AND WITH_PSLIB)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_USE_CXX11_ABI=0")
 endif()
@@ -560,6 +612,13 @@ if(WITH_RPC)
         OFF
         CACHE BOOL "Disable WITH_RPC when compiling with ROCM" FORCE)
   endif()
+  if(WITH_MUSA AND WITH_RPC)
+  message(
+    WARNING "Disable WITH_RPC when compiling with MUSA. Force WITH_RPC=OFF.")
+  set(WITH_RPC
+      OFF
+      CACHE BOOL "Disable WITH_RPC when compiling with MUSA" FORCE)
+  endif()
   if(WITH_XPU AND WITH_RPC)
     message(
       WARNING "Disable WITH_RPC when compiling with XPU. Force WITH_RPC=OFF.")
@@ -631,6 +690,12 @@ include(configure) # add paddle env configuration
 
 include_directories("${PADDLE_SOURCE_DIR}")
 
+# distribute need openssl
+# openssl install tutorial: https://www.howtoforge.com/tutorial/how-to-install-openssl-from-source-on-linux/
+include_directories("/usr/local/ssl/include")
+link_directories("/usr/local/ssl/lib64")
+
+
 if(WITH_NV_JETSON)
   set(WITH_ARM
       ON
 
@@ -20,7 +20,7 @@ PaddlePaddle is originated from industrial practices with dedication and commitm
 
 ## Installation
 
-### Latest PaddlePaddle Release: [v2.6](https://github.com/PaddlePaddle/Paddle/tree/release/2.6)
+### Latest PaddlePaddle Release: [v2.5](https://github.com/PaddlePaddle/Paddle/tree/release/2.5)
 
 Our vision is to enable deep learning for everyone via PaddlePaddle.
 Please refer to our [release announcement](https://github.com/PaddlePaddle/Paddle/releases) to track the latest features of PaddlePaddle.
 
@@ -18,9 +18,9 @@
 
 ## 安装
 
-### PaddlePaddle 最新版本: [v2.6](https://github.com/PaddlePaddle/Paddle/tree/release/2.6)
+### PaddlePaddle最新版本: [v2.5](https://github.com/PaddlePaddle/Paddle/tree/release/2.5)
 
-跟进 PaddlePaddle 最新特性请参考我们的[版本说明](https://github.com/PaddlePaddle/Paddle/releases)
+跟进PaddlePaddle最新特性请参考我们的[版本说明](https://github.com/PaddlePaddle/Paddle/releases)
 
 ### 安装最新稳定版本:
 ```
 
@@ -20,7 +20,7 @@ PaddlePaddle は、工業化に対するコミットメントを持つ工業的
 
 ## インストール
 
-### PaddlePaddle の最新リリース: [v2.6](https://github.com/PaddlePaddle/Paddle/tree/release/2.6)
+### PaddlePaddle の最新リリース: [v2.5](https://github.com/PaddlePaddle/Paddle/tree/release/2.5)
 
 私たちのビジョンは、PaddlePaddle を通じて、誰もが深層学習を行えるようにすることです。
 PaddlePaddle の最新機能を追跡するために、私たちの[リリースのお知らせ](https://github.com/PaddlePaddle/Paddle/releases)を参照してください。
 
@@ -175,6 +175,19 @@ elseif(WITH_ROCM)
   if(${MIOPEN_VERSION} VERSION_LESS 2090)
     message(FATAL_ERROR "Paddle needs MIOPEN >= 2.9 to compile")
   endif()
+elseif(WITH_MUSA)
+  add_definitions(-DPADDLE_WITH_MUSA)
+  add_definitions(-DEIGEN_USE_GPU)
+  add_definitions(-DEIGEN_USE_MUSA)
+  if(MUPTI_FOUND)
+    include_directories(${CUPTI_INCLUDE_DIR})
+    add_definitions(-DPADDLE_WITH_MUPTI)
+  else()
+    message(STATUS "Cannot find MUPTI, GPU Profiling is incorrect.")
+  endif()
+  if(NOT MUDNN_FOUND)
+    message(FATAL_ERROR "Paddle needs mudnn to compile")
+  endif()
 else()
   add_definitions(-DHPPL_STUB_FUNC)
   list(APPEND CMAKE_CXX_SOURCE_FILE_EXTENSIONS cu)
 
@@ -1,11 +1,15 @@
-if(NOT WITH_GPU AND NOT WITH_ROCM)
+if(NOT WITH_GPU AND NOT WITH_ROCM AND NOT WITH_MUSA)
   return()
 endif()
 
 if(WITH_ROCM)
   set(CUPTI_ROOT
       "${ROCM_PATH}/cuda/extras/CUPTI"
       CACHE PATH "CUPTI ROOT")
+elseif(WITH_MUSA)
+  set(CUPTI_ROOT
+      "/usr/local/musa"
+      CACHE PATH "CUPTI ROOT")      
 else()
   set(CUPTI_ROOT
       "/usr"
 
@@ -14,13 +14,12 @@
 
 include(ExternalProject)
 
-set(CRYPTOPP_SOURCE_DIR ${PADDLE_SOURCE_DIR}/third_party/cryptopp)
-set(CRYPTOPP_CMAKE_SOURCE_DIR ${PADDLE_SOURCE_DIR}/third_party/cryptopp-cmake)
 set(CRYPTOPP_PREFIX_DIR ${THIRD_PARTY_PATH}/cryptopp)
 set(CRYPTOPP_INSTALL_DIR ${THIRD_PARTY_PATH}/install/cryptopp)
 set(CRYPTOPP_INCLUDE_DIR
     "${CRYPTOPP_INSTALL_DIR}/include"
     CACHE PATH "cryptopp include directory." FORCE)
+set(CRYPTOPP_REPOSITORY ${GIT_URL}/weidai11/cryptopp.git)
 set(CRYPTOPP_TAG CRYPTOPP_8_2_0)
 
 if(WIN32)
@@ -64,16 +63,17 @@ include_directories(${CRYPTOPP_INCLUDE_DIR})
 ExternalProject_Add(
   extern_cryptopp
   ${EXTERNAL_PROJECT_LOG_ARGS} ${SHALLOW_CLONE}
+  GIT_REPOSITORY ${CRYPTOPP_REPOSITORY}
+  GIT_TAG ${CRYPTOPP_TAG}
   PREFIX ${CRYPTOPP_PREFIX_DIR}
-  SOURCE_DIR ${CRYPTOPP_SOURCE_DIR}
   UPDATE_COMMAND ""
   PATCH_COMMAND
-  COMMAND ${CMAKE_COMMAND} -E copy "${CRYPTOPP_CMAKE_SOURCE_DIR}/CMakeLists.txt"
-          "<SOURCE_DIR>/CMakeLists.txt"
-  COMMAND
-    ${CMAKE_COMMAND} -E copy
-    "${CRYPTOPP_CMAKE_SOURCE_DIR}/cryptopp-config.cmake"
-    "<SOURCE_DIR>/cryptopp-config.cmake"
+  COMMAND ${CMAKE_COMMAND} -E remove_directory "<SOURCE_DIR>/cmake/"
+  COMMAND git clone ${GIT_URL}/noloader/cryptopp-cmake "<SOURCE_DIR>/cmake"
+  COMMAND cd "<SOURCE_DIR>/cmake" && git checkout tags/${CRYPTOPP_TAG} -b
+          ${CRYPTOPP_TAG}
+  COMMAND ${CMAKE_COMMAND} -E copy_directory "<SOURCE_DIR>/cmake/"
+          "<SOURCE_DIR>/"
   COMMAND ${CRYPTOPP_PATCH_COMMAND}
   INSTALL_DIR ${CRYPTOPP_INSTALL_DIR}
   CMAKE_ARGS ${CRYPTOPP_CMAKE_ARGS}
 
@@ -60,6 +60,76 @@ if(CMAKE_COMPILER_IS_GNUCC)
         ${EIGEN_PATCH_COMMAND} && patch -Nd
         ${SOURCE_DIR}/Eigen/src/Core/arch/SSE/ < ${complex_header})
   endif()
+  if(WITH_MUSA)
+    file(
+      TO_NATIVE_PATH
+      ${PADDLE_SOURCE_DIR}/patches/eigen/Eigen_src_Core_util_ConfigureVectorization.h.patch
+      configure_vectorization_header)
+    set(EIGEN_PATCH_COMMAND
+        ${EIGEN_PATCH_COMMAND} && patch -Nd ${SOURCE_DIR}/Eigen/src/Core/util/
+        < ${configure_vectorization_header})
+    file(TO_NATIVE_PATH
+         ${PADDLE_SOURCE_DIR}/patches/eigen/Eigen_src_Core_util_Macros.h.patch
+         util_macros_header)
+    set(EIGEN_PATCH_COMMAND
+        ${EIGEN_PATCH_COMMAND} && patch -Nd ${SOURCE_DIR}/Eigen/src/Core/util/
+        < ${util_macros_header})
+    file(TO_NATIVE_PATH
+         ${PADDLE_SOURCE_DIR}/patches/eigen/Eigen_src_Core_util_Meta.h.patch
+         meta_header)
+    set(EIGEN_PATCH_COMMAND ${EIGEN_PATCH_COMMAND} && patch -Nd
+                            ${SOURCE_DIR}/Eigen/src/Core/util/ < ${meta_header})
+    file(TO_NATIVE_PATH
+         ${PADDLE_SOURCE_DIR}/patches/eigen/unsupported_Eigen_CXX11_Tensor.patch
+         cxx11_tensor)
+    set(EIGEN_PATCH_COMMAND
+        ${EIGEN_PATCH_COMMAND} && patch -Nd
+        ${SOURCE_DIR}/unsupported/Eigen/CXX11/ < ${cxx11_tensor})
+    file(
+      TO_NATIVE_PATH
+      ${PADDLE_SOURCE_DIR}/patches/eigen/unsupported_Eigen_CXX11_src_Tensor_TensorContractionGpu.h.patch
+      tensor_contraction_gpu_header)
+    set(EIGEN_PATCH_COMMAND
+        ${EIGEN_PATCH_COMMAND} && patch -Nd
+        ${SOURCE_DIR}/unsupported/Eigen/CXX11/src/Tensor/ <
+        ${tensor_contraction_gpu_header})
+    file(
+      TO_NATIVE_PATH
+      ${PADDLE_SOURCE_DIR}/patches/eigen/unsupported_Eigen_CXX11_src_Tensor_TensorDeviceDefault.h.patch
+      tensor_device_default_header)
+    set(EIGEN_PATCH_COMMAND
+        ${EIGEN_PATCH_COMMAND} && patch -Nd
+        ${SOURCE_DIR}/unsupported/Eigen/CXX11/src/Tensor/ <
+        ${tensor_device_default_header})
+    file(
+      TO_NATIVE_PATH
+      ${PADDLE_SOURCE_DIR}/patches/eigen/unsupported_Eigen_CXX11_src_Tensor_TensorGpuHipCudaDefines.h.patch
+      tensor_gpu_hip_cuda_defines_header)
+    set(EIGEN_PATCH_COMMAND
+        ${EIGEN_PATCH_COMMAND} && patch -Nd
+        ${SOURCE_DIR}/unsupported/Eigen/CXX11/src/Tensor/ <
+        ${tensor_gpu_hip_cuda_defines_header})
+    file(
+      TO_NATIVE_PATH
+      ${PADDLE_SOURCE_DIR}/patches/eigen/unsupported_Eigen_CXX11_src_Tensor_TensorReduction.h.patch
+      tensor_reduction_header)
+    set(EIGEN_PATCH_COMMAND
+        ${EIGEN_PATCH_COMMAND} && patch -Nd
+        ${SOURCE_DIR}/unsupported/Eigen/CXX11/src/Tensor/ <
+        ${tensor_reduction_header})
+    file(TO_NATIVE_PATH ${PADDLE_SOURCE_DIR}/patches/eigen/Eigen_CORE.patch
+         eigen_core)
+    set(EIGEN_PATCH_COMMAND ${EIGEN_PATCH_COMMAND} && patch -Nd
+                            ${SOURCE_DIR}/Eigen/ < ${eigen_core})
+    file(
+      TO_NATIVE_PATH
+      ${PADDLE_SOURCE_DIR}/patches/eigen/unsupported_Eigen_CXX11_src_Tensor_TensorDeviceGpu.h.patch
+      tensor_device_gpu_header)
+    set(EIGEN_PATCH_COMMAND
+        ${EIGEN_PATCH_COMMAND} && patch -Nd
+        ${SOURCE_DIR}/unsupported/Eigen/CXX11/src/Tensor/ <
+        ${tensor_device_gpu_header})
+  endif()
 endif()
 
 set(EIGEN_INCLUDE_DIR ${SOURCE_DIR})
 
@@ -246,6 +246,11 @@ if(WITH_GPU)
   set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} ${SAFE_GPU_COMMON_FLAGS}")
 endif()
 
+if(WITH_MUSA)
+  set(CMAKE_MUSA_FLAGS "${CMAKE_MUSA_FLAGS} ${SAFE_GPU_COMMON_FLAGS}")
+endif()
+
+
 if(WITH_ROCM)
   set(HIP_HIPCC_FLAGS "${HIP_HIPCC_FLAGS} ${SAFE_GPU_COMMON_FLAGS}")
 endif()