Replace MKLDNN_ ONEDNN_ (#63281)

co63oc · web-flow · commit 4227ea568d71 · 2024-04-19T10:22:58.000+08:00
* Fix

* Fix
diff --git a/cmake/cinn.cmake b/cmake/cinn.cmake
@@ -178,7 +178,7 @@ if(WITH_MKL)
   target_link_libraries(cinnapi cinn_mklml)
   add_dependencies(cinnapi cinn_mklml)
   if(WITH_ONEDNN)
-    target_link_libraries(cinnapi ${MKLDNN_LIB})
+    target_link_libraries(cinnapi ${ONEDNN_LIB})
     add_dependencies(cinnapi ${ONEDNN_PROJECT})
   endif()
 endif()
@@ -239,7 +239,7 @@ function(gen_cinncore LINKTYPE)
     target_link_libraries(${CINNCORE_TARGET} cinn_mklml)
     add_dependencies(${CINNCORE_TARGET} cinn_mklml)
     if(WITH_ONEDNN)
-      target_link_libraries(${CINNCORE_TARGET} ${MKLDNN_LIB})
+      target_link_libraries(${CINNCORE_TARGET} ${ONEDNN_LIB})
       add_dependencies(${CINNCORE_TARGET} ${ONEDNN_PROJECT})
     endif()
   endif()
diff --git a/cmake/external/onednn.cmake b/cmake/external/onednn.cmake
@@ -16,9 +16,9 @@ include(ExternalProject)
 
 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"
+set(ONEDNN_INSTALL_DIR ${THIRD_PARTY_PATH}/install/onednn)
+set(ONEDNN_INC_DIR
+    "${ONEDNN_INSTALL_DIR}/include"
     CACHE PATH "oneDNN include directory." FORCE)
 set(SOURCE_DIR ${PADDLE_SOURCE_DIR}/third_party/onednn)
 
@@ -30,12 +30,12 @@ if(CMAKE_INSTALL_LIBDIR MATCHES ".*lib64$")
   set(LIBDIR "lib64")
 endif()
 
-message(STATUS "Set ${MKLDNN_INSTALL_DIR}/${LIBDIR} to runtime path")
+message(STATUS "Set ${ONEDNN_INSTALL_DIR}/${LIBDIR} to runtime path")
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH}"
-                        "${MKLDNN_INSTALL_DIR}/${LIBDIR}")
+                        "${ONEDNN_INSTALL_DIR}/${LIBDIR}")
 
-include_directories(${MKLDNN_INC_DIR}
+include_directories(${ONEDNN_INC_DIR}
 )# For oneDNN code to include internal headers.
 
 if(NOT WIN32)
@@ -47,21 +47,21 @@ if(NOT WIN32)
   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"
+  set(ONEDNN_LIB
+      "${ONEDNN_INSTALL_DIR}/${LIBDIR}/libdnnl.so"
       CACHE FILEPATH "oneDNN library." FORCE)
 else()
   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"
+  set(ONEDNN_LIB
+      "${ONEDNN_INSTALL_DIR}/bin/mkldnn.lib"
       CACHE FILEPATH "oneDNN library." FORCE)
 endif()
 
 if(LINUX)
-  set(BUILD_BYPRODUCTS_ARGS ${MKLDNN_LIB})
+  set(BUILD_BYPRODUCTS_ARGS ${ONEDNN_LIB})
 else()
   set(BUILD_BYPRODUCTS_ARGS "")
 endif()
@@ -82,62 +82,62 @@ ExternalProject_Add(
              -DCMAKE_C_FLAGS=${ONEDNN_CFLAG}
              -DCMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG}
              -DCMAKE_C_FLAGS_RELEASE=${ONEDNN_CFLAG_RELEASE}
-             -DCMAKE_INSTALL_PREFIX=${MKLDNN_INSTALL_DIR}
+             -DCMAKE_INSTALL_PREFIX=${ONEDNN_INSTALL_DIR}
              -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
              -DCMAKE_POSITION_INDEPENDENT_CODE=ON
              -DDNNL_BUILD_TESTS=OFF
              -DDNNL_BUILD_EXAMPLES=OFF
-  CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${MKLDNN_INSTALL_DIR}
+  CMAKE_CACHE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${ONEDNN_INSTALL_DIR}
   BUILD_BYPRODUCTS ${BUILD_BYPRODUCTS_ARGS})
 
