Merge branch 'main' into adi/onednn_aarch64

cmake/Modules/FindMKLDNN.cmake

@@ -18,6 +18,7 @@ IF(NOT MKLDNN_FOUND)
 
   SET(IDEEP_ROOT "${PROJECT_SOURCE_DIR}/third_party/ideep")
   SET(MKLDNN_ROOT "${PROJECT_SOURCE_DIR}/third_party/ideep/mkl-dnn")
+  SET(ONEDNN_AARCH64_TAG "v3.10-rc")
 
   if(USE_XPU) # Build oneDNN GPU library
     if(WIN32)
@@ -96,6 +97,14 @@ IF(NOT MKLDNN_FOUND)
   FIND_PACKAGE(BLAS)
   FIND_PATH(IDEEP_INCLUDE_DIR ideep.hpp PATHS ${IDEEP_ROOT} PATH_SUFFIXES include)
   FIND_PATH(MKLDNN_INCLUDE_DIR dnnl.hpp dnnl.h dnnl_ukernel.hpp dnnl_ukernel.h PATHS ${MKLDNN_ROOT} PATH_SUFFIXES include/oneapi/dnnl)
+  # Checkout the oneDNN version defined by ONEDNN_AARCH64_TAG for CPU_AARCH64
+  IF(CPU_AARCH64)
+  EXECUTE_PROCESS(
+    COMMAND git${CMAKE_EXECUTABLE_SUFFIX} checkout ${ONEDNN_AARCH64_TAG}
+    WORKING_DIRECTORY ${MKLDNN_ROOT}
+  )
+  FIND_PATH(MKLDNN_INCLUDE_DIR dnnl.hpp dnnl.h dnnl_ukernel.hpp dnnl_ukernel.h PATHS ${MKLDNN_ROOT} PATH_SUFFIXES include)
+  ENDIF(CPU_AARCH64)
   IF(NOT MKLDNN_INCLUDE_DIR)
     MESSAGE("MKLDNN_INCLUDE_DIR not found")
     EXECUTE_PROCESS(COMMAND git${CMAKE_EXECUTABLE_SUFFIX} submodule update --init mkl-dnn WORKING_DIRECTORY ${IDEEP_ROOT})