Skip to content

Commit ec2eded

Browse files
xuhancnxuhancn
authored
Xu sync back code (#2955)
* rename IPEX_OP_REGISTER_DISPATCH * sync cmake files.
1 parent 1f0f4ec commit ec2eded

File tree

11 files changed

+29
-22
lines changed

11 files changed

+29
-22
lines changed

‎cmake/BuildFlags.cmake

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ endif()
1414

1515
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TORCH_CXX_FLAGS}")
1616
if(NOT WINDOWS)
17-
string(REGEX MATCH "-D_GLIBCXX_USE_CXX11_ABI=([0-9]+)" torch_cxx11 ${TORCH_CXX_FLAGS})
18-
set(GLIBCXX_USE_CXX11_ABI ${CMAKE_MATCH_1})
19-
if(BUILD_WITH_XPU AND NOT GLIBCXX_USE_CXX11_ABI)
20-
message(FATAL_ERROR "Must set _GLIBCXX_USE_CXX11_ABI=1 for XPU build, but not is ${GLIBCXX_USE_CXX11_ABI}!")
17+
string(REGEX MATCH "-D_GLIBCXX_USE_CXX11_ABI=([0-9]+)" torch_cxx11 ${TORCH_CXX_FLAGS})
18+
set(GLIBCXX_USE_CXX11_ABI ${CMAKE_MATCH_1})
19+
if(BUILD_WITH_XPU AND NOT GLIBCXX_USE_CXX11_ABI)
20+
message(FATAL_ERROR "Must set _GLIBCXX_USE_CXX11_ABI=1 for XPU build, but not is ${GLIBCXX_USE_CXX11_ABI}!")
2121
endif()
2222
endif()
2323

‎cmake/Modules/FindoneMKL.cmake

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ set(mkl_root_hint)
3434

3535
# install mkl-include and mkl-static for CPU build
3636
function (install_mkl_packages)
37+
message(STATUS "Download and install mkl-include and mkl-static for IPEX CPU build automatically.")
3738
set(REQ_MKL_VERSION 2021.0.0)
3839
execute_process(COMMAND ${PYTHON_EXECUTABLE} -m pip install "mkl-include>=${REQ_MKL_VERSION}"
3940
RESULT_VARIABLE mkl_iret COMMAND_ERROR_IS_FATAL ANY)
@@ -74,10 +75,15 @@ if(BUILD_MODULE_TYPE STREQUAL "GPU")
7475
get_mkl_from_env_var()
7576
else()
7677
if(BUILD_WITH_XPU)
77-
get_mkl_from_env_var()
78+
if(NOT USE_ONEMKL)
79+
# IPEX CPU must use onemkl. If setup "USE_ONEMKL=OFF", force ipex cpu roll back to static link mkl.
80+
set(BUILD_STATIC_ONEMKL ON)
81+
install_mkl_packages()
82+
else()
83+
get_mkl_from_env_var()
84+
endif()
7885
else()
7986
if(BUILD_STATIC_ONEMKL)
80-
message(STATUS "Download and install mkl-include and mkl-static for IPEX CPU build automatically.")
8187
install_mkl_packages()
8288
else()
8389
get_mkl_from_env_var()

‎cmake/Options.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ function (print_config_summary)
4646
message(STATUS "Options:")
4747
message(STATUS " BUILD_WITH_CPU : ${BUILD_WITH_CPU}")
4848
message(STATUS " BUILD_WITH_XPU : ${BUILD_WITH_XPU}")
49+
message(STATUS " BUILD_STATIC_ONEMKL : ${BUILD_STATIC_ONEMKL}")
4950
message(STATUS " BUILD_NO_CLANGFORMAT : ${BUILD_NO_CLANGFORMAT}")
5051
message(STATUS " BUILD_STATS : ${BUILD_STATS}")
5152
message(STATUS " BUILD_STRIPPED_BIN : ${BUILD_STRIPPED_BIN}")