-message(STATUS "OneDNN library: ${MKLDNN_LIB}")
+message(STATUS "OneDNN library: ${ONEDNN_LIB}")
 add_definitions(-DPADDLE_WITH_DNNL)
 # copy the real so.0 lib to install dir
 # it can be directly contained in wheel or capi
 if(WIN32)
-  set(MKLDNN_SHARED_LIB ${MKLDNN_INSTALL_DIR}/bin/mkldnn.dll)
+  set(ONEDNN_SHARED_LIB ${ONEDNN_INSTALL_DIR}/bin/mkldnn.dll)
 
-  file(TO_NATIVE_PATH ${MKLDNN_INSTALL_DIR} NATIVE_MKLDNN_INSTALL_DIR)
-  file(TO_NATIVE_PATH ${MKLDNN_SHARED_LIB} NATIVE_MKLDNN_SHARED_LIB)
+  file(TO_NATIVE_PATH ${ONEDNN_INSTALL_DIR} NATIVE_ONEDNN_INSTALL_DIR)
+  file(TO_NATIVE_PATH ${ONEDNN_SHARED_LIB} NATIVE_ONEDNN_SHARED_LIB)
 
   add_custom_command(
-    OUTPUT ${MKLDNN_LIB}
-    COMMAND (copy ${NATIVE_MKLDNN_INSTALL_DIR}\\bin\\dnnl.dll
-             ${NATIVE_MKLDNN_SHARED_LIB} /Y)
-    COMMAND dumpbin /exports ${MKLDNN_INSTALL_DIR}/bin/mkldnn.dll >
-            ${MKLDNN_INSTALL_DIR}/bin/exports.txt
-    COMMAND echo LIBRARY mkldnn > ${MKLDNN_INSTALL_DIR}/bin/mkldnn.def
-    COMMAND echo EXPORTS >> ${MKLDNN_INSTALL_DIR}/bin/mkldnn.def
+    OUTPUT ${ONEDNN_LIB}
+    COMMAND (copy ${NATIVE_ONEDNN_INSTALL_DIR}\\bin\\dnnl.dll
+             ${NATIVE_ONEDNN_SHARED_LIB} /Y)
+    COMMAND dumpbin /exports ${ONEDNN_INSTALL_DIR}/bin/mkldnn.dll >
+            ${ONEDNN_INSTALL_DIR}/bin/exports.txt
+    COMMAND echo LIBRARY mkldnn > ${ONEDNN_INSTALL_DIR}/bin/mkldnn.def
+    COMMAND echo EXPORTS >> ${ONEDNN_INSTALL_DIR}/bin/mkldnn.def
     COMMAND
       echo off && (for
                    /f
                    "skip=19 tokens=4"
                    %A
                    in
-                   (${MKLDNN_INSTALL_DIR}/bin/exports.txt)
+                   (${ONEDNN_INSTALL_DIR}/bin/exports.txt)
                    do
                    echo
                    %A
                    >>
-                   ${MKLDNN_INSTALL_DIR}/bin/mkldnn.def) && echo on
-    COMMAND lib /def:${MKLDNN_INSTALL_DIR}/bin/mkldnn.def /out:${MKLDNN_LIB}
+                   ${ONEDNN_INSTALL_DIR}/bin/mkldnn.def) && echo on
+    COMMAND lib /def:${ONEDNN_INSTALL_DIR}/bin/mkldnn.def /out:${ONEDNN_LIB}
             /machine:x64
     COMMENT "Generate mkldnn.lib manually--->"
     DEPENDS ${ONEDNN_PROJECT}
     VERBATIM)
