about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorPjotr Prins2018-09-28 09:16:02 +0000
committerPjotr Prins2018-09-28 09:16:02 +0000
commit1fdd4ca1ae891ff9dd3736e6ed94bc01c3423dfd (patch)
tree0f4b79b48c67cbd336bb02145a2b60c65dad8f9f /src
parent8dbe3068953610996c86c765ef141c9f7ba1fbac (diff)
downloadpangemma-1fdd4ca1ae891ff9dd3736e6ed94bc01c3423dfd.tar.gz
Atlas compilation
Diffstat (limited to 'src')
-rw-r--r--src/eigenlib.cpp2
-rw-r--r--src/fastblas.cpp2
-rw-r--r--src/fastopenblas.h5
3 files changed, 6 insertions, 3 deletions
diff --git a/src/eigenlib.cpp b/src/eigenlib.cpp
index 4d6aacc..470aa08 100644
--- a/src/eigenlib.cpp
+++ b/src/eigenlib.cpp
@@ -23,7 +23,7 @@
 #include <cmath>
 #include <iostream>
 #include <vector>
-#include <cblas.h>
+// #include <cblas.h>
 
 using namespace std;
 using namespace Eigen;
diff --git a/src/fastblas.cpp b/src/fastblas.cpp
index de63e08..b3fcddb 100644
--- a/src/fastblas.cpp
+++ b/src/fastblas.cpp
@@ -23,9 +23,9 @@
 #include <cmath>
 #include <iomanip>
 #include <vector>
-#include <cblas.h>
 #include "debug.h"
 #include "fastblas.h"
+#include "fastopenblas.h"
 #include "mathfunc.h"
 #include <string.h>
 #include "eigenlib.h"
diff --git a/src/fastopenblas.h b/src/fastopenblas.h
index 3dd8ef7..e98e62f 100644
--- a/src/fastopenblas.h
+++ b/src/fastopenblas.h
@@ -23,7 +23,10 @@
 
 #include <assert.h>
 #include <iostream>
-#include <cblas.h>   // For OpenBlas
+extern "C"
+{
+   #include <cblas.h>   // For OpenBlas / Atlas
+}
 #include "gsl/gsl_matrix.h"
 
 void fast_cblas_dgemm(const enum CBLAS_ORDER Order,