[SDAA]update sdaa codes for 3.0.0-rc (#1604)

Author: continue-coding

backends/sdaa/CMakeLists.txt

@@ -1,15 +1,17 @@
 cmake_minimum_required(VERSION 3.10)
 
 project(paddle-sdaa CXX C)
-add_definitions(-std=c++14)
+add_definitions(-std=c++17)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 
 option(WITH_TESTING "compile with unit testing" ON)
 option(NATIVE_SDAA "use native sdaa lib" ON)
 option(WITH_MKLDNN "compile with MKLDNN support" ON)
 option(WITH_SW "compile with sw arch support" OFF)
+option(WITH_LOONGARCH "compile with loong arch support" OFF)
 option(WITH_GIT_COMMIT "compile with git commit print" ON)
 option(WITH_PADDLE_INFO "compile with paddle commit/version print" ON)
+option(WITH_TECO_PADDLE_VERSION "compile with plugin version print" ON)
 
 set(PLUGIN_NAME "paddle-sdaa")
 if(DEFINED ENV{PLUGIN_VERSION})
@@ -21,7 +23,6 @@ endif()
 include(paddle)
 include(generic)
 include(teco)
-include(third_party)
 
 include_directories(
   ${PADDLE_INC_DIR}
@@ -30,7 +31,8 @@ include_directories(
   ${EXTEND_OP_INC}
   ${SDPTI_INC}
   ${TBLAS_INC}
-  ${TECODNN_CUSTOM_INC}
+  ${TECOCUSTOM_EXT_INC}
+  ${TECOCUSTOM_INC}
   ${TCCL_INC}
   ${CLANG_INC})
 
@@ -46,6 +48,10 @@ if(WITH_SW)
   add_definitions(-DPADDLE_WITH_SW)
 endif()
 
+if(WITH_LOONGARCH)
+  add_definitions(-DPADDLE_WITH_LOONGARCH)
+endif()
+
 if(WITH_GIT_COMMIT)
   execute_process(
     COMMAND git rev-parse --short HEAD
@@ -54,6 +60,10 @@ if(WITH_GIT_COMMIT)
   add_definitions(-DGIT_COMMIT_ID=\"${GIT_COMMIT_ID}\")
 endif()
 
+if(WITH_TECO_PADDLE_VERSION)
+  add_definitions(-DTECO_PADDLE_VERSION=\"${PLUGIN_VERSION}\")
+endif()
+
 if(WITH_PADDLE_INFO)
   get_paddle_info(PADDLE_COMMIT_ID PADDLE_FULL_VERSION PADDLE_BUILD_ENV_PATH)
   add_definitions(-DPADDLE_COMMIT_ID=\"${PADDLE_COMMIT_ID}\")
@@ -95,7 +105,8 @@ target_link_libraries(${VERSION_DUMP_TARGET} PRIVATE ${TCCL_LIB})
 target_link_libraries(${VERSION_DUMP_TARGET} PRIVATE ${SDAA_LIB})
 target_link_libraries(${VERSION_DUMP_TARGET} PRIVATE ${TECODNN_LIB})
 target_link_libraries(${VERSION_DUMP_TARGET} PRIVATE ${TBLAS_LIB})
-target_link_libraries(${VERSION_DUMP_TARGET} PRIVATE ${TECODNN_CUSTOM_LIB})
+target_link_libraries(${VERSION_DUMP_TARGET} PRIVATE ${TECOCUSTOM_EXT_LIB})
+target_link_libraries(${VERSION_DUMP_TARGET} PRIVATE ${TECOCUSTOM_LIB})
 
 add_custom_command(
   TARGET ${VERSION_DUMP_TARGET}
@@ -114,6 +125,8 @@ set_target_properties(
 target_include_directories(${PLUGIN_NAME} PRIVATE ${PADDLE_SDAA_TOOLS_DIR})
 
 # link third_party
+include(third_party)
+add_dependencies(${VERSION_DUMP_TARGET} third_party)
 add_dependencies(${PLUGIN_NAME} third_party)
 target_link_libraries(${PLUGIN_NAME} PRIVATE gflags glog)
 
@@ -127,7 +140,8 @@ target_link_libraries(${PLUGIN_NAME} PRIVATE ${PADDLE_CORE_LIB})
 target_link_libraries(${PLUGIN_NAME} PRIVATE ${TBLAS_LIB})
 target_link_libraries(${PLUGIN_NAME} PRIVATE stdc++fs)
 target_link_libraries(${PLUGIN_NAME} PRIVATE ${TCCL_LIB})
-target_link_libraries(${PLUGIN_NAME} PRIVATE ${TECODNN_CUSTOM_LIB})
+target_link_libraries(${PLUGIN_NAME} PRIVATE ${TECOCUSTOM_EXT_LIB})
+target_link_libraries(${PLUGIN_NAME} PRIVATE ${TECOCUSTOM_LIB})
 
 # testing
 if(WITH_TESTING)

backends/sdaa/README.md

@@ -8,25 +8,28 @@ Please refer to the following steps to compile, install and verify the custom de
 
 | Module      | Version  |
 | ---------   | -------- |
-| TecoDriver  | 1.1.0    |
-| TecoToolkit | 1.1.0    |
+| TecoDriver  | 2.0.2    |
+| TecoToolkit | 2.0.2    |
 
 ## Prepare environment and source code
 ```bash
 # 1. pull PaddlePaddle Tecorigin SDAA development docker image
-wget http://mirrors.tecorigin.com/repository/teco-docker-tar-repo/release/ubuntu22.04/x86_64/1.1.0/paddle-1.1.0-paddle_sdaa1.1.0.tar
-docker load < paddle-1.1.0-paddle_sdaa1.1.0.tar
+wget http://mirrors.tecorigin.com/repository/teco-docker-tar-repo/release/ubuntu22.04/x86_64/2.0.2/paddle-2.0.2-paddle_sdaa2.0.2.tar
+docker load < paddle-2.0.2-paddle_sdaa2.0.2.tar
 
 # 2. refer to the following commands to start docker container and activate conda environment (PaddlePaddle framwork has been installed in the conda environment)
 docker run -it --name="paddle_sdaa_dev" --net=host -v $(pwd):/work \
 --device=/dev/tcaicard0 --device=/dev/tcaicard1 \
 --device=/dev/tcaicard2 --device=/dev/tcaicard3 \
 --cap-add SYS_PTRACE --cap-add SYS_ADMIN --shm-size 64g \
-jfrog.tecorigin.net/tecotp-docker/release/ubuntu22.04/x86_64/paddle:1.1.0-paddle_sdaa1.1.0 /bin/bash
+jfrog.tecorigin.net/tecotp-docker/release/ubuntu22.04/x86_64/paddle:2.0.2-paddle_sdaa2.0.2 /bin/bash
 
-conda activate paddle_env
+conda activate paddle_env_py310
 
-# 3. clone the source code
+# 3. install paddlepaddle main framework
+python -m pip install --pre paddlepaddle -i https://www.paddlepaddle.org.cn/packages/nightly/cpu/ --force-reinstall
+
+# 4. clone the source code
 git clone https://github.com/PaddlePaddle/PaddleCustomDevice
 cd PaddleCustomDevice
 ```

backends/sdaa/README_cn.md

@@ -8,25 +8,28 @@
 
 | 组件         | 版本     |
 | ---------   | -------- |
-| TecoDriver  | 1.1.0    |
-| TecoToolkit | 1.1.0    |
+| TecoDriver  | 2.0.2    |
+| TecoToolkit | 2.0.2    |
 
 ## 环境准备与源码同步
 ```bash
 # 1. 拉取开发镜像
-wget http://mirrors.tecorigin.com/repository/teco-docker-tar-repo/release/ubuntu22.04/x86_64/1.1.0/paddle-1.1.0-paddle_sdaa1.1.0.tar
-docker load < paddle-1.1.0-paddle_sdaa1.1.0.tar
+wget http://mirrors.tecorigin.com/repository/teco-docker-tar-repo/release/ubuntu22.04/x86_64/2.0.2/paddle-2.0.2-paddle_sdaa2.0.2.tar
+docker load < paddle-2.0.2-paddle_sdaa2.0.2.tar
 
 # 2. 参考如下命令启动容器并激活 conda 环境（conda 环境中已安装 PaddlePaddle 主框架）
 docker run -it --name="paddle_sdaa_dev" --net=host -v $(pwd):/work \
 --device=/dev/tcaicard0 --device=/dev/tcaicard1 \
 --device=/dev/tcaicard2 --device=/dev/tcaicard3 \
 --cap-add SYS_PTRACE --cap-add SYS_ADMIN --shm-size 64g \
-jfrog.tecorigin.net/tecotp-docker/release/ubuntu22.04/x86_64/paddle:1.1.0-paddle_sdaa1.1.0 /bin/bash
+jfrog.tecorigin.net/tecotp-docker/release/ubuntu22.04/x86_64/paddle:2.0.2-paddle_sdaa2.0.2 /bin/bash
 
-conda activate paddle_env
+conda activate paddle_env_py310
 
-# 3. 克隆 PaddleCustomDevice 源码
+# 3. 安装 paddlepaddle 主框架
+python -m pip install --pre paddlepaddle -i https://www.paddlepaddle.org.cn/packages/nightly/cpu/ --force-reinstall
+
+# 4. 克隆 PaddleCustomDevice 源码
 git clone https://github.com/PaddlePaddle/PaddleCustomDevice
 cd PaddleCustomDevice
 ```

backends/sdaa/cmake/external/mkldnn.cmake

@@ -0,0 +1 @@
+../../../../cmake/external/onednn.cmake

backends/sdaa/cmake/external/onednn.cmake

@@ -70,36 +70,65 @@ endif()
 
 include_directories(${TBLAS_INC})
 
-if(NOT DEFINED ENV{TECODNN_CUSTOM_ROOT})
+if(NOT DEFINED ENV{TECOCUSTOM_EXT_ROOT})
   message(
     FATAL
-    "Cannot find tecodnn-custom Library, please set TECODNN_CUSTOM_ROOT correctly."
+    "Cannot find tecocustom-ext Library, please set TECOCUSTOM_EXT_ROOT correctly."
   )
 endif()
-set(TECODNN_CUSTOM_PATH $ENV{TECODNN_CUSTOM_ROOT})
+set(TECOCUSTOM_EXT_PATH $ENV{TECOCUSTOM_EXT_ROOT})
 
 find_path(
-  TECODNN_CUSTOM_INC
+  TECOCUSTOM_EXT_INC
   NAMES "tecodnn_custom.h"
-  PATHS ${TECODNN_CUSTOM_PATH}/include
+  PATHS ${TECOCUSTOM_EXT_PATH}/include
   NO_DEFAULT_PATH)
 find_library(
-  TECODNN_CUSTOM_LIB
+  TECOCUSTOM_EXT_LIB
   NAMES "tecodnn_ext"
-  PATHS ${TECODNN_CUSTOM_PATH}/lib64
+  PATHS ${TECOCUSTOM_EXT_PATH}/lib64
   NO_DEFAULT_PATH)
 
-if(TECODNN_CUSTOM_INC AND TECODNN_CUSTOM_LIB)
-  message(STATUS "Found TECODNN_CUSTOM_INC: ${TECODNN_CUSTOM_INC}")
-  message(STATUS "Found TECODNN_CUSTOM_LIB: ${TECODNN_CUSTOM_LIB}")
-elseif(NOT TECODNN_CUSTOM_INC)
+if(TECOCUSTOM_EXT_INC AND TECOCUSTOM_EXT_LIB)
+  message(STATUS "Found TECOCUSTOM_EXT_INC: ${TECOCUSTOM_EXT_INC}")
+  message(STATUS "Found TECOCUSTOM_EXT_LIB: ${TECOCUSTOM_EXT_LIB}")
+elseif(NOT TECOCUSTOM_EXT_INC)
   message(FATAL
-          "Cannot find tecodnn_custom.h in ${TECODNN_CUSTOM_PATH}/include")
-elseif(NOT TECODNN_CUSTOM_LIB)
-  message(FATAL "Cannot find libtecodnn_ext in ${TECODNN_CUSTOM_PATH}/lib")
+          "Cannot find tecodnn_custom.h in ${TECOCUSTOM_EXT_PATH}/include")
+elseif(NOT TECOCUSTOM_EXT_LIB)
+  message(FATAL "Cannot find libtecodnn_ext in ${TECOCUSTOM_EXT_PATH}/lib")
 endif()
 
-include_directories(${TECODNN_CUSTOM_INC})
+include_directories(${TECOCUSTOM_EXT_INC})
+
+if(NOT DEFINED ENV{TECOCUSTOM_ROOT})
+  message(
+    FATAL
+    "Cannot find tecocustom Library, please set TECOCUSTOM_ROOT correctly.")
+endif()
+set(TECOCUSTOM_PATH $ENV{TECOCUSTOM_ROOT})
+
+find_path(
+  TECOCUSTOM_INC
+  NAMES "tecocustom.h"
+  PATHS ${TECOCUSTOM_PATH}/include
+  NO_DEFAULT_PATH)
+find_library(
+  TECOCUSTOM_LIB
+  NAMES "tecocustom"
+  PATHS ${TECOCUSTOM_PATH}/lib64
+  NO_DEFAULT_PATH)
+
+if(TECOCUSTOM_INC AND TECOCUSTOM_LIB)
+  message(STATUS "Found TECOCUSTOM_INC: ${TECOCUSTOM_INC}")
+  message(STATUS "Found TECOCUSTOM_LIB: ${TECOCUSTOM_LIB}")
+elseif(NOT TECOCUSTOM_INC)
+  message(FATAL "Cannot find tecocustom.h in ${TECOCUSTOM_PATH}/include")
+elseif(NOT TECOCUSTOM_LIB)
+  message(FATAL "Cannot find libtecocustom in ${TECOCUSTOM_PATH}/lib")
+endif()
+
+include_directories(${TECOCUSTOM_INC})
 
 if(NOT DEFINED ENV{SDPTI_ROOT})
   message(FATAL "Cannot find SDPTI_ROOT, please set SDPTI_ROOT correctly.")

backends/sdaa/cmake/teco.cmake

@@ -55,9 +55,9 @@ if(WITH_TESTING)
 endif()
 
 if(WITH_MKLDNN AND NOT WITH_ARM)
-  check_update_submodule(mkldnn)
-  include(external/mkldnn) # mkldnn
-  list(APPEND third_party_deps extern_mkldnn)
+  check_update_submodule(onednn)
+  include(external/onednn) # mkldnn
+  list(APPEND third_party_deps extern_onednn)
 endif()
 
 include(external/tabulate) # tabulate