Skip to content

Commit 4d6aca4

Browse files
committed
Warpctc only support dynamic load
1 parent 425f951 commit 4d6aca4

File tree

3 files changed

+1
-14
lines changed

3 files changed

+1
-14
lines changed

cmake/external/openblas.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
INCLUDE(cblas)
1616

1717
IF(NOT ${CBLAS_FOUND})
18+
MESSAGE(FATAL_ERROR "Please install OpenBlas, MKL or ATLAS.")
1819
INCLUDE(ExternalProject)
1920

2021
SET(CBLAS_SOURCES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/openblas)

cmake/util.cmake

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,6 @@ function(link_paddle_exe TARGET_NAME)
121121
endif()
122122
endif()
123123

124-
if(NOT WITH_DSO)
125-
target_link_libraries(${TARGET_NAME} ${WARPCTC_LIBRARIES})
126-
endif()
127-
128124
add_dependencies(${TARGET_NAME} ${external_project_dependencies})
129125
endfunction()
130126

paddle/cuda/src/hl_warpctc_wrap.cc

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ void* warpctc_dso_handle = nullptr;
2929
* false, you need to add the path of libwarp-ctc.so to
3030
* the linked-libs of paddle or to LD_PRELOAD.
3131
*/
32-
#ifdef PADDLE_USE_DSO
3332
#define DYNAMIC_LOAD_WARPCTC_WRAP(__name) \
3433
struct DynLoad__##__name { \
3534
template <typename... Args> \
@@ -41,15 +40,6 @@ void* warpctc_dso_handle = nullptr;
4140
return reinterpret_cast<warpctcFunc>(p_##_name)(args...); \
4241
} \
4342
} __name; // struct DynLoad__##__name
44-
#else
45-
#define DYNAMIC_LOAD_WARPCTC_WRAP(__name) \
46-
struct DynLoad__##__name { \
47-
template <typename... Args> \
48-
auto operator()(Args... args) -> decltype(__name(args...)) { \
49-
return __name(args...); \
50-
} \
51-
} __name; // struct DynLoad__##__name
52-
#endif
5343

5444
// include all needed warp-ctc functions
5545
DYNAMIC_LOAD_WARPCTC_WRAP(get_warpctc_version)

0 commit comments

Comments
 (0)