Rename mkldnn onednn in cmake files (#63209)

co63oc · web-flow · commit 42da9ef33014 · 2024-04-07T11:04:21.000+08:00
* Fix

* Fix

* Fix

* Fix
diff --git a/.gitmodules b/.gitmodules
@@ -70,8 +70,8 @@
 	path = third_party/xbyak
 	url = https://github.com/herumi/xbyak.git
 	ignore = dirty
-[submodule "third_party/mkldnn"]
-	path = third_party/mkldnn
+[submodule "third_party/onednn"]
+	path = third_party/onednn
 	url = https://github.com/oneapi-src/oneDNN.git
 	ignore = dirty
 [submodule "third_party/flashattn"]
diff --git a/cmake/cinn.cmake b/cmake/cinn.cmake
@@ -179,7 +179,7 @@ if(WITH_MKL)
   add_dependencies(cinnapi cinn_mklml)
   if(WITH_MKLDNN)
     target_link_libraries(cinnapi ${MKLDNN_LIB})
-    add_dependencies(cinnapi ${MKLDNN_PROJECT})
+    add_dependencies(cinnapi ${ONEDNN_PROJECT})
   endif()
 endif()
 
@@ -240,7 +240,7 @@ function(gen_cinncore LINKTYPE)
     add_dependencies(${CINNCORE_TARGET} cinn_mklml)
     if(WITH_MKLDNN)
       target_link_libraries(${CINNCORE_TARGET} ${MKLDNN_LIB})
-      add_dependencies(${CINNCORE_TARGET} ${MKLDNN_PROJECT})
+      add_dependencies(${CINNCORE_TARGET} ${ONEDNN_PROJECT})
     endif()
   endif()
 
diff --git a/cmake/external/onednn.cmake b/cmake/external/onednn.cmake
@@ -14,13 +14,13 @@
 
 include(ExternalProject)
 
-set(MKLDNN_PROJECT "extern_mkldnn")
-set(MKLDNN_PREFIX_DIR ${THIRD_PARTY_PATH}/mkldnn)
-set(MKLDNN_INSTALL_DIR ${THIRD_PARTY_PATH}/install/mkldnn)
+set(ONEDNN_PROJECT "extern_onednn")
+set(ONEDNN_PREFIX_DIR ${THIRD_PARTY_PATH}/onednn)
+set(MKLDNN_INSTALL_DIR ${THIRD_PARTY_PATH}/install/onednn)
 set(MKLDNN_INC_DIR
     "${MKLDNN_INSTALL_DIR}/include"
-    CACHE PATH "mkldnn include directory." FORCE)
-set(SOURCE_DIR ${PADDLE_SOURCE_DIR}/third_party/mkldnn)
+    CACHE PATH "oneDNN include directory." FORCE)
+set(SOURCE_DIR ${PADDLE_SOURCE_DIR}/third_party/onednn)
 
 # Introduce variables:
 # * CMAKE_INSTALL_LIBDIR
@@ -36,28 +36,28 @@ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH}"
                         "${MKLDNN_INSTALL_DIR}/${LIBDIR}")
 
 include_directories(${MKLDNN_INC_DIR}
-)# For MKLDNN code to include internal headers.
+)# For oneDNN code to include internal headers.
 
 if(NOT WIN32)