-  add_custom_target(onednn_cmd ALL DEPENDS ${MKLDNN_LIB})
+  add_custom_target(onednn_cmd ALL DEPENDS ${ONEDNN_LIB})
 else()
-  set(MKLDNN_SHARED_LIB ${MKLDNN_INSTALL_DIR}/libdnnl.so.3)
+  set(ONEDNN_SHARED_LIB ${ONEDNN_INSTALL_DIR}/libdnnl.so.3)
   add_custom_command(
-    OUTPUT ${MKLDNN_SHARED_LIB}
-    COMMAND ${CMAKE_COMMAND} -E copy ${MKLDNN_LIB} ${MKLDNN_SHARED_LIB}
+    OUTPUT ${ONEDNN_SHARED_LIB}
+    COMMAND ${CMAKE_COMMAND} -E copy ${ONEDNN_LIB} ${ONEDNN_SHARED_LIB}
     DEPENDS ${ONEDNN_PROJECT})
-  add_custom_target(onednn_cmd ALL DEPENDS ${MKLDNN_SHARED_LIB})
+  add_custom_target(onednn_cmd ALL DEPENDS ${ONEDNN_SHARED_LIB})
 endif()
 
 # 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(onednn ${MKLDNN_LIB} ${MKLML_IOMP_LIB})
+target_link_libraries(onednn ${ONEDNN_LIB} ${MKLML_IOMP_LIB})
 add_dependencies(onednn ${ONEDNN_PROJECT} onednn_cmd)
diff --git a/cmake/inference_lib.cmake b/cmake/inference_lib.cmake
@@ -119,12 +119,12 @@ function(copy_part_of_third_party TARGET DST)
     if(WIN32)
       copy(
         ${TARGET}
-        SRCS ${MKLDNN_INC_DIR} ${MKLDNN_SHARED_LIB} ${MKLDNN_LIB}
+        SRCS ${ONEDNN_INC_DIR} ${ONEDNN_SHARED_LIB} ${ONEDNN_LIB}
         DSTS ${dst_dir} ${dst_dir}/lib ${dst_dir}/lib)
     else()
       copy(
         ${TARGET}
-        SRCS ${MKLDNN_INC_DIR} ${MKLDNN_SHARED_LIB}
+        SRCS ${ONEDNN_INC_DIR} ${ONEDNN_SHARED_LIB}
         DSTS ${dst_dir} ${dst_dir}/lib)
       if(WITH_STRIP)
         add_custom_command(
diff --git a/cmake/operators.cmake b/cmake/operators.cmake
@@ -162,7 +162,7 @@ function(op_library TARGET)
   set(CUDNN_FILE)
   set(MIOPEN_FILE)
   set(onednn_cc_srcs)
-  set(MKLDNN_FILE)
+  set(ONEDNN_FILE)
   set(op_common_deps operator op_registry phi layer
                      common_infer_shape_functions)
 
@@ -238,9 +238,9 @@ function(op_library TARGET)
       endif()
     endif()
     if(WITH_ONEDNN)
-      string(REPLACE "_op" "_onednn_op" MKLDNN_FILE "${TARGET}")
-      if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/onednn/${MKLDNN_FILE}.cc)
-        list(APPEND onednn_cc_srcs onednn/${MKLDNN_FILE}.cc)
+      string(REPLACE "_op" "_onednn_op" ONEDNN_FILE "${TARGET}")
+      if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/onednn/${ONEDNN_FILE}.cc)
+        list(APPEND onednn_cc_srcs onednn/${ONEDNN_FILE}.cc)
       endif()
     endif()
     if(WITH_XPU)
@@ -612,7 +612,7 @@ function(op_library TARGET)
   # pybind USE_OP_DEVICE_KERNEL for MKLDNN
   if(WITH_ONEDNN AND ${onednn_cc_srcs_len} GREATER 0)
     # Append first implemented MKLDNN activation operator
