Merge pull request #18 from jcarpent/devel

Use PROXSUITE_VECTORIZE and change logic

Author: jcarpent

CMakeLists.txt

@@ -109,17 +109,6 @@ set(EXPORTED_TARGETS_LIST proxsuite)
 
 add_header_group(${PROJECT_NAME}_HEADERS)
 
-add_library(proxsuite-not-vectorized INTERFACE)
-target_link_libraries(
-  proxsuite-not-vectorized
-  PUBLIC
-  INTERFACE proxsuite)
-target_compile_definitions(
-  proxsuite-not-vectorized
-  PUBLIC
-  INTERFACE PROXSUITE_DONT_VECTORIZE)
-list(APPEND EXPORTED_TARGETS_LIST proxsuite-not-vectorized)
-
 if(BUILD_WITH_VECTORIZATION_SUPPORT)
   add_library(proxsuite-vectorized INTERFACE)
   target_link_libraries(
@@ -130,6 +119,10 @@ if(BUILD_WITH_VECTORIZATION_SUPPORT)
     proxsuite-vectorized
     PUBLIC
     INTERFACE simde)
+  target_compile_definitions(
+    proxsuite-vectorized
+    PUBLIC
+    INTERFACE PROXSUITE_VECTORIZE)
   list(APPEND EXPORTED_TARGETS_LIST proxsuite-vectorized)
 endif()
 

bindings/python/CMakeLists.txt

@@ -61,7 +61,7 @@ function(CREATE_PYTHON_TARGET target_name COMPILE_OPTIONS dependencies)
   install(TARGETS ${target_name} DESTINATION ${${PYWRAP}_INSTALL_DIR})
 endfunction()
 
-create_python_target(proxsuite_pywrap "" proxsuite-not-vectorized)
+create_python_target(proxsuite_pywrap "" proxsuite)
 if(BUILD_WITH_VECTORIZATION_SUPPORT)
   if(BUILD_BINDINGS_WITH_AVX2_SUPPORT)
     create_python_target(proxsuite_pywrap_avx2 "-mavx2;-mfma"

include/proxsuite/linalg/dense/core.hpp

@@ -11,7 +11,7 @@
 
 #include <immintrin.h>
 
-#ifndef PROXSUITE_DONT_VECTORIZE
+#ifdef PROXSUITE_VECTORIZE
 #include <cmath> // to avoid error of the type no member named 'isnan' in namespace 'std';
 #include <simde/x86/avx2.h>
 #include <simde/x86/fma.h>
@@ -161,7 +161,7 @@ struct Pack<T, 1>
   }
 };
 
-#ifndef PROXSUITE_DONT_VECTORIZE
+#ifdef PROXSUITE_VECTORIZE
 template<>
 struct Pack<f32, 4>
 {
@@ -272,7 +272,7 @@ struct NativePackInfo
   using Type = Pack<f32, N>;
 };
 
-#ifndef PROXSUITE_DONT_VECTORIZE
+#ifdef PROXSUITE_VECTORIZE
 template<>
 struct NativePackInfo<f32>
 {
@@ -308,7 +308,7 @@ round_up(T a, T b) noexcept -> T
   return a + (b - 1) / b * b;
 }
 
-#ifndef PROXSUITE_DONT_VECTORIZE
+#ifdef PROXSUITE_VECTORIZE
 template<typename T>
 using should_vectorize =
   proxsuite::linalg::veg::meta::bool_constant<VEG_CONCEPT(same<T, f32>) ||

include/proxsuite/linalg/dense/ldlt.hpp

@@ -32,13 +32,13 @@ template<>
 struct proxsuite::linalg::veg::mem::Alloc<
   proxsuite::linalg::dense::_detail::SimdAlignedSystemAlloc>
 {
-#ifdef PROXSUITE_DONT_VECTORIZE
-  static constexpr usize min_align = 0;
-#else
+#ifdef PROXSUITE_VECTORIZE
   static constexpr usize min_align = alignof(std::max_align_t) >
                                          SIMDE_NATURAL_VECTOR_SIZE / 8
                                        ? SIMDE_NATURAL_VECTOR_SIZE / 8
                                        : alignof(std::max_align_t);
+#else
+  static constexpr usize min_align = 0;
 #endif
 
   using RefMut = proxsuite::linalg::veg::RefMut<

test/CMakeLists.txt

@@ -16,7 +16,7 @@ target_include_directories(proxsuite-test-util PUBLIC ./include)
 if(BUILD_WITH_VECTORIZATION_SUPPORT)
   target_link_libraries(proxsuite-test-util proxsuite-vectorized matio)
 else()
-  target_link_libraries(proxsuite-test-util proxsuite-not-vectorized matio)
+  target_link_libraries(proxsuite-test-util proxsuite matio)
 endif()
 
 macro(proxsuite_test name path)