-  set(MKLDNN_FLAG
+  set(ONEDNN_FLAG
       "-Wno-error=strict-overflow -Wno-error=unused-result -Wno-error=array-bounds"
   )
-  set(MKLDNN_FLAG "${MKLDNN_FLAG} -Wno-unused-result -Wno-unused-value")
-  set(MKLDNN_CFLAG "${CMAKE_C_FLAGS} ${MKLDNN_FLAG}")
-  set(MKLDNN_CXXFLAG "${CMAKE_CXX_FLAGS} ${MKLDNN_FLAG}")
-  set(MKLDNN_CXXFLAG_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
-  set(MKLDNN_CFLAG_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
+  set(ONEDNN_FLAG "${ONEDNN_FLAG} -Wno-unused-result -Wno-unused-value")
+  set(ONEDNN_CFLAG "${CMAKE_C_FLAGS} ${ONEDNN_FLAG}")
+  set(ONEDNN_CXXFLAG "${CMAKE_CXX_FLAGS} ${ONEDNN_FLAG}")
+  set(ONEDNN_CXXFLAG_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
+  set(ONEDNN_CFLAG_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
   set(MKLDNN_LIB
       "${MKLDNN_INSTALL_DIR}/${LIBDIR}/libdnnl.so"
-      CACHE FILEPATH "mkldnn library." FORCE)
+      CACHE FILEPATH "oneDNN library." FORCE)
 else()
-  set(MKLDNN_CXXFLAG "${CMAKE_CXX_FLAGS} /EHsc")
-  set(MKLDNN_CFLAG "${CMAKE_C_FLAGS}")
-  string(REPLACE "/O2 " "" MKLDNN_CFLAG_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
-  string(REPLACE "/O2 " "" MKLDNN_CXXFLAG_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
+  set(ONEDNN_CXXFLAG "${CMAKE_CXX_FLAGS} /EHsc")
+  set(ONEDNN_CFLAG "${CMAKE_C_FLAGS}")
+  string(REPLACE "/O2 " "" ONEDNN_CFLAG_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
+  string(REPLACE "/O2 " "" ONEDNN_CXXFLAG_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
   set(MKLDNN_LIB
       "${MKLDNN_INSTALL_DIR}/bin/mkldnn.lib"
-      CACHE FILEPATH "mkldnn library." FORCE)
+      CACHE FILEPATH "oneDNN library." FORCE)
 endif()
 
 if(LINUX)
@@ -67,21 +67,21 @@ else()
 endif()
 
 ExternalProject_Add(
-  ${MKLDNN_PROJECT}
+  ${ONEDNN_PROJECT}
   ${EXTERNAL_PROJECT_LOG_ARGS}
   SOURCE_DIR ${SOURCE_DIR}
-  DEPENDS ${MKLDNN_DEPENDS}
-  PREFIX ${MKLDNN_PREFIX_DIR}
+  DEPENDS ${ONEDNN_DEPENDS}
+  PREFIX ${ONEDNN_PREFIX_DIR}
   UPDATE_COMMAND ""
   #BUILD_ALWAYS        1
   CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
              -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-             -DCMAKE_CXX_FLAGS=${MKLDNN_CXXFLAG}
-             -DCMAKE_CXX_FLAGS_RELEASE=${MKLDNN_CXXFLAG_RELEASE}
+             -DCMAKE_CXX_FLAGS=${ONEDNN_CXXFLAG}
+             -DCMAKE_CXX_FLAGS_RELEASE=${ONEDNN_CXXFLAG_RELEASE}
              -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}
-             -DCMAKE_C_FLAGS=${MKLDNN_CFLAG}
+             -DCMAKE_C_FLAGS=${ONEDNN_CFLAG}
              -DCMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG}
-             -DCMAKE_C_FLAGS_RELEASE=${MKLDNN_CFLAG_RELEASE}
+             -DCMAKE_C_FLAGS_RELEASE=${ONEDNN_CFLAG_RELEASE}
              -DCMAKE_INSTALL_PREFIX=${MKLDNN_INSTALL_DIR}
              -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
              -DCMAKE_POSITION_INDEPENDENT_CODE=ON
@@ -90,7 +90,7 @@ ExternalProject_Add(
   CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${MKLDNN_INSTALL_DIR}
   BUILD_BYPRODUCTS ${BUILD_BYPRODUCTS_ARGS})
 
-message(STATUS "MKLDNN library: ${MKLDNN_LIB}")
+message(STATUS "OneDNN library: ${MKLDNN_LIB}")
 add_definitions(-DPADDLE_WITH_DNNL)
 # copy the real so.0 lib to install dir
 # it can be directly contained in wheel or capi
@@ -123,21 +123,21 @@ if(WIN32)
     COMMAND lib /def:${MKLDNN_INSTALL_DIR}/bin/mkldnn.def /out:${MKLDNN_LIB}
             /machine:x64
     COMMENT "Generate mkldnn.lib manually--->"
-    DEPENDS ${MKLDNN_PROJECT}
+    DEPENDS ${ONEDNN_PROJECT}
     VERBATIM)
-  add_custom_target(mkldnn_cmd ALL DEPENDS ${MKLDNN_LIB})
+  add_custom_target(onednn_cmd ALL DEPENDS ${MKLDNN_LIB})
 else()
   set(MKLDNN_SHARED_LIB ${MKLDNN_INSTALL_DIR}/libdnnl.so.3)
   add_custom_command(
     OUTPUT ${MKLDNN_SHARED_LIB}
     COMMAND ${CMAKE_COMMAND} -E copy ${MKLDNN_LIB} ${MKLDNN_SHARED_LIB}
-    DEPENDS ${MKLDNN_PROJECT})
-  add_custom_target(mkldnn_cmd ALL DEPENDS ${MKLDNN_SHARED_LIB})
+    DEPENDS ${ONEDNN_PROJECT})
+  add_custom_target(onednn_cmd ALL DEPENDS ${MKLDNN_SHARED_LIB})
 endif()
 
-# generate a static dummy target to track mkldnn dependencies
-# for cc_library(xxx SRCS xxx.c DEPS mkldnn)
-generate_dummy_static_lib(LIB_NAME "mkldnn" GENERATOR "mkldnn.cmake")
+# generate a static dummy target to track onednn dependencies
+# for cc_library(xxx SRCS xxx.c DEPS onednn)
+generate_dummy_static_lib(LIB_NAME "onednn" GENERATOR "onednn.cmake")
 
-target_link_libraries(mkldnn ${MKLDNN_LIB} ${MKLML_IOMP_LIB})
-add_dependencies(mkldnn ${MKLDNN_PROJECT} mkldnn_cmd)
+target_link_libraries(onednn ${MKLDNN_LIB} ${MKLML_IOMP_LIB})
+add_dependencies(onednn ${ONEDNN_PROJECT} onednn_cmd)
diff --git a/cmake/generic.cmake b/cmake/generic.cmake
@@ -599,8 +599,8 @@ function(paddle_test_build TARGET_NAME)
     add_dependencies(${TARGET_NAME} ${paddle_lib} ${paddle_test_DEPS} common
                      paddle_gtest_main_new)
     if(WITH_MKLDNN)
-      target_link_libraries(${TARGET_NAME} mkldnn)
-      add_dependencies(${TARGET_NAME} mkldnn)
+      target_link_libraries(${TARGET_NAME} onednn)
+      add_dependencies(${TARGET_NAME} onednn)
     endif()
     if(WITH_SHARED_PHI)
       target_link_libraries(${TARGET_NAME} $<TARGET_LINKER_FILE:phi>)
diff --git a/cmake/inference_lib.cmake b/cmake/inference_lib.cmake
@@ -115,7 +115,7 @@ function(copy_part_of_third_party TARGET DST)
   endif()
 
   if(WITH_MKLDNN)
-    set(dst_dir "${DST}/third_party/install/mkldnn")
+    set(dst_dir "${DST}/third_party/install/onednn")
     if(WIN32)
       copy(
         ${TARGET}
diff --git a/cmake/third_party.cmake b/cmake/third_party.cmake
@@ -363,8 +363,8 @@ elseif(${CBLAS_PROVIDER} STREQUAL EXTERN_OPENBLAS)
 endif()
 
 if(WITH_MKLDNN)
-  include(external/mkldnn) # download, build, install mkldnn
-  list(APPEND third_party_deps extern_mkldnn)
+  include(external/onednn) # download, build, install onednn
+  list(APPEND third_party_deps extern_onednn)
 endif()
 
 include(external/protobuf) # find first, then download, build, install protobuf
diff --git a/paddle/fluid/distributed/index_dataset/CMakeLists.txt b/paddle/fluid/distributed/index_dataset/CMakeLists.txt
@@ -7,7 +7,7 @@ if(WITH_MKLDNN)
   cc_library(
     index_sampler
     SRCS index_sampler.cc
-    DEPS xxhash index_wrapper eigen3 mkldnn)
+    DEPS xxhash index_wrapper eigen3 onednn)
 else()
   cc_library(
     index_sampler
diff --git a/paddle/fluid/eager/auto_code_generator/CMakeLists.txt b/paddle/fluid/eager/auto_code_generator/CMakeLists.txt
@@ -99,7 +99,7 @@ if(WIN32)
       OUTPUT ${eager_generator_path}/mkldnn.dll
       COMMAND ${CMAKE_COMMAND} -E copy ${MKLDNN_SHARED_LIB}
               ${eager_generator_path}
-      DEPENDS mkldnn)
+      DEPENDS onednn)
     list(APPEND EAGER_CODEGEN_DEPS ${eager_generator_path}/mkldnn.dll)
   endif()
 
diff --git a/paddle/fluid/framework/CMakeLists.txt b/paddle/fluid/framework/CMakeLists.txt
@@ -153,10 +153,10 @@ if(WITH_XPU)
   target_link_libraries(var_type_traits dynload_xpti)
 endif()
 
-# every source file that includes "dnnl.h" must depends on mkldnn
-# or, the first one should depends on mkldnn
+# every source file that includes "dnnl.h" must depends on onednn
+# or, the first one should depends on onednn
 if(WITH_MKLDNN)
-  add_dependencies(var_type_traits mkldnn)
+  add_dependencies(var_type_traits onednn)
 endif()
 
 set(BRPC_DEPS "")
@@ -273,10 +273,10 @@ cc_library(
   SRCS shape_inference.cc
   DEPS phi common attribute selected_rows_utils)
 
-# every source file that includes "dnnl.h" must depends on mkldnn
-# or, the first one should depends on mkldnn
+# every source file that includes "dnnl.h" must depends on onednn
+# or, the first one should depends on onednn
 if(WITH_MKLDNN)
-  add_dependencies(shape_inference mkldnn)
+  add_dependencies(shape_inference onednn)
 endif()
 
 cc_library(
@@ -955,7 +955,7 @@ cc_library(
 target_link_libraries(type_info pir op_dialect)
 add_dependencies(type_info framework_proto auto_parallel_proto xxhash)
 if(WITH_MKLDNN)
-  add_dependencies(type_info mkldnn)
+  add_dependencies(type_info onednn)
 endif()
 
 set(FLUID_FRAMEWORK_MODULES
diff --git a/paddle/fluid/framework/details/CMakeLists.txt b/paddle/fluid/framework/details/CMakeLists.txt
@@ -55,7 +55,7 @@ set(op_handle_deps
     reference_count_pass_helper)
 
 if(WITH_MKLDNN)
-  set(op_handle_deps ${op_handle_deps} mkldnn)
+  set(op_handle_deps ${op_handle_deps} onednn)
 endif()
 
 if(WITH_DGC)
diff --git a/paddle/fluid/framework/io/CMakeLists.txt b/paddle/fluid/framework/io/CMakeLists.txt
@@ -15,5 +15,5 @@ cc_library(
   DEPS ${framework_io_deps})
 
 if(WITH_MKLDNN)
-  add_dependencies(framework_io mkldnn)
+  add_dependencies(framework_io onednn)
 endif()
diff --git a/paddle/fluid/framework/new_executor/CMakeLists.txt b/paddle/fluid/framework/new_executor/CMakeLists.txt
@@ -55,5 +55,5 @@ cc_library(
 add_dependencies(standalone_executor xxhash framework_proto)
 
 if(WITH_MKLDNN)
-  add_dependencies(standalone_executor mkldnn)
+  add_dependencies(standalone_executor onednn)
 endif()
diff --git a/paddle/fluid/framework/paddle2cinn/CMakeLists.txt b/paddle/fluid/framework/paddle2cinn/CMakeLists.txt
@@ -18,7 +18,7 @@ set(paddle2cinn_deps
     parallel_executor
     common)
 if(WITH_MKLDNN)
-  set(paddle2cinn ${paddle2cinn} mkldnn)
+  set(paddle2cinn ${paddle2cinn} onednn)
 endif()
 
 if(WITH_TESTING)
diff --git a/paddle/fluid/inference/api/demo_ci/CMakeLists.txt b/paddle/fluid/inference/api/demo_ci/CMakeLists.txt
@@ -155,13 +155,13 @@ if(WITH_MKL)
         ${MATH_LIB_PATH}/lib/libmklml_intel${CMAKE_SHARED_LIBRARY_SUFFIX}
         ${MATH_LIB_PATH}/lib/libiomp5${CMAKE_SHARED_LIBRARY_SUFFIX})
   endif()
-  set(MKLDNN_PATH "${PADDLE_LIB_THIRD_PARTY_PATH}mkldnn")
-  if(EXISTS ${MKLDNN_PATH})
-    include_directories("${MKLDNN_PATH}/include")
+  set(ONEDNN_PATH "${PADDLE_LIB_THIRD_PARTY_PATH}onednn")
+  if(EXISTS ${ONEDNN_PATH})
+    include_directories("${ONEDNN_PATH}/include")
     if(WIN32)
-      set(MKLDNN_LIB ${MKLDNN_PATH}/lib/mkldnn.lib)
+      set(MKLDNN_LIB ${ONEDNN_PATH}/lib/mkldnn.lib)
     else()
-      set(MKLDNN_LIB ${MKLDNN_PATH}/lib/libdnnl.so.3)
+      set(MKLDNN_LIB ${ONEDNN_PATH}/lib/libdnnl.so.3)
     endif()
   endif()
 else()
@@ -309,7 +309,7 @@ if(WIN32)
               ${LIB_PATH}
       COMMAND ${CMAKE_COMMAND} -E copy ${MATH_LIB_PATH}/lib/libiomp5md.dll
               ${LIB_PATH}
-      COMMAND ${CMAKE_COMMAND} -E copy ${MKLDNN_PATH}/lib/mkldnn.dll
+      COMMAND ${CMAKE_COMMAND} -E copy ${ONEDNN_PATH}/lib/mkldnn.dll
               ${LIB_PATH})
   else()
     add_custom_command(
diff --git a/paddle/fluid/memory/CMakeLists.txt b/paddle/fluid/memory/CMakeLists.txt
@@ -3,11 +3,11 @@ add_subdirectory(allocation)
 file(GLOB fluid_memory_srcs "*.cc")
 
 if(WITH_MKLDNN)
-  set(MKLDNN_CTX_DEPS mkldnn)
+  set(ONEDNN_CTX_DEPS onednn)
 else()
-  set(MKLDNN_CTX_DEPS)
+  set(ONEDNN_CTX_DEPS)
 endif()
-set(fluid_memory_deps place enforce common allocator ${MKLDNN_CTX_DEPS})
+set(fluid_memory_deps place enforce common allocator ${ONEDNN_CTX_DEPS})
 
 cc_library(
   fluid_memory
diff --git a/paddle/fluid/platform/CMakeLists.txt b/paddle/fluid/platform/CMakeLists.txt
@@ -42,9 +42,9 @@ cc_test(
   DEPS place glog phi common)
 
 if(WITH_MKLDNN)
-  set(MKLDNN_CTX_DEPS mkldnn)
+  set(ONEDNN_CTX_DEPS onednn)
 else()
-  set(MKLDNN_CTX_DEPS)
+  set(ONEDNN_CTX_DEPS)
 endif()
 
 add_subdirectory(device)
@@ -126,7 +126,7 @@ cc_library(
        framework_proto
        ${IPU_CTX_DEPS}
        ${GPU_CTX_DEPS}
-       ${MKLDNN_CTX_DEPS}
+       ${ONEDNN_CTX_DEPS}
        ${dgc_deps}
        dlpack
        phi
diff --git a/paddle/fluid/pybind/CMakeLists.txt b/paddle/fluid/pybind/CMakeLists.txt
@@ -403,7 +403,7 @@ if(WITH_PYTHON)
       add_custom_command(
         OUTPUT ${op_impl_path}/mkldnn.dll
         COMMAND ${CMAKE_COMMAND} -E copy ${MKLDNN_SHARED_LIB} ${op_impl_path}
-        DEPENDS mkldnn)
+        DEPENDS onednn)
       list(APPEND OP_IMPL_DEPS ${op_impl_path}/mkldnn.dll)
       list(APPEND EAGER_OP_IMPL_DEPS ${op_impl_path}/mkldnn.dll)
     endif()
@@ -479,7 +479,7 @@ if(WITH_PYTHON)
         OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libdnnl.so.0
         COMMAND ${CMAKE_COMMAND} -E copy ${MKLDNN_SHARED_LIB}
                 ${CMAKE_CURRENT_BINARY_DIR}
-        DEPENDS mkldnn)
+        DEPENDS onednn)
       list(APPEND OP_IMPL_DEPS ${CMAKE_CURRENT_BINARY_DIR}/libdnnl.so.0)
       list(APPEND EAGER_OP_IMPL_DEPS ${CMAKE_CURRENT_BINARY_DIR}/libdnnl.so.0)
     endif()
diff --git a/paddle/phi/CMakeLists.txt b/paddle/phi/CMakeLists.txt
@@ -63,7 +63,7 @@ if(WITH_XBYAK)
 endif()
 
 if(WITH_MKLDNN)
-  list(APPEND PHI_DEPS mkldnn)
+  list(APPEND PHI_DEPS onednn)
 endif()
 
 if(WITH_GLOO)
diff --git a/paddle/scripts/paddle_build.bat b/paddle/scripts/paddle_build.bat
diff --git a/paddle/testing/CMakeLists.txt b/paddle/testing/CMakeLists.txt
diff --git a/test/cpp/inference/infer_ut/CMakeLists.txt b/test/cpp/inference/infer_ut/CMakeLists.txt
diff --git a/third_party/onednn b/third_party/onednn
