]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Merge pull request #17739 from tamiko/fix_configure
authorMartin Kronbichler <martin.kronbichler@rub.de>
Tue, 1 Oct 2024 10:53:26 +0000 (12:53 +0200)
committerDaniel Arndt <arndtd@ornl.gov>
Tue, 19 Nov 2024 14:25:38 +0000 (09:25 -0500)
CMake: Bugfix: use #cmakedefine defining/undefining preprocessor macro

include/deal.II/base/config.h.in
include/deal.II/base/vectorization.h

index e09209db4d1e6bd82b8dd2dd4fc028f8a7cf1f1d..768905198692ff9446a8dfd764ac6116a575afca 100644 (file)
 #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@
 
 
index b43f59a83a02b7b798d65191515341b7861a6f66..5a05d48652e2335a7a3e2f95af34f0eb3fe08d6b 100644 (file)
@@ -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<double, 2> &left,
 
 #  endif
 
-#  if defined(DEAL_II_HAVE_ARM_NEON) && defined(__ARM_NEON)
+#  if DEAL_II_VECTORIZATION_WIDTH_IN_BITS >= 128 && defined(__ARM_NEON)
 
 template <SIMDComparison predicate>
 DEAL_II_ALWAYS_INLINE inline VectorizedArray<float, 4>

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.