[Genabel-commits] r1478 - pkg/OmicABELnoMM/src

[noreply at r-forge.r-project.org]

Author: lckarssen
Date: 2013-12-17 17:41:04 +0100 (Tue, 17 Dec 2013)
New Revision: 1478

Modified:
   pkg/OmicABELnoMM/src/Definitions.h
Log:
Move #include "mkl.h" into the #ifdef that tests for presence of the MKL. Now 'make' continues a bit further. 

We should still test for presence of MKL in configure.ac and switch on __INTEL_MKL__ based on that result...


Modified: pkg/OmicABELnoMM/src/Definitions.h
===================================================================
--- pkg/OmicABELnoMM/src/Definitions.h	2013-12-17 16:38:57 UTC (rev 1477)
+++ pkg/OmicABELnoMM/src/Definitions.h	2013-12-17 16:41:04 UTC (rev 1478)
@@ -22,7 +22,6 @@
     #include <cblas.h>
     #define cpu_freq 4.6
 #else
-    #include "mkl.h"
     //#include "mpi.h"
     //#define cpu_freq 3.0
     #define cpu_freq 3.0
@@ -31,6 +30,7 @@
 #endif
 
 #ifdef __INTEL_MKL__
+    #include "mkl.h"
     #define blas_set_num_threads(n) mkl_set_num_threads(n)
 #else
     #define blas_set_num_threads(n) goto_set_num_threads(n)