From c8ede699ea5f3fe31a273f5eeda92d13e94f045d Mon Sep 17 00:00:00 2001 From: Dmitry Rogozhkin Date: Wed, 14 Aug 2024 09:10:16 -0700 Subject: [PATCH] fixes for intel/llvm Changes: * Added a hack to fix 2035 in oneDNN * Commented out oneapi specific location for libOpenCL.so * Added hacks in torch-xpu-ops to WA dpc++ and intel/llvm behavior differences Above are hacks which need proper resolutions. See: https://github.com/oneapi-src/oneDNN/issues/2035 Requires: https://github.com/intel/torch-xpu-ops/pull/635 Signed-off-by: Dmitry Rogozhkin --- aten/src/ATen/CMakeLists.txt | 2 +- caffe2/CMakeLists.txt | 2 +- third_party/ideep | 2 +- third_party/xpu.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aten/src/ATen/CMakeLists.txt b/aten/src/ATen/CMakeLists.txt index 6d9152a4d07df..ce9be43f1de17 100644 --- a/aten/src/ATen/CMakeLists.txt +++ b/aten/src/ATen/CMakeLists.txt @@ -239,7 +239,7 @@ if(USE_XPU) list(APPEND ATen_XPU_SRCS ${mkldnn_xpu_cpp}) list(APPEND ATen_XPU_DEPENDENCY_LIBS xpu_mkldnn) - list(APPEND ATen_XPU_DEPENDENCY_LIBS ${OCL_LIBRARY}) + #list(APPEND ATen_XPU_DEPENDENCY_LIBS ${OCL_LIBRARY}) list(APPEND ATen_XPU_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/native/mkldnn/xpu) list(APPEND ATen_XPU_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/native/mkldnn/xpu/detail) list(APPEND ATen_XPU_INCLUDE ${PROJECT_SOURCE_DIR}/third_party/ideep/mkl-dnn/include) diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt index 5115944b3894e..8577ae004db70 100644 --- a/caffe2/CMakeLists.txt +++ b/caffe2/CMakeLists.txt @@ -1011,7 +1011,7 @@ if(USE_XPU) # ATen XPU implementation set(TORCH_XPU_OPS_DIR ${TORCH_ROOT}/third_party/torch-xpu-ops) - set(TORCH_XPU_OPS_REPO_URL https://github.com/intel/torch-xpu-ops.git) + set(TORCH_XPU_OPS_REPO_URL https://github.com/dvrogozh/torch-xpu-ops.git) file(READ "${TORCH_ROOT}/third_party/xpu.txt" TORCH_XPU_OPS_COMMIT) string(REGEX REPLACE "\n$" "" TORCH_XPU_OPS_COMMIT "${TORCH_XPU_OPS_COMMIT}") if(NOT EXISTS "${TORCH_XPU_OPS_DIR}/.git") diff --git a/third_party/ideep b/third_party/ideep index 55ca0191687aa..7b55ac8980d6d 160000 --- a/third_party/ideep +++ b/third_party/ideep @@ -1 +1 @@ -Subproject commit 55ca0191687aaf19aca5cdb7881c791e3bea442b +Subproject commit 7b55ac8980d6d2af27b7715bf475dfa764edea32 diff --git a/third_party/xpu.txt b/third_party/xpu.txt index 6e9c6b920627d..b3132bb6e86d8 100644 --- a/third_party/xpu.txt +++ b/third_party/xpu.txt @@ -1 +1 @@ -35bea25e2e09b92067349a75cd0858a485c444fe +intel-llvm