Removed OpenBLAS and LAPACKE requirement for compilation and matrix products

Author: henrique-borba

.gitignore

@@ -30,4 +30,5 @@ aclocal.m4
 acinclude.m4
 playground.py
 *.php
+config.h
 CMakeLists.txt

config.h

@@ -71,8 +71,9 @@ PHP_CHECK_LIBRARY(blas,cblas_sdot,
   PHP_CHECK_LIBRARY(openblas,cblas_sdot,
   [
     PHP_ADD_LIBRARY(openblas)
+    AC_DEFINE(HAVE_BLAS,1,[ ])
   ],[
-    AC_MSG_ERROR([wrong openblas/blas version or library not found])
+    AC_MSG_RESULT([wrong openblas/blas version or library not found.])
   ],[
     -lopenblas
   ])
@@ -82,9 +83,10 @@ PHP_CHECK_LIBRARY(blas,cblas_sdot,
 
 PHP_CHECK_LIBRARY(lapacke,LAPACKE_sgetrf,
 [
+  AC_DEFINE(HAVE_LAPACKE,1,[ ])
   PHP_ADD_LIBRARY(lapacke)
 ],[
-  AC_MSG_ERROR([wrong lapacke version or library not found])
+  AC_MSG_RESULT([wrong lapacke version or library not found])
 ],[
   -llapacke
 ])

config.m4

@@ -19,6 +19,7 @@
 #include "common.h"
 #include "cblas.h"
 
+#ifdef HAVE_BLAS
 /*
  * Helper: dispatch to appropriate cblas_?gemm for typenum.
  */
@@ -572,4 +573,5 @@ cblas_matrixproduct(int typenum, CArray * ap1, CArray *ap2, CArray *out, MemoryP
     //CArray_DECREF(out_buf);
     //CArray_DECREF(result);
     return NULL;
-}
+}
+#endif

kernel/common/cblas_funcs.c

@@ -86,6 +86,7 @@ DOUBLE_dot(char *ip1, int is1, char *ip2, int is2, char *op, int n)
     int is1b = blas_stride(is1, sizeof(double));
     int is2b = blas_stride(is2, sizeof(double));
 
+#ifdef HAVE_CBLAS
     if (is1b && is2b)
     {
         double sum = 0.;
@@ -103,6 +104,7 @@ DOUBLE_dot(char *ip1, int is1, char *ip2, int is2, char *op, int n)
         *((double *)op) = (double)sum;
     }
     else {
+#endif
         double sum = (double)0;
         int i;
         for (i = 0; i < n; i++, ip1 += is1, ip2 += is2) {
@@ -111,7 +113,9 @@ DOUBLE_dot(char *ip1, int is1, char *ip2, int is2, char *op, int n)
             sum += ip1r * ip2r;
         }
         *((double *)op) = sum;
+#ifdef HAVE_CBLAS
     }
+#endif
 }
 
 void
@@ -155,9 +159,11 @@ CArray_Matmul(CArray * ap1, CArray * ap2, CArray * out, MemoryPointer * ptr)
     nd1 = CArray_NDIM(ap1);
     nd2 = CArray_NDIM(ap2);
 
+#ifdef HAVE_BLAS
     if (nd1 <= 2 && nd2 <= 2 && (TYPE_DOUBLE_INT == typenum || TYPE_FLOAT_INT == typenum)) {
         return cblas_matrixproduct(typenum, ap1, ap2, out, ptr);
     }
+#endif
 
     if(typenum == TYPE_INTEGER_INT) {
         dot = &INT_dot;