From d5d63e218f923fc89e68b1671266d494d80fe0dd Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Tue, 24 Mar 2020 18:48:02 +0100 Subject: [PATCH] Do not deprecate DEAL_II_COMPILER_VECTORIZATION_LEVEL for now --- include/deal.II/base/config.h.in | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/include/deal.II/base/config.h.in b/include/deal.II/base/config.h.in index 83c967b317..d33c68b64e 100644 --- a/include/deal.II/base/config.h.in +++ b/include/deal.II/base/config.h.in @@ -127,27 +127,14 @@ /* * Backward compatibility setting */ -#ifdef DEAL_II_COMPILER_HAS_DIAGNOSTIC_PRAGMA -# if DEAL_II_VECTORIZATION_WIDTH_IN_BITS == 512 -# define DEAL_II_COMPILER_VECTORIZATION_LEVEL _Pragma ("GCC warning \"The DEAL_II_COMPILER_VECTORIZATION_LEVEL macro is deprecated\"") 3 -# elif DEAL_II_VECTORIZATION_WIDTH_IN_BITS == 256 -# define DEAL_II_COMPILER_VECTORIZATION_LEVEL _Pragma ("GCC warning \"The DEAL_II_COMPILER_VECTORIZATION_LEVEL macro is deprecated\"") 2 -# elif DEAL_II_VECTORIZATION_WIDTH_IN_BITS == 128 -# define DEAL_II_COMPILER_VECTORIZATION_LEVEL _Pragma ("GCC warning \"The DEAL_II_COMPILER_VECTORIZATION_LEVEL macro is deprecated\"") 1 -# else -# define DEAL_II_COMPILER_VECTORIZATION_LEVEL _Pragma ("GCC warning \"The DEAL_II_COMPILER_VECTORIZATION_LEVEL macro is deprecated\"")\ - 0 -# endif +#if DEAL_II_VECTORIZATION_WIDTH_IN_BITS == 512 +#define DEAL_II_COMPILER_VECTORIZATION_LEVEL 3 +#elif DEAL_II_VECTORIZATION_WIDTH_IN_BITS == 256 +#define DEAL_II_COMPILER_VECTORIZATION_LEVEL 2 +#elif DEAL_II_VECTORIZATION_WIDTH_IN_BITS == 128 +#define DEAL_II_COMPILER_VECTORIZATION_LEVEL 1 #else -# if DEAL_II_VECTORIZATION_WIDTH_IN_BITS == 512 -# define DEAL_II_COMPILER_VECTORIZATION_LEVEL 3 -# elif DEAL_II_VECTORIZATION_WIDTH_IN_BITS == 256 -# define DEAL_II_COMPILER_VECTORIZATION_LEVEL 2 -# elif DEAL_II_VECTORIZATION_WIDTH_IN_BITS == 128 -# define DEAL_II_COMPILER_VECTORIZATION_LEVEL 1 -# else -# define DEAL_II_COMPILER_VECTORIZATION_LEVEL 0 -# endif +#define DEAL_II_COMPILER_VECTORIZATION_LEVEL 0 #endif #define DEAL_II_OPENMP_SIMD_PRAGMA @DEAL_II_OPENMP_SIMD_PRAGMA@ -- 2.39.5