-    if(${MKLDNN_FILE} STREQUAL "activation_onednn_op")
+    if(${ONEDNN_FILE} STREQUAL "activation_onednn_op")
       file(APPEND ${pybind_file} "USE_OP_DEVICE_KERNEL(softplus, MKLDNN);\n")
     else()
       foreach(onednn_src ${onednn_cc_srcs})
diff --git a/paddle/fluid/eager/auto_code_generator/CMakeLists.txt b/paddle/fluid/eager/auto_code_generator/CMakeLists.txt
@@ -97,7 +97,7 @@ if(WIN32)
     message("Copied mkldnn.dll for Eager AutoCodeGen")
     add_custom_command(
       OUTPUT ${eager_generator_path}/mkldnn.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${MKLDNN_SHARED_LIB}
+      COMMAND ${CMAKE_COMMAND} -E copy ${ONEDNN_SHARED_LIB}
               ${eager_generator_path}
       DEPENDS onednn)
     list(APPEND EAGER_CODEGEN_DEPS ${eager_generator_path}/mkldnn.dll)
diff --git a/paddle/fluid/inference/api/demo_ci/CMakeLists.txt b/paddle/fluid/inference/api/demo_ci/CMakeLists.txt
@@ -159,9 +159,9 @@ if(WITH_MKL)
   if(EXISTS ${ONEDNN_PATH})
     include_directories("${ONEDNN_PATH}/include")
     if(WIN32)
-      set(MKLDNN_LIB ${ONEDNN_PATH}/lib/mkldnn.lib)
+      set(ONEDNN_LIB ${ONEDNN_PATH}/lib/mkldnn.lib)
     else()
-      set(MKLDNN_LIB ${ONEDNN_PATH}/lib/libdnnl.so.3)
+      set(ONEDNN_LIB ${ONEDNN_PATH}/lib/libdnnl.so.3)
     endif()
   endif()
 else()
