Changes in src/aubio_priv.h [2ca09bf:096a174]

File:

• src/aubio_priv.h (modified) (5 diffs)

src/aubio_priv.h

@@ -75 +75 @@
 #endif
 
-#if defined(HAVE_BLAS) // --enable-blas=true
-// check which cblas header we found
+#if defined(HAVE_ACCELERATE)
+#define HAVE_ATLAS 1
+#define HAVE_BLAS 1
+#include <Accelerate/Accelerate.h>
+#elif defined(HAVE_ATLAS_CBLAS_H)
+#elif defined(HAVE_BLAS)
 #if defined(HAVE_ATLAS_CBLAS_H)
 #define HAVE_ATLAS 1
@@ -84 +88 @@
 #elif defined(HAVE_CBLAS_H)
 #include <cblas.h>
-#elif !defined(HAVE_ACCELERATE)
-#error "HAVE_BLAS was defined, but no blas header was found"
-#endif /* end of cblas includes */
-#endif
-
-#if defined(HAVE_ACCELERATE)
-// include accelerate framework after blas
-#define HAVE_ATLAS 1
-#define HAVE_BLAS 1
+#endif
+#endif
+
+#ifdef HAVE_ACCELERATE
 #include <Accelerate/Accelerate.h>
-
 #ifndef HAVE_AUBIO_DOUBLE
 #define aubio_vDSP_mmov       vDSP_mmov
@@ -134 +132 @@
 #define aubio_cblas_swap      cblas_sswap
 #define aubio_cblas_dot       cblas_sdot
+#define aubio_cblas__gemv     cblas_sgemv
 #else /* HAVE_AUBIO_DOUBLE */
 #ifdef HAVE_ATLAS
@@ -141 +140 @@
 #define aubio_cblas_swap      cblas_dswap
 #define aubio_cblas_dot       cblas_ddot
+#define aubio_cblas__gemv     cblas_dgemv
 #endif /* HAVE_AUBIO_DOUBLE */
 #endif /* HAVE_BLAS */
@@ -399 +399 @@
 #endif /* DEBUG */
 
+// goto to failure if condition x is not true
+#define AUBIO_GOTO_FAILURE(x) if (!(x)) goto failure
+
+#define AUBIO_ASSERT_EQUAL_SHAPE(t1, t2) { \
+    AUBIO_ASSERT(t1 && t2); \
+    AUBIO_ASSERT(t1->ndim == t2->ndim); \
+    uint_t nn; \
+    for (nn = 0; nn < t1->ndim; nn++) \
+      AUBIO_ASSERT(t1->shape[nn] == t2->shape[nn]); \
+    }
+
 #endif /* AUBIO_PRIV_H */