Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into accelerate_ddpg

test=develop

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into accelerate_ddpg
test=develop
d089097f · minqiyang · 250e8937 · 00dadb07 · d089097f
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

cmake/cudnn.cmake cmake/cudnn.cmake +2 -2

未找到文件。
--- a/cmake/cudnn.cmake
+++ b/cmake/cudnn.cmake
@@ -44,9 +44,9 @@ if(WIN32)
 set(CUDNN_LIB_NAME "cudnn.lib" "cudnn64_7.dll")
 endif(WIN32)

-if(Apple)
+if(APPLE)
 set(CUDNN_LIB_NAME "libcudnn.dylib" "libcudnn.so")
-endif(Apple)
+endif(APPLE)

 find_library(CUDNN_LIBRARY NAMES ${CUDNN_LIB_NAME} # libcudnn_static.a
    PATHS ${CUDNN_CHECK_LIBRARY_DIRS} ${CUDNN_INCLUDE_DIR} ${__libpath_hist}