From 7c4f7f7f7c4320658828631039f57fadf6bfdb29 Mon Sep 17 00:00:00 2001
From: Pjotr Prins
Date: Thu, 28 May 2020 05:39:18 -0500
Subject: Fix copiles on gcc 10. Main thing is not to mix BLAS includes from
 OpenBLAS, GSL (and Eigen when used).

---
 src/fastblas.cpp   | 5 -----
 src/fastblas.h     | 2 +-
 src/fastopenblas.h | 9 ++-------
 src/gemma.cpp      | 2 +-
 4 files changed, 4 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/fastblas.cpp b/src/fastblas.cpp
index 42c59ee..41ee741 100644
--- a/src/fastblas.cpp
+++ b/src/fastblas.cpp
@@ -18,18 +18,13 @@
     along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-// #include "gsl/gsl_matrix.h"
 #include <algorithm>    // std::min
 #include <cmath>
 #include <iomanip>
 #include <vector>
 #include "debug.h"
-#include "fastblas.h"
-#include "fastopenblas.h"
 #include "mathfunc.h"
 #include <string.h>
-#include "eigenlib.h"
-#include <cblas.h>
 
 const char *FastblasTrans = "T";
 const char *FastblasNoTrans = "N";
diff --git a/src/fastblas.h b/src/fastblas.h
index cca3258..32253b3 100644
--- a/src/fastblas.h
+++ b/src/fastblas.h
@@ -23,7 +23,7 @@
 
 #include <assert.h>
 #include <iostream>
-#include "gsl/gsl_matrix.h"
+// #include "gsl/gsl_matrix.h"
 
 gsl_matrix *fast_copy(gsl_matrix *m, const double *mem);
 
diff --git a/src/fastopenblas.h b/src/fastopenblas.h
index 7f453da..ace8347 100644
--- a/src/fastopenblas.h
+++ b/src/fastopenblas.h
@@ -21,13 +21,8 @@
 #ifndef __FASTOPENBLAS_H__
 #define __FASTOPENBLAS_H__
 
-#include <assert.h>
-#include <iostream>
-extern "C"
-{
-  #include <cblas.h>   // For OpenBlas / Atlas
-}
-// #include "gsl/gsl_matrix.h"
+// #include <assert.h>
+// #include <iostream>
 
 void fast_cblas_dgemm(const enum CBLAS_ORDER ,
                       const enum CBLAS_TRANSPOSE TransA,
diff --git a/src/gemma.cpp b/src/gemma.cpp
index 6bc739b..7b955cd 100644
--- a/src/gemma.cpp
+++ b/src/gemma.cpp
@@ -28,7 +28,7 @@
 #ifdef OPENBLAS
 extern "C" {
   // these functions are defined in cblas.h - but if we include that we
-  // conflicts with other BLAS includes
+  // conflicts with other BLAS includes (GSL)
   int openblas_get_num_threads(void);
   int openblas_get_parallel(void);
   char* openblas_get_config(void);
-- 
cgit v1.2.3