@@ -200,7 +200,7 @@ if(NOT WIN32)
   set(DEPS
       ${DEPS}
       ${MATH_LIB}
-      ${MKLDNN_LIB}
+      ${ONEDNN_LIB}
       glog
       gflags
       protobuf
@@ -217,7 +217,7 @@ else()
   set(DEPS
       ${DEPS}
       ${MATH_LIB}
-      ${MKLDNN_LIB}
+      ${ONEDNN_LIB}
       glog
       gflags_static
       libprotobuf
diff --git a/paddle/fluid/pybind/CMakeLists.txt b/paddle/fluid/pybind/CMakeLists.txt
@@ -403,7 +403,7 @@ if(WITH_PYTHON)
     if(WITH_ONEDNN)
       add_custom_command(
         OUTPUT ${op_impl_path}/mkldnn.dll
-        COMMAND ${CMAKE_COMMAND} -E copy ${MKLDNN_SHARED_LIB} ${op_impl_path}
+        COMMAND ${CMAKE_COMMAND} -E copy ${ONEDNN_SHARED_LIB} ${op_impl_path}
         DEPENDS onednn)
       list(APPEND OP_IMPL_DEPS ${op_impl_path}/mkldnn.dll)
       list(APPEND EAGER_OP_IMPL_DEPS ${op_impl_path}/mkldnn.dll)
@@ -478,7 +478,7 @@ if(WITH_PYTHON)
     if(WITH_ONEDNN)
       add_custom_command(
         OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/libdnnl.so.0
-        COMMAND ${CMAKE_COMMAND} -E copy ${MKLDNN_SHARED_LIB}
+        COMMAND ${CMAKE_COMMAND} -E copy ${ONEDNN_SHARED_LIB}
                 ${CMAKE_CURRENT_BINARY_DIR}
         DEPENDS onednn)
       list(APPEND OP_IMPL_DEPS ${CMAKE_CURRENT_BINARY_DIR}/libdnnl.so.0)
diff --git a/python/env_dict.py.in b/python/env_dict.py.in
@@ -43,8 +43,8 @@ env_dict={
     'JVM_LIB':'@JVM_LIB@',
     'PSLIB_VERSION_PY':'@PSLIB_VERSION_PY@',
     'WITH_ONEDNN':'@WITH_ONEDNN@',
-    'MKLDNN_SHARED_LIB':'@MKLDNN_SHARED_LIB@',
-    'MKLDNN_INSTALL_DIR':'@MKLDNN_INSTALL_DIR@',
+    'ONEDNN_SHARED_LIB':'@ONEDNN_SHARED_LIB@',
+    'ONEDNN_INSTALL_DIR':'@ONEDNN_INSTALL_DIR@',
     'WITH_ONNXRUNTIME':'@WITH_ONNXRUNTIME@',
     'ONNXRUNTIME_SHARED_LIB':'@ONNXRUNTIME_SHARED_LIB@',
     'PADDLE2ONNX_LIB':'@PADDLE2ONNX_LIB@',
diff --git a/python/setup.py.in b/python/setup.py.in
@@ -771,10 +771,10 @@ if '${WITH_ONEDNN}' == 'ON':
         # change rpath of libdnnl.so.1, add $ORIGIN/ to it.
         # The reason is that all thirdparty libraries in the same directory,
         # thus, libdnnl.so.1 will find libmklml_intel.so and libiomp5.so.
-        command = "patchelf --set-rpath '$ORIGIN/' ${MKLDNN_SHARED_LIB}"
+        command = "patchelf --set-rpath '$ORIGIN/' ${ONEDNN_SHARED_LIB}"
         if os.system(command) != 0:
             raise Exception("patch libdnnl.so failed, command: %s" % command)
-    shutil.copy('${MKLDNN_SHARED_LIB}', libs_path)
+    shutil.copy('${ONEDNN_SHARED_LIB}', libs_path)
     if os.name != 'nt':
         package_data['paddle.libs']+=['libdnnl.so.3']
     else:
@@ -904,7 +904,7 @@ for f in jit_layer_headers:
     headers += list(find_files(f, '@PADDLE_SOURCE_DIR@/paddle/fluid/jit', recursive=True))
 
 if '${WITH_ONEDNN}' == 'ON':
-    headers += list(find_files('*', '${MKLDNN_INSTALL_DIR}/include')) # mkldnn
+    headers += list(find_files('*', '${ONEDNN_INSTALL_DIR}/include')) # mkldnn
 
 if '${WITH_GPU}' == 'ON' or '${WITH_ROCM}' == 'ON':
     # externalErrorMsg.pb for External Error message
diff --git a/python/setup_cinn.py.in b/python/setup_cinn.py.in
@@ -139,7 +139,7 @@ if '${WITH_MKL}' == 'ON':
     cinnlibs.append('${MKLML_IOMP_LIB}')
 
 if '${WITH_ONEDNN}' == 'ON':
-    cinnlibs.append('${MKLDNN_SHARED_LIB}')
+    cinnlibs.append('${ONEDNN_SHARED_LIB}')
 
 cinnlibs.append('${PHI_LIB}')
 cinnlibs.append('${IR_LIB}')
diff --git a/setup.py b/setup.py
@@ -1160,13 +1160,13 @@ def get_package_data_and_package_dir():
             # The reason is that all thirdparty libraries in the same directory,
             # thus, libdnnl.so.1 will find libmklml_intel.so and libiomp5.so.
             command = "patchelf --set-rpath '$ORIGIN/' " + env_dict.get(
-                "MKLDNN_SHARED_LIB"
+                "ONEDNN_SHARED_LIB"
             )
             if os.system(command) != 0:
                 raise Exception(
                     "patch libdnnl.so failed, command: %s" % command
                 )
-        shutil.copy(env_dict.get("MKLDNN_SHARED_LIB"), libs_path)
+        shutil.copy(env_dict.get("ONEDNN_SHARED_LIB"), libs_path)
         if os.name != 'nt':
             package_data['paddle.libs'] += ['libdnnl.so.3']
         else:
@@ -1422,7 +1422,7 @@ def get_headers():
 
     if env_dict.get("WITH_ONEDNN") == 'ON':
         headers += list(
-            find_files('*', env_dict.get("MKLDNN_INSTALL_DIR") + '/include')
+            find_files('*', env_dict.get("ONEDNN_INSTALL_DIR") + '/include')
         )  # mkldnn
 
     if env_dict.get("WITH_GPU") == 'ON' or env_dict.get("WITH_ROCM") == 'ON':
diff --git a/test/auto_parallel/custom_op/CMakeLists.txt b/test/auto_parallel/custom_op/CMakeLists.txt
@@ -8,7 +8,7 @@ if(WITH_DISTRIBUTE
     MODULES
     test_semi_auto_parallel_custom_op
     ENVS
-    "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python;PADDLE_SOURCE_DIR=${PROJECT_SOURCE_DIR};WITH_ONEDNN=${WITH_ONEDNN};MKLDNN_INSTALL_DIR=${MKLDNN_INSTALL_DIR};WITH_ONEDNN=${WITH_ONEDNN};WITH_GPU=${WITH_GPU};WITH_ROCM=${WITH_ROCM};externalError_INCLUDE_DIR=${externalError_INCLUDE_DIR};PYBIND_INCLUDE_DIR=${PYBIND_INCLUDE_DIR}"
+    "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python;PADDLE_SOURCE_DIR=${PROJECT_SOURCE_DIR};WITH_ONEDNN=${WITH_ONEDNN};ONEDNN_INSTALL_DIR=${ONEDNN_INSTALL_DIR};WITH_ONEDNN=${WITH_ONEDNN};WITH_GPU=${WITH_GPU};WITH_ROCM=${WITH_ROCM};externalError_INCLUDE_DIR=${externalError_INCLUDE_DIR};PYBIND_INCLUDE_DIR=${PYBIND_INCLUDE_DIR}"
   )
   set_tests_properties(test_semi_auto_parallel_custom_op
                        PROPERTIES LABELS "RUN_TYPE=EXCLUSIVE" TIMEOUT 120)
diff --git a/test/auto_parallel/custom_op/utils.py b/test/auto_parallel/custom_op/utils.py
@@ -28,7 +28,7 @@ def get_paddle_includes():
 
     # mkldnn
     if env_dict.get("WITH_ONEDNN") == 'ON':
-        paddle_includes.append(f"{env_dict.get('MKLDNN_INSTALL_DIR')}/include")
+        paddle_includes.append(f"{env_dict.get('ONEDNN_INSTALL_DIR')}/include")
     if env_dict.get("WITH_GPU") == 'ON' or env_dict.get("WITH_ROCM") == 'ON':
         paddle_includes.append(f"{env_dict.get('externalError_INCLUDE_DIR')}")
     paddle_includes.append(f"{env_dict.get('PYBIND_INCLUDE_DIR')}")
diff --git a/test/cpp/inference/infer_ut/CMakeLists.txt b/test/cpp/inference/infer_ut/CMakeLists.txt
@@ -177,13 +177,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}onednn")
-  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(ONEDNN_LIB ${ONEDNN_PATH}/lib/mkldnn.lib)
     else()
-      set(MKLDNN_LIB ${MKLDNN_PATH}/lib/libdnnl.so.3)
+      set(ONEDNN_LIB ${ONEDNN_PATH}/lib/libdnnl.so.3)
     endif()
   endif()
 else()
@@ -222,7 +222,7 @@ if(NOT WIN32)
   set(DEPS
       ${DEPS}
       ${MATH_LIB}
-      ${MKLDNN_LIB}
+      ${ONEDNN_LIB}
       glog
       gflags
       protobuf
@@ -233,7 +233,7 @@ else()
   set(DEPS
       ${DEPS}
       ${MATH_LIB}
-      ${MKLDNN_LIB}
+      ${ONEDNN_LIB}
       glog
       gflags_static
       libprotobuf
@@ -327,7 +327,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/test/ir/inference/auto_scan_test.py b/test/ir/inference/auto_scan_test.py
