Skip to content

Commit 106620e

Browse files
committed
Merge branch 'feature/use_std_cmake' into feature/c_api
2 parents 3fcd81f + a873a40 commit 106620e

32 files changed

+468
-885
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ find_package(NumPy REQUIRED)
2626
find_package(Threads REQUIRED)
2727
find_package(AVX QUIET)
2828
find_package(Glog REQUIRED)
29-
find_package(Gflags COMPONENTS nothreads_static REQUIRED)
29+
find_package(gflags COMPONENTS nothreads_static REQUIRED)
3030
find_package(GTest)
3131
find_package(Sphinx)
3232
find_package(Doxygen)

cmake/FindGflags.cmake

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

cmake/util.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ function(link_paddle_exe TARGET_NAME)
112112
${LIBGLOG_LIBRARY}
113113
gflags
114114
${CMAKE_THREAD_LIBS_INIT}
115+
${CMAKE_THREAD_LIBS_INIT}
115116
${CBLAS_LIBS}
116117
${ZLIB_LIBRARIES}
117118
${INTERAL_LIBS}

doc/howto/deep_model/rnn/index_cn.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ RNN相关模型
44
.. toctree::
55
:maxdepth: 1
66

7+
rnn_config_cn.rst
78
recurrent_group_cn.md
89
hierarchical_layer_cn.rst
910
hrnn_rnn_api_compare_cn.rst

doc/howto/deep_model/rnn/rnn_cn.md

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

0 commit comments

Comments
 (0)