From 2f6a2d6e08e0c08be2cfef36236a266443330429 Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Tue, 1 Oct 2024 12:53:26 +0200 Subject: [PATCH] Merge pull request #17739 from tamiko/fix_configure CMake: Bugfix: use #cmakedefine defining/undefining preprocessor macro --- include/deal.II/base/config.h.in | 2 -- include/deal.II/base/vectorization.h | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/deal.II/base/config.h.in b/include/deal.II/base/config.h.in index e09209db4d..7689051986 100644 --- a/include/deal.II/base/config.h.in +++ b/include/deal.II/base/config.h.in @@ -138,8 +138,6 @@ #define DEAL_II_COMPILER_VECTORIZATION_LEVEL 0 #endif -#define DEAL_II_HAVE_ARM_NEON @DEAL_II_HAVE_ARM_NEON@ - #define DEAL_II_OPENMP_SIMD_PRAGMA @DEAL_II_OPENMP_SIMD_PRAGMA@ diff --git a/include/deal.II/base/vectorization.h b/include/deal.II/base/vectorization.h index b43f59a83a..5a05d48652 100644 --- a/include/deal.II/base/vectorization.h +++ b/include/deal.II/base/vectorization.h @@ -1003,7 +1003,7 @@ vectorized_transpose_and_store(const bool add_into, #ifndef DOXYGEN -# if defined(DEAL_II_HAVE_ARM_NEON) && defined(__ARM_NEON) +# if DEAL_II_VECTORIZATION_WIDTH_IN_BITS >= 128 && defined(__ARM_NEON) /** * Specialization for double and ARM Neon. @@ -6313,7 +6313,7 @@ compare_and_apply_mask(const VectorizedArray &left, # endif -# if defined(DEAL_II_HAVE_ARM_NEON) && defined(__ARM_NEON) +# if DEAL_II_VECTORIZATION_WIDTH_IN_BITS >= 128 && defined(__ARM_NEON) template DEAL_II_ALWAYS_INLINE inline VectorizedArray -- 2.39.5