Skip to content

Commit 4d00e5a

Browse files
ZailiWangDiweiSun
andauthored
remove ipex tp (#3690)
* remove ipex tp * rm oneCCL installation * disable torch-ccl building * rm torch-ccl related commands * revert unnecessary flag change * flake8 correction * remove run_scaling.sh * remove oneCCL in .gitmodules * rm run_generation_tp.py --------- Co-authored-by: DiweiSun <[email protected]>
1 parent b622ef1 commit 4d00e5a

27 files changed

+4
-2442
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
[submodule "third_party/libxsmm"]
88
path = third_party/libxsmm
99
url = https://github.com/libxsmm/libxsmm.git
10-
[submodule "third_party/oneCCL"]
11-
path = third_party/oneCCL
12-
url = https://github.com/oneapi-src/oneCCL
1310
[submodule "third_party/sleef"]
1411
path = third_party/sleef
1512
url = https://github.com/shibatch/sleef.git

cmake/Modules/FindTorchCCL.cmake

Lines changed: 0 additions & 31 deletions
This file was deleted.

cmake/Modules/FindoneCCL.cmake

Lines changed: 0 additions & 36 deletions
This file was deleted.

cmake/cpu/BuildFlags.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ if(env_cxx_standard GREATER -1)
1313
endif()
1414
set(CMAKE_CXX_STANDARD 17)
1515
set(CMAKE_C_STANDARD 11)
16-
#oneCCL build only support the gnu standard
1716
set(CMAKE_CXX_EXTENSIONS ON)
1817

1918
if(MSVC)

cmake/cpu/Options.cmake

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ if(WIN32)
2121
set(USE_LIBXSMM ON)
2222
endif()
2323

24-
if(WIN32)
25-
set(USE_SHM OFF)
26-
set(BUILD_CPU_WITH_ONECCL OFF)
27-
endif()
28-
2924
if(BUILD_CFG_HABANA)
3025
set(USE_DNNL_GRAPH_COMPILER OFF)
3126
endif()
@@ -65,8 +60,6 @@ function (print_cpu_config_summary)
6560
message(STATUS " BUILD_XSMM_VIA_CMAKE : ${BUILD_LIBXSMM_VIA_CMAKE}")
6661
message(STATUS " USE_LIBXSMM : ${USE_LIBXSMM}")
6762
message(STATUS " USE_DNNL_GRAPH_COMPILER : ${USE_DNNL_GRAPH_COMPILER}")
68-
message(STATUS " BUILD_CPU_WITH_ONECCL : ${BUILD_CPU_WITH_ONECCL}")
69-
message(STATUS " USE_SHM : ${USE_SHM}")
7063
message(STATUS "")
7164
message(STATUS "********************************")
7265
endfunction()

csrc/cpu/CMakeLists.txt

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,6 @@ set(DNNL_BUILD_EXAMPLES FALSE CACHE BOOL "" FORCE)
1010
set(DNNL_ENABLE_PRIMITIVE_CACHE TRUE CACHE BOOL "" FORCE)
1111
set(DNNL_LIBRARY_TYPE STATIC CACHE STRING "" FORCE)
1212

13-
#find_package(TorchCCL REQUIRED)
14-
# Find OneCCL Lib
15-
set(DEPENDS_LIB)
16-
if(BUILD_CPU_WITH_ONECCL)
17-
include(${IPEX_ROOT_DIR}/cmake/Modules/FindoneCCL.cmake)
18-
# Find OneCCL Lib
19-
link_directories(${IPEX_CPU_CPP_THIRD_PARTY_ROOT}/oneCCL/deps/mpi/lib)
20-
find_package(oneCCL REQUIRED)
21-
list(APPEND DEPENDS_LIB oneCCL)
22-
list(APPEND DEPENDS_LIB mpi)
23-
set(RPATH_VALUE)
24-
list(APPEND RPATH_VALUE "$ORIGIN")
25-
list(APPEND RPATH_VALUE "$ORIGIN/../opt/mpi/lib")
26-
set(CMAKE_INSTALL_RPATH "${RPATH_VALUE}")
27-
endif()
28-
2913
# TODO: Once llga is merged into oneDNN, use oneDNN directly as the third_party of IPEX
3014
# use the oneDNN in llga temporarily: third_party/llga/third_party/oneDNN
3115

@@ -60,14 +44,6 @@ if(USE_LIBXSMM)
6044
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_LIBXSMM")
6145
endif(USE_LIBXSMM)
6246

63-
if(BUILD_CPU_WITH_ONECCL)
64-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBUILD_CPU_WITH_ONECCL")
65-
endif(BUILD_CPU_WITH_ONECCL)
66-
67-
if(USE_SHM)
68-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_SHM")
69-
endif(USE_SHM)
70-
7147
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBUILD_IPEX_MAIN_LIB")
7248

7349
# ---[ Main build
@@ -107,7 +83,6 @@ add_subdirectory(${IPEX_CPU_ROOT_DIR}/isa)
10783
add_subdirectory(${IPEX_CPU_ROOT_DIR}/toolkit)
10884
add_subdirectory(${IPEX_CPU_ROOT_DIR}/runtime)
10985
add_subdirectory(${IPEX_CPU_ROOT_DIR}/utils)
110-
add_subdirectory(${IPEX_CPU_ROOT_DIR}/comm)
11186

11287
add_subdirectory(${IPEX_CPU_ROOT_DIR}/jit)
11388

@@ -120,7 +95,7 @@ endif(USE_LIBXSMM)
12095

12196
set(IPEX_CPU_CPP_SRCS ${IPEX_CPU_CPP_DYNDISP_SRCS} ${IPEX_CPU_CPP_ISA_SRCS_GEN} ${IPEX_CPU_CPP_UTILS_SRCS} ${IPEX_CPU_CPP_QUANTIZATION_SRCS} ${IPEX_CPU_CPP_JIT_SRCS} ${IPEX_JIT_COMMON_CPP_SRCS}
12297
${IPEX_CPU_CPP_ISA_SRCS} ${IPEX_CPU_CPP_IDEEP_SRCS} ${IPEX_CPU_CPP_AUTOCAST_SRCS} ${IPEX_CPU_CPP_ATEN_SRCS} ${IPEX_CPU_CPP_RUNTIME_SRCS} ${IPEX_CPU_CPP_TOOLKIT_SRCS} ${IPEX_UTLIS_CPP_SRCS}
123-
${IPEX_CPU_CPP_TPP_SRCS} ${IPEX_CPU_CPP_COMM_SRCS})
98+
${IPEX_CPU_CPP_TPP_SRCS})
12499

125100
list(REMOVE_ITEM IPEX_CPU_CPP_SRCS ${IPEX_CPU_CPP_ISA_SRCS_ORIGIN})
126101

@@ -162,10 +137,6 @@ endif()
162137
target_include_directories(${PLUGIN_NAME_CPU} PUBLIC ${IDEEP_INCLUDE_DIR})
163138
target_include_directories(${PLUGIN_NAME_CPU} PUBLIC ${PYTHON_INCLUDE_DIR})
164139

165-
if(BUILD_CPU_WITH_ONECCL)
166-
target_link_libraries(${PLUGIN_NAME_CPU} PUBLIC ${DEPENDS_LIB})
167-
endif(BUILD_CPU_WITH_ONECCL)
168-
169140
include(${IPEX_ROOT_DIR}/cmake/ClangFormat.cmake)
170141
if(CLANG_FORMAT)
171142
file(GLOB_RECURSE ALL_CPU_NATIVE_CSRC_FILES ${IPEX_CPU_ROOT_DIR}/**.[ch] ${IPEX_CPU_ROOT_DIR}/**.[ch]pp)

csrc/cpu/aten/CollectiveCommunicationPrimitive.cpp

Lines changed: 0 additions & 39 deletions
This file was deleted.

csrc/cpu/aten/CollectiveCommunicationPrimitive.h

Lines changed: 0 additions & 31 deletions
This file was deleted.

csrc/cpu/aten/ShmAllReduceAdd.cpp

Lines changed: 0 additions & 33 deletions
This file was deleted.

csrc/cpu/aten/ShmAllReduceAdd.h

Lines changed: 0 additions & 37 deletions
This file was deleted.

csrc/cpu/aten/kernels/CollectiveCommunicationPrimitiveKrnl.cpp

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)