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: oneapi-src/oneDNN#2035 Requires: intel/torch-xpu-ops#635 Signed-off-by: Dmitry Rogozhkin <[email protected]>
dvrogozh · Aug 14, 2024 · c8ede69 · c8ede69
1 parent 7f40ac9
commit c8ede69
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
diff --git a/third_party/xpu.txt b/third_party/xpu.txt
@@ -1 +1 @@
-35bea25e2e09b92067349a75cd0858a485c444fe
+intel-llvm