Skip to content

Commit a530497

Browse files
authored
Merge pull request #12800 from luotao1/anakin_cuda_env
disable anakin when cuda < 8.0 or cudnn < 7.0
2 parents 64d48f4 + 6814299 commit a530497

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

cmake/configure.cmake

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,17 @@ if(WITH_GPU)
103103
endif()
104104
if(WITH_ANAKIN)
105105
if(${CUDA_VERSION_MAJOR} VERSION_LESS 8)
106-
message(FATAL_ERROR "Anakin needs CUDA >= 8.0 to compile")
106+
message(WARNING "Anakin needs CUDA >= 8.0 to compile. Force WITH_ANAKIN=OFF")
107+
set(WITH_ANAKIN OFF CACHE STRING "Anakin is valid only when CUDA >= 8.0." FORCE)
107108
endif()
108109
if(${CUDNN_MAJOR_VERSION} VERSION_LESS 7)
109-
message(FATAL_ERROR "Anakin needs CUDNN >= 7.0 to compile")
110+
message(WARNING "Anakin needs CUDNN >= 7.0 to compile. Force WITH_ANAKIN=OFF")
111+
set(WITH_ANAKIN OFF CACHE STRING "Anakin is valid only when CUDNN >= 7.0." FORCE)
110112
endif()
113+
endif()
114+
if(WITH_ANAKIN)
111115
set(ENV{CUDNN_INCLUDE_DIR} ${CUDNN_INCLUDE_DIR})
112116
set(ENV{CUDNN_LIBRARY} ${CUDNN_LIBRARY})
113-
message(STATUS "cudnn include header is ${CUDNN_INCLUDE_DIR}/cudnn.h")
114-
message(STATUS "cudnn library is ${CUDNN_LIBRARY}")
115117
endif()
116118
elseif(WITH_AMD_GPU)
117119
add_definitions(-DPADDLE_WITH_HIP)

paddle/fluid/inference/api/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@ endif()
6262

6363
if (WITH_ANAKIN AND WITH_GPU) # only needed in CI
6464
# compile the libinference_anakin_api.a and anakin.so.
65-
nv_library(inference_anakin_api SRCS api.cc api_anakin_engine.cc DEPS anakin_shared anakin_saber)
66-
#nv_library(inference_anakin_api_shared SHARED SRCS api.cc api_anakin_engine.cc DEPS anakin)
65+
cc_library(inference_anakin_api SRCS api.cc api_anakin_engine.cc DEPS anakin_shared anakin_saber)
66+
cc_library(inference_anakin_api_shared SHARED SRCS api.cc api_anakin_engine.cc DEPS anakin_shared anakin_saber)
6767
function(anakin_target target_name)
6868
target_compile_options(${target_name} BEFORE PUBLIC ${ANAKIN_COMPILE_EXTRA_FLAGS})
6969
endfunction()
7070
anakin_target(inference_anakin_api)
71-
#anakin_target(inference_anakin_api_shared)
71+
anakin_target(inference_anakin_api_shared)
7272
if (WITH_TESTING)
7373
cc_test(inference_anakin_test SRCS api_anakin_engine_tester.cc
7474
ARGS --model=${ANAKIN_SOURCE_DIR}/mobilenet_v2.anakin.bin

0 commit comments

Comments
 (0)