Rename to vc_aos

benchmarks/CMakeLists.txt

@@ -65,22 +65,22 @@ if( ALGEBRA_PLUGINS_INCLUDE_VC )
    target_include_directories( algebra_bench_vc_aos INTERFACE 
       "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/vc_aos/include>" )
    target_link_libraries(algebra_bench_vc_aos INTERFACE
-                                                   algebra::vc_vc
+                                                   algebra::vc_aos
                                                    algebra::common_storage)
    add_library( algebra::bench_vc_aos ALIAS algebra_bench_vc_aos )
 
    algebra_add_benchmark( vc_aos_getter
       "vc_aos/vc_aos_getter.cpp"
       LINK_LIBRARIES benchmark::benchmark algebra::bench_common
-                     algebra::bench_vc_aos algebra::vc_vc )
+                     algebra::bench_vc_aos algebra::vc_aos )
    algebra_add_benchmark( vc_aos_vector
       "vc_aos/vc_aos_vector.cpp"
       LINK_LIBRARIES benchmark::benchmark algebra::bench_common
-                     algebra::bench_vc_aos algebra::vc_vc )
+                     algebra::bench_vc_aos algebra::vc_aos )
    algebra_add_benchmark( vc_aos_transform3
       "vc_aos/vc_aos_transform3.cpp"
       LINK_LIBRARIES benchmark::benchmark algebra::bench_common
-                     algebra::bench_vc_aos algebra::vc_vc )
+                     algebra::bench_vc_aos algebra::vc_aos )
 
    if( NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang" )
       add_library( algebra_bench_vc_soa INTERFACE )

benchmarks/vc_aos/include/benchmark/vc_aos/data_generator.hpp

@@ -8,7 +8,7 @@
 #pragma once
 
 // Project include(s)
-#include "algebra/vc_vc.hpp"
+#include "algebra/vc_aos.hpp"
 
 // System include(s)
 #include <algorithm>

benchmarks/vc_aos/vc_aos_getter.cpp

@@ -6,7 +6,7 @@
  */
 
 // Project include(s)
-#include "algebra/vc_vc.hpp"
+#include "algebra/vc_aos.hpp"
 #include "benchmark/common/benchmark_getter.hpp"
 #include "benchmark/vc_aos/data_generator.hpp"
 

benchmarks/vc_aos/vc_aos_transform3.cpp

@@ -6,7 +6,7 @@
  */
 
 // Project include(s)
-#include "algebra/vc_vc.hpp"
+#include "algebra/vc_aos.hpp"
 #include "benchmark/common/benchmark_transform3.hpp"
 #include "benchmark/vc_aos/data_generator.hpp"
 

benchmarks/vc_aos/vc_aos_vector.cpp

@@ -6,7 +6,7 @@
  */
 
 // Project include(s)
-#include "algebra/vc_vc.hpp"
+#include "algebra/vc_aos.hpp"
 #include "benchmark/common/benchmark_vector.hpp"
 #include "benchmark/vc_aos/data_generator.hpp"
 

frontend/CMakeLists.txt

@@ -18,8 +18,8 @@ if( ALGEBRA_PLUGINS_INCLUDE_SMATRIX )
 endif()
 
 if( ALGEBRA_PLUGINS_INCLUDE_VC )
+   add_subdirectory( vc_aos )
    add_subdirectory( vc_cmath )
-   add_subdirectory( vc_vc )
    if( NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang" )
       add_subdirectory( vc_soa )
    endif()

frontend/vc_vc/CMakeLists.txt → frontend/vc_aos/CMakeLists.txt

@@ -5,10 +5,10 @@
 # Mozilla Public License Version 2.0
 
 # Set up the library.
-algebra_add_library( algebra_vc_vc vc_vc
-   "include/algebra/vc_vc.hpp" )
-target_link_libraries( algebra_vc_vc
+algebra_add_library( algebra_vc_aos vc_aos
+   "include/algebra/vc_aos.hpp" )
+target_link_libraries( algebra_vc_aos
    INTERFACE algebra::common algebra::vc_storage algebra::cmath_math
-             algebra::vc_math )
-algebra_test_public_headers( algebra_vc_vc
-   "algebra/vc_vc.hpp" )
+             algebra::vc_aos_math )
+algebra_test_public_headers( algebra_vc_aos
+   "algebra/vc_aos.hpp" )

frontend/vc_vc/include/algebra/vc_vc.hpp → frontend/vc_aos/include/algebra/vc_aos.hpp

@@ -9,8 +9,8 @@
 
 // Project include(s).
 #include "algebra/math/cmath.hpp"
-#include "algebra/math/vc.hpp"
-#include "algebra/storage/vc.hpp"
+#include "algebra/math/vc_aos.hpp"
+#include "algebra/storage/vc_aos.hpp"
 
 // System include(s).
 #include <cassert>
@@ -120,15 +120,4 @@ using vc::math::normalize;
 
 }  // namespace vector
 
-namespace matrix {
-
-using size_type = vc::size_type;
-
-template <typename T, size_type N>
-using array_type = vc::storage_type<T, N>;
-
-template <typename T, size_type ROWS, size_type COLS>
-using matrix_type = vc::matrix_type<T, ROWS, COLS>;
-
-}  // namespace matrix
 }  // namespace algebra

