Merge branch 'develop' into cmake_protobuf

paddle/math/MathFunctions.cpp

@@ -29,13 +29,20 @@ void* lapack_dso_handle = nullptr;
  *
  * note: default dynamic linked libs
  */
+
+// The argument for stringizing operator is not macro-expanded first.
+// We have to use two levels of macro to do the expansion.
+// See https://gcc.gnu.org/onlinedocs/cpp/Stringizing.html
+#define STR(x) #x
 #define DYNAMIC_LOAD_LAPACK_WRAP(__name)                                       \
   struct DynLoad__##__name {                                                   \
     template <typename... Args>                                                \
     auto operator()(Args... args) -> decltype(__name(args...)) {               \
       using lapack_func = decltype(__name(args...)) (*)(Args...);              \
       std::call_once(lapack_dso_flag, GetLapackDsoHandle, &lapack_dso_handle); \
-      void* p_##__name = dlsym(lapack_dso_handle, #__name);                    \
+      void* p_##__name = dlsym(lapack_dso_handle, STR(__name));                \
+      CHECK(p_##__name) << "Cannot find symbol " << STR(__name)                \
+                        << " in liblapack.so";                                 \
       return reinterpret_cast<lapack_func>(p_##__name)(args...);               \
     }                                                                          \
   } __name;  // struct DynLoad__##__name

paddle/math/tests/test_matrixCompare.cpp

@@ -237,15 +237,8 @@ TEST(Matrix, unary) {
       testMatrixRotate(height, width);
     }
     // inverse matrix
-    void** dso_handler = nullptr;
-    GetLapackDsoHandle(dso_handler);
-    if (nullptr == *dso_handler) {
-      LOG(WARNING) << "Failed to find liblapack.so, please specify its path "
-                      "using LD_LIBRARY_PATH.";
-    } else {
     testMatrixInverse(height);
   }
-  }
 }
 
 void testMatrixSoftmax(int height, int width) {

paddle/utils/DynamicLoader.cpp

@@ -52,7 +52,7 @@ static inline std::string join(const std::string& part1,
 static inline void GetDsoHandleFromDefaultPath(std::string& dso_path,
                                                void** dso_handle,
                                                int dynload_flags) {
-  VLOG(3) << "Try to find cuda library: " << dso_path
+  VLOG(3) << "Try to find library: " << dso_path
           << " from default system path.";
   // default search from LD_LIBRARY_PATH/DYLD_LIBRARY_PATH
   *dso_handle = dlopen(dso_path.c_str(), dynload_flags);

python/paddle/v2/dataset/imikolov.py

@@ -41,7 +41,7 @@ def word_count(f, word_freq=None):
     return word_freq
 
 
-def build_dict():
+def build_dict(typo_freq=50):
     """
     Build a word dictionary from the corpus,  Keys of the dictionary are words,
     and values are zero-based IDs of these words.
@@ -59,8 +59,7 @@ def build_dict():
             # remove <unk> for now, since we will set it as last index
             del word_freq['<unk>']
 
-        TYPO_FREQ = 50
-        word_freq = filter(lambda x: x[1] > TYPO_FREQ, word_freq.items())
+        word_freq = filter(lambda x: x[1] > typo_freq, word_freq.items())
 
         word_freq_sorted = sorted(word_freq, key=lambda x: (-x[1], x[0]))
         words, _ = list(zip(*word_freq_sorted))