From 3a1f07a685b04e58ad66a70d37fc748d05eb3b71 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Tue, 2 Apr 2019 05:22:36 +0200 Subject: [PATCH] Unify intrinsics headers --- include/deal.II/base/vectorization.h | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/include/deal.II/base/vectorization.h b/include/deal.II/base/vectorization.h index 1b8c47005c..39b374b23f 100644 --- a/include/deal.II/base/vectorization.h +++ b/include/deal.II/base/vectorization.h @@ -51,15 +51,9 @@ "Mismatch in vectorization capabilities: AVX-512F was detected during configuration of deal.II and switched on, but it is apparently not available for the file you are trying to compile at the moment. Check compilation flags controlling the instruction set, such as -march=native." #endif -#if DEAL_II_COMPILER_VECTORIZATION_LEVEL >= 2 && \ - (defined(__AVX__) || defined(__AVX512F__)) // AVX, AVX-512 -# include -#elif DEAL_II_COMPILER_VECTORIZATION_LEVEL == 1 && defined(__SSE2__) // SSE2 -# include -#endif - - -#if DEAL_II_COMPILER_VECTORIZATION_LEVEL >= 1 && defined(__ALTIVEC__) +#if defined(_MSC_VER) +# include +#elif defined(__ALTIVEC__) # include // altivec.h defines vector, pixel, bool, but we do not use them, so undefine @@ -67,7 +61,8 @@ # undef vector # undef pixel # undef bool - +#else +# include #endif DEAL_II_NAMESPACE_OPEN -- 2.39.5