‎csrc/cpu/aten/Cast.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,9 @@ at::Tensor cast_from_fp8(
173173
namespace {
174174

175175
IPEX_LIBRARY_FRAGMENT() {
176-
IPEX_OP_IPEX_REGISTER_DISPATCH(
176+
IPEX_OP_REGISTER_DISPATCH(
177177
"cast_to_fp8", torch_ipex::cpu::cast_to_fp8, c10::DispatchKey::CPU);
178-
IPEX_OP_IPEX_REGISTER_DISPATCH(
178+
IPEX_OP_REGISTER_DISPATCH(
179179
"cast_from_fp8", torch_ipex::cpu::cast_from_fp8, c10::DispatchKey::CPU);
180180
}
181181

‎csrc/cpu/aten/Converter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ std::tuple<at::Tensor, at::Tensor> split_float_bfloat16(
4949
namespace {
5050

5151
IPEX_LIBRARY_FRAGMENT() {
52-
IPEX_OP_IPEX_REGISTER_DISPATCH(
52+
IPEX_OP_REGISTER_DISPATCH(
5353
"split_float_bfloat16",
5454
torch_ipex::cpu::bf16::converter::split_float_bfloat16,
5555
c10::DispatchKey::CPU);
56-
IPEX_OP_IPEX_REGISTER_DISPATCH(
56+
IPEX_OP_REGISTER_DISPATCH(
5757
"cat_bfloat16_float",
5858
torch_ipex::cpu::bf16::converter::cat_bfloat16_float,
5959
c10::DispatchKey::CPU);

‎csrc/cpu/aten/FP8Linear.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ at::Tensor fp8_linear(
152152
namespace {
153153

154154
IPEX_LIBRARY_FRAGMENT() {
155-
IPEX_OP_IPEX_REGISTER_DISPATCH(
155+
IPEX_OP_REGISTER_DISPATCH(
156156
"fp8_linear", torch_ipex::cpu::fp8_linear, c10::DispatchKey::CPU);
157157
}
158158

‎csrc/cpu/aten/optimizer/AdamFusedStep.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ void adam_fused_step(
106106
namespace {
107107

108108
IPEX_LIBRARY_FRAGMENT() {
109-
IPEX_OP_IPEX_REGISTER_DISPATCH(
109+
IPEX_OP_REGISTER_DISPATCH(
110110
"adam_fused_step",
111111
torch_ipex::cpu::adam_fused_step,
112112
at::DispatchKey::CPU);

‎csrc/cpu/aten/optimizer/LambFusedStep.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ std::tuple<at::Tensor, at::Tensor, at::Tensor> lamb_fused_step(
9292
namespace {
9393

9494
IPEX_LIBRARY_FRAGMENT() {
95-
IPEX_OP_IPEX_REGISTER_DISPATCH(
95+
IPEX_OP_REGISTER_DISPATCH(
9696
"lamb_fused_step",
9797
torch_ipex::cpu::lamb_fused_step,
9898
at::DispatchKey::CPU);

‎csrc/cpu/aten/optimizer/SgdFusedStep.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ c10::optional<at::Tensor> sgd_fused_step(
8989

9090
namespace {
9191
IPEX_LIBRARY_FRAGMENT() {
92-
IPEX_OP_IPEX_REGISTER_DISPATCH(
92+
IPEX_OP_REGISTER_DISPATCH(
9393
"sgd_fused_step", torch_ipex::cpu::sgd_fused_step, at::DispatchKey::CPU);
9494
}
9595
} // namespace

‎csrc/cpu/aten/optimizer/SplitSgdStep.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ at::Tensor packed_add(
2525
namespace {
2626

2727
IPEX_LIBRARY_FRAGMENT() {
28-
IPEX_OP_IPEX_REGISTER_DISPATCH(
28+
IPEX_OP_REGISTER_DISPATCH(
2929
"packed_add", torch_ipex::cpu::packed_add, at::DispatchKey::CPU);
30-
IPEX_OP_IPEX_REGISTER_DISPATCH(
30+
IPEX_OP_REGISTER_DISPATCH(
3131
"packed_add", torch_ipex::cpu::packed_add, at::DispatchKey::SparseCPU);
3232
}
3333

0 commit comments

Comments
 (0)