frontend/vc_cmath/CMakeLists.txt

@@ -9,6 +9,6 @@ algebra_add_library( algebra_vc_cmath vc_cmath
    "include/algebra/vc_cmath.hpp" )
 target_link_libraries( algebra_vc_cmath
    INTERFACE algebra::common algebra::vc_storage algebra::cmath_math
-             algebra::vc_math )
+             algebra::vc_aos_math )
 algebra_test_public_headers( algebra_vc_cmath
    "algebra/vc_cmath.hpp" )

frontend/vc_cmath/include/algebra/vc_cmath.hpp

@@ -9,8 +9,8 @@
 
 // Project include(s).
 #include "algebra/math/cmath.hpp"
-#include "algebra/math/vc.hpp"
-#include "algebra/storage/vc.hpp"
+#include "algebra/math/vc_aos.hpp"
+#include "algebra/storage/vc_aos.hpp"
 
 /// @name Operators on @c algebra::vc types
 /// @{

math/CMakeLists.txt

@@ -17,7 +17,7 @@ if( ALGEBRA_PLUGINS_INCLUDE_SMATRIX )
    add_subdirectory( smatrix )
 endif()
 if( ALGEBRA_PLUGINS_INCLUDE_VC )
-   add_subdirectory( vc )
+   add_subdirectory( vc_aos )
    if( NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang" )
       add_subdirectory( vc_soa )
    endif()

math/vc_aos/CMakeLists.txt

@@ -0,0 +1,17 @@
+# Algebra plugins library, part of the ACTS project (R&D line)
+#
+# (c) 2021-2023 CERN for the benefit of the ACTS project
+#
+# Mozilla Public License Version 2.0
+
+# Set up the library.
+algebra_add_library( algebra_vc_aos_math vc_aos_math
+   "include/algebra/math/vc_aos.hpp"
+   "include/algebra/math/impl/vc_aos_getter.hpp"
+   "include/algebra/math/impl/vc_aos_transform3.hpp"
+   "include/algebra/math/impl/vc_aos_vector.hpp" )
+target_link_libraries( algebra_vc_aos_math
+   INTERFACE Vc::Vc algebra::common algebra::common_math algebra::vc_storage
+             algebra::cmath_math )
+algebra_test_public_headers( algebra_vc_aos_math
+   "algebra/math/vc_aos.hpp" )

math/vc/include/algebra/math/impl/vc_getter.hpp → math/vc_aos/include/algebra/math/impl/vc_aos_getter.hpp

@@ -9,7 +9,7 @@
 
 // Project include(s).
 #include "algebra/math/common.hpp"
-#include "algebra/math/impl/vc_vector.hpp"
+#include "algebra/math/impl/vc_aos_vector.hpp"
 #include "algebra/qualifiers.hpp"
 #include "algebra/storage/vector.hpp"
 

math/vc/include/algebra/math/impl/vc_transform3.hpp → math/vc_aos/include/algebra/math/impl/vc_aos_transform3.hpp

@@ -9,7 +9,7 @@
 
 // Project include(s).
 #include "algebra/math/cmath.hpp"
-#include "algebra/math/impl/vc_vector.hpp"
+#include "algebra/math/impl/vc_aos_vector.hpp"
 #include "algebra/qualifiers.hpp"
 
 // Vc include(s).

math/vc/include/algebra/math/vc.hpp → math/vc_aos/include/algebra/math/vc_aos.hpp

@@ -8,6 +8,6 @@
 #pragma once
 
 // Project include(s).
-#include "algebra/math/impl/vc_getter.hpp"
-#include "algebra/math/impl/vc_transform3.hpp"
-#include "algebra/math/impl/vc_vector.hpp"
+#include "algebra/math/impl/vc_aos_getter.hpp"
+#include "algebra/math/impl/vc_aos_transform3.hpp"
+#include "algebra/math/impl/vc_aos_vector.hpp"

storage/CMakeLists.txt

@@ -14,7 +14,7 @@ if( ALGEBRA_PLUGINS_INCLUDE_SMATRIX )
    add_subdirectory( smatrix )
 endif()
 if( ALGEBRA_PLUGINS_INCLUDE_VC )
-   add_subdirectory( vc )
+   add_subdirectory( vc_aos )
    if( NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang" )
       add_subdirectory( vc_soa )
    endif()

storage/vc/CMakeLists.txt → storage/vc_aos/CMakeLists.txt

@@ -6,9 +6,8 @@
 
 # Set up the library.
 algebra_add_library( algebra_vc_storage vc_storage
-   "include/algebra/storage/vc.hpp"
-   "include/algebra/storage/impl/vc_array4_wrapper.hpp" )
+   "include/algebra/storage/vc_aos.hpp" )
 target_link_libraries( algebra_vc_storage
    INTERFACE algebra::common algebra::common_storage Vc::Vc )
 algebra_test_public_headers( algebra_vc_storage
-   "algebra/storage/vc.hpp" )
+   "algebra/storage/vc_aos.hpp" )

tests/CMakeLists.txt

@@ -38,10 +38,10 @@ if( ALGEBRA_PLUGINS_INCLUDE_SMATRIX )
 endif()
 
 if( ALGEBRA_PLUGINS_INCLUDE_VC )
-   algebra_add_test( vc
-      "vc/vc_cmath.cpp" "vc/vc_vc.cpp"
+   algebra_add_test( vc_aos
+      "vc_aos/vc_cmath.cpp" "vc_aos/vc_aos.cpp"
       LINK_LIBRARIES GTest::gtest_main algebra::tests_common
-                      algebra::vc_cmath algebra::vc_vc )
+                      algebra::vc_cmath algebra::vc_aos )
 
    if( NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "AppleClang" )
       algebra_add_test( vc_soa

tests/common/test_host_basics.hpp

@@ -62,14 +62,14 @@ TYPED_TEST_P(test_host_basics_vector, local_vectors) {
   ASSERT_NEAR(phi, M_PI_4, this->m_epsilon);
 
   typename TypeParam::scalar perp = algebra::getter::perp(vD);
-  ASSERT_NEAR(perp, std::sqrt(2.f), this->m_epsilon);
+  ASSERT_NEAR(perp, std::sqrt(2.), this->m_epsilon);
 
   typename TypeParam::scalar norm = algebra::getter::norm(vD);
-  ASSERT_NEAR(norm, std::sqrt(2.f), this->m_epsilon);
+  ASSERT_NEAR(norm, std::sqrt(2.), this->m_epsilon);
 
   typename TypeParam::vector2 vDnorm = algebra::vector::normalize(vD);
-  ASSERT_NEAR(vDnorm[0], 1.f / std::sqrt(2.f), this->m_epsilon);
-  ASSERT_NEAR(vDnorm[1], 1.f / std::sqrt(2.f), this->m_epsilon);
+  ASSERT_NEAR(vDnorm[0], 1. / std::sqrt(2.), this->m_epsilon);
+  ASSERT_NEAR(vDnorm[1], 1. / std::sqrt(2.), this->m_epsilon);
 }
 
 // This defines the vector3 test suite
@@ -105,16 +105,16 @@ TYPED_TEST_P(test_host_basics_vector, vector3) {
   ASSERT_NEAR(phi, M_PI_4, this->m_epsilon);
 
   typename TypeParam::scalar theta = algebra::getter::theta(vD);
-  ASSERT_NEAR(theta, std::atan2(std::sqrt(2.f), 1.f), this->m_epsilon);
+  ASSERT_NEAR(theta, std::atan2(std::sqrt(2.), 1.), this->m_epsilon);
 
   typename TypeParam::scalar eta = algebra::getter::eta(vD);
   ASSERT_NEAR(eta, 0.65847891569137573, this->m_isclose);
 
   typename TypeParam::scalar perp = algebra::getter::perp(vD);
-  ASSERT_NEAR(perp, std::sqrt(2.f), this->m_epsilon);
+  ASSERT_NEAR(perp, std::sqrt(2.), this->m_epsilon);
 
   typename TypeParam::scalar norm = algebra::getter::norm(vD);
-  ASSERT_NEAR(norm, std::sqrt(3.f), this->m_epsilon);
+  ASSERT_NEAR(norm, std::sqrt(3.), this->m_epsilon);
 }
 
 // This defines the vector operation test suite
@@ -124,9 +124,9 @@ TYPED_TEST_P(test_host_basics_vector, getter) {
 
   // Normalization
   typename TypeParam::vector3 v3n = algebra::vector::normalize(v3);
-  ASSERT_NEAR(v3n[0], 1.f / std::sqrt(3.f), this->m_epsilon);
-  ASSERT_NEAR(v3n[1], 1.f / std::sqrt(3.f), this->m_epsilon);
-  ASSERT_NEAR(v3n[2], 1.f / std::sqrt(3.f), this->m_epsilon);
+  ASSERT_NEAR(v3n[0], 1. / std::sqrt(3.), this->m_epsilon);
+  ASSERT_NEAR(v3n[1], 1. / std::sqrt(3.), this->m_epsilon);
+  ASSERT_NEAR(v3n[2], 1. / std::sqrt(3.), this->m_epsilon);
 
   // Cross product
   typename TypeParam::vector3 z =

tests/vc/vc_vc.cpp → tests/vc_aos/vc_aos.cpp

@@ -6,7 +6,7 @@
  */
 
 // Project include(s).
-#include "algebra/vc_vc.hpp"
+#include "algebra/vc_aos.hpp"
 
 // Test include(s).
 #include "test_host_basics.hpp"
@@ -23,9 +23,9 @@ struct test_specialisation_name {
   static std::string GetName(int i) {
     switch (i) {
       case 0:
-        return "vc_vc<float>";
+        return "vc_aos<float>";
       case 1:
-        return "vc_vc<double>";
+        return "vc_aos<double>";
       default:
         return "unknown";
     }
@@ -50,11 +50,11 @@ typedef testing::Types<
                algebra::vc::vector2<double>, algebra::vc::vector3<double>,
                algebra::vc::transform3<double>, std::size_t,
                algebra::vc::matrix_type, double>>
-    vc_vc_types;
+    vc_aos_types;
 INSTANTIATE_TYPED_TEST_SUITE_P(algebra_plugins, test_host_basics_vector,
-                               vc_vc_types, test_specialisation_name);
+                               vc_aos_types, test_specialisation_name);
 // @TODO: Implement
 /*INSTANTIATE_TYPED_TEST_SUITE_P(algebra_plugins, test_host_basics_matrix,
                                array_cmath_types, test_specialisation_name);*/
 INSTANTIATE_TYPED_TEST_SUITE_P(algebra_plugins, test_host_basics_transform,
-                               vc_vc_types, test_specialisation_name);
+                               vc_aos_types, test_specialisation_name);