refine cblas.cmake

cmake/cblas.cmake

@@ -110,6 +110,7 @@ if(OPENBLAS_LAPACKE_INC_DIR AND OPENBLAS_INC_DIR AND OPENBLAS_LIB)
   set(CBLAS_INC_DIR ${OPENBLAS_INC_DIR} ${OPENBLAS_LAPACKE_INC_DIR})
   set(CBLAS_LIBRARIES ${OPENBLAS_LIB})
 
+  add_definitions(-DPADDLE_USE_OPENBLAS)
   add_definitions(-DLAPACK_FOUND)
 
   message(STATUS "Found OpenBLAS (include: ${OPENBLAS_INC_DIR}, library: ${CBLAS_LIBRARIES})")
@@ -146,6 +147,6 @@ if (REFERENCE_CBLAS_INCLUDE_DIR AND REFERENCE_CBLAS_LIBRARY)
   set(CBLAS_PROVIDER REFERENCE)
   set(CBLAS_INC_DIR ${REFERENCE_CBLAS_INCLUDE_DIR})
   set(CBLAS_LIBRARIES ${REFERENCE_CBLAS_LIBRARY})
-
+  add_definitions(-DPADDLE_USE_REFERENCE_CBLAS)
   message(STATUS "Found reference-cblas (include: ${CBLAS_INC_DIR}, library: ${CBLAS_LIBRARIES})")
 endif()

cmake/external/openblas.cmake

@@ -36,7 +36,7 @@ IF(NOT ${CBLAS_FOUND})
         INSTALL_DIR         ${CBLAS_INSTALL_DIR}
         BUILD_IN_SOURCE     1
         BUILD_COMMAND       ${CMAKE_MAKE_PROGRAM} FC=${CMAKE_Fortran_COMPILER} CC=${CMAKE_C_COMPILER} HOSTCC=${CMAKE_C_COMPILER} NO_LAPACK=1 DYNAMIC_ARCH=1 NO_SHARED=1 libs netlib
-        INSTALL_COMMAND     ${CMAKE_MAKE_PROGRAM} install NO_SHARED=1 PREFIX=<INSTALL_DIR>
+        INSTALL_COMMAND     ${CMAKE_MAKE_PROGRAM} install NO_SHARED=1 NO_LAPACK=1 PREFIX=<INSTALL_DIR>
         UPDATE_COMMAND      ""
         CONFIGURE_COMMAND   ""
     )

paddle/math/MathFunctions.h

@@ -18,17 +18,36 @@ limitations under the License. */
 #ifdef PADDLE_USE_MKL
 #include <mkl.h>
 #include <mkl_lapacke.h>
-#else
-extern "C" {
-#include <cblas.h>
-}
+#endif
+
 #ifdef PADDLE_USE_ATLAS
 extern "C" {
+#include <cblas.h>
 #include <clapack.h>
 }
-#else
+#endif
+
+#ifdef PADDLE_USE_OPENBLAS
+#include <cblas.h>
 #include <lapacke.h>
 #endif
+
+#ifdef PADDLE_USE_REFERENCE_CBLAS
+extern "C" {
+#include <cblas.h>
+}
+#endif
+
+#ifndef LAPACK_FOUND
+extern "C" {
+int LAPACKE_sgetrf(int matrix_layout, int m, int n,
+int LAPACKE_dgetrf(int matrix_layout, int m, int n,
+                   double* a, int lda, int* ipiv);
+int LAPACKE_sgetri(int matrix_layout, int n, float* a,
+                   int lda, const int* ipiv);
+int LAPACKE_dgetri(int matrix_layout, int n, double* a,
+                   int lda, const int* ipiv);
+}
 #endif
 
 #include <cmath>

paddle/math/tests/test_matrixCompare.cpp

@@ -247,7 +247,7 @@ TEST(Matrix, unary) {
                  << "1. Simply issue `sudo apt-get install liblapacke-dev` to "
                     "avoid re-build source code. \n"
                  << "2. Install MKL/Openblas/ATLAS and re-build PaddlePaddle "
-                    "source code."
+                    "source code.";
 #endif
   }
 }