diff --git a/frontend/array_cmath/include/algebra/array_cmath.hpp b/frontend/array_cmath/include/algebra/array_cmath.hpp index 1d690eea..179ac86f 100644 --- a/frontend/array_cmath/include/algebra/array_cmath.hpp +++ b/frontend/array_cmath/include/algebra/array_cmath.hpp @@ -70,79 +70,75 @@ using cmath::normalize; namespace matrix { -template +using size_type = std::size_t; + +template using array_type = array::storage_type; -template +template using matrix_type = array::matrix_type; -template +template using element_getter = cmath::element_getter; -template +template using block_getter = cmath::block_getter; // matrix actor -template -using actor = cmath::matrix::actor, - block_getter>; +using actor = + cmath::matrix::actor, block_getter>; namespace determinant { // determinant aggregation -template +template using actor = cmath::matrix::determinant::actor; // determinant::cofactor -template +template using cofactor = cmath::matrix::determinant::cofactor, - Ds...>; + element_getter, Ds...>; // determinant::hard_coded -template +template using hard_coded = cmath::matrix::determinant::hard_coded, - Ds...>; + element_getter, Ds...>; // preset(s) as standard option(s) for user's convenience -template -using preset0 = actor, - hard_coded>; +template +using preset0 = actor, hard_coded>; } // namespace determinant namespace inverse { // inverion aggregation -template +template using actor = cmath::matrix::inverse::actor; // inverse::cofactor -template +template using cofactor = cmath::matrix::inverse::cofactor, - Ds...>; + element_getter, Ds...>; // inverse::hard_coded -template +template using hard_coded = cmath::matrix::inverse::hard_coded, - Ds...>; + element_getter, Ds...>; // preset(s) as standard option(s) for user's convenience -template -using preset0 = actor, - hard_coded>; +template +using preset0 = actor, hard_coded>; } // namespace inverse @@ -154,9 +150,8 @@ namespace array { /// @{ template -using transform3_actor = - matrix::actor, - matrix::inverse::preset0>; +using transform3_actor = matrix::actor, + matrix::inverse::preset0>; template using transform3 = cmath::transform3>; diff --git a/frontend/eigen_cmath/include/algebra/eigen_cmath.hpp b/frontend/eigen_cmath/include/algebra/eigen_cmath.hpp index cc7d7fdb..ec13c712 100644 --- a/frontend/eigen_cmath/include/algebra/eigen_cmath.hpp +++ b/frontend/eigen_cmath/include/algebra/eigen_cmath.hpp @@ -70,15 +70,17 @@ using eigen::math::normalize; namespace matrix { -template +using size_type = int; + +template using array_type = eigen::storage_type; -template +template using matrix_type = eigen::matrix_type; using element_getter = eigen::math::element_getter; using block_getter = eigen::math::block_getter; // matrix actor -template using actor = cmath::matrix::actor +template using actor = cmath::matrix::determinant::actor; // determinant::cofactor -template +template using cofactor = cmath::matrix::determinant::cofactor; // determinant::hard_coded -template +template using hard_coded = cmath::matrix::determinant::hard_coded; // preset(s) as standard option(s) for user's convenience -template -using preset0 = actor, - hard_coded>; +template +using preset0 = actor, hard_coded>; } // namespace determinant namespace inverse { // inverion aggregation -template +template using actor = cmath::matrix::inverse::actor; // inverse::cofactor -template +template using cofactor = cmath::matrix::inverse::cofactor; // inverse::hard_coded -template +template using hard_coded = cmath::matrix::inverse::hard_coded; // preset(s) as standard option(s) for user's convenience -template -using preset0 = actor, - hard_coded>; +template +using preset0 = actor, hard_coded>; } // namespace inverse @@ -145,9 +145,8 @@ namespace eigen { template using transform3_actor = - algebra::matrix::actor, - algebra::matrix::inverse::preset0>; + algebra::matrix::actor, + algebra::matrix::inverse::preset0>; template using transform3 = cmath::transform3>; diff --git a/frontend/smatrix_cmath/include/algebra/smatrix_cmath.hpp b/frontend/smatrix_cmath/include/algebra/smatrix_cmath.hpp index 68175085..70d16afa 100644 --- a/frontend/smatrix_cmath/include/algebra/smatrix_cmath.hpp +++ b/frontend/smatrix_cmath/include/algebra/smatrix_cmath.hpp @@ -64,9 +64,11 @@ using smatrix::math::normalize; namespace matrix { -template +using size_type = unsigned int; + +template using array_type = smatrix::storage_type; -template +template using matrix_type = smatrix::matrix_type; template using element_getter = smatrix::math::element_getter; @@ -74,7 +76,7 @@ template using block_getter = smatrix::math::block_getter; // matrix actor -template using actor = cmath::matrix::actor +template using actor = cmath::matrix::determinant::actor; // determinant::cofactor -template +template using cofactor = cmath::matrix::determinant::cofactor, Ds...>; // determinant::hard_coded -template +template using hard_coded = cmath::matrix::determinant::hard_coded, Ds...>; // preset(s) as standard option(s) for user's convenience -template -using preset0 = actor, - hard_coded>; +template +using preset0 = actor, hard_coded>; } // namespace determinant namespace inverse { // inverion aggregation -template +template using actor = cmath::matrix::inverse::actor; // inverse::cofactor -template +template using cofactor = cmath::matrix::inverse::cofactor, Ds...>; // inverse::hard_coded -template +template using hard_coded = cmath::matrix::inverse::hard_coded, Ds...>; // preset(s) as standard option(s) for user's convenience -template -using preset0 = actor, - hard_coded>; +template +using preset0 = actor, hard_coded>; } // namespace inverse @@ -141,9 +141,9 @@ namespace smatrix { /// @{ template -using transform3_actor = algebra::matrix::actor< - unsigned int, T, algebra::matrix::determinant::preset0, - algebra::matrix::inverse::preset0>; +using transform3_actor = + algebra::matrix::actor, + algebra::matrix::inverse::preset0>; template using transform3 = cmath::transform3>; diff --git a/frontend/vc_cmath/include/algebra/vc_cmath.hpp b/frontend/vc_cmath/include/algebra/vc_cmath.hpp index c14a2266..fc224208 100644 --- a/frontend/vc_cmath/include/algebra/vc_cmath.hpp +++ b/frontend/vc_cmath/include/algebra/vc_cmath.hpp @@ -81,79 +81,75 @@ using vc::math::normalize; namespace matrix { -template +using size_type = std::size_t; + +template using array_type = Vc::array; -template +template using matrix_type = vc::matrix_type; -template +template using element_getter = cmath::element_getter; -template +template using block_getter = cmath::block_getter; // matrix actor -template -using actor = cmath::matrix::actor, - block_getter>; +using actor = + cmath::matrix::actor, block_getter>; namespace determinant { // determinant aggregation -template +template using actor = cmath::matrix::determinant::actor; // determinant::cofactor -template +template using cofactor = cmath::matrix::determinant::cofactor, - Ds...>; + element_getter, Ds...>; // determinant::hard_coded -template +template using hard_coded = cmath::matrix::determinant::hard_coded, - Ds...>; + element_getter, Ds...>; // preset(s) as standard option(s) for user's convenience -template -using preset0 = actor, - hard_coded>; +template +using preset0 = actor, hard_coded>; } // namespace determinant namespace inverse { // inverion aggregation -template +template using actor = cmath::matrix::inverse::actor; // inverse::cofactor -template +template using cofactor = cmath::matrix::inverse::cofactor, - Ds...>; + element_getter, Ds...>; // inverse::hard_coded -template +template using hard_coded = cmath::matrix::inverse::hard_coded, - Ds...>; + element_getter, Ds...>; // preset(s) as standard option(s) for user's convenience -template -using preset0 = actor, - hard_coded>; +template +using preset0 = actor, hard_coded>; } // namespace inverse @@ -165,9 +161,8 @@ namespace vc { /// @{ template -using transform3_actor = - matrix::actor, - matrix::inverse::preset0>; +using transform3_actor = matrix::actor, + matrix::inverse::preset0>; template using transform3 = cmath::transform3>; diff --git a/frontend/vc_vc/include/algebra/vc_vc.hpp b/frontend/vc_vc/include/algebra/vc_vc.hpp index f4c2de4e..0af9d0a5 100644 --- a/frontend/vc_vc/include/algebra/vc_vc.hpp +++ b/frontend/vc_vc/include/algebra/vc_vc.hpp @@ -148,79 +148,75 @@ using vc::math::normalize; namespace matrix { -template +using size_type = std::size_t; + +template using array_type = vc::storage_type; -template +template using matrix_type = vc::matrix_type; -template +template using element_getter = cmath::element_getter; -template +template using block_getter = cmath::block_getter; // matrix actor -template -using actor = cmath::matrix::actor, - block_getter>; +using actor = + cmath::matrix::actor, block_getter>; namespace determinant { // determinant aggregation -template +template using actor = cmath::matrix::determinant::actor; // determinant::cofactor -template +template using cofactor = cmath::matrix::determinant::cofactor, - Ds...>; + element_getter, Ds...>; // determinant::hard_coded -template +template using hard_coded = cmath::matrix::determinant::hard_coded, - Ds...>; + element_getter, Ds...>; // preset(s) as standard option(s) for user's convenience -template -using preset0 = actor, - hard_coded>; +template +using preset0 = actor, hard_coded>; } // namespace determinant namespace inverse { // inverion aggregation -template +template using actor = cmath::matrix::inverse::actor; // inverse::cofactor -template +template using cofactor = cmath::matrix::inverse::cofactor, - Ds...>; + element_getter, Ds...>; // inverse::hard_coded -template +template using hard_coded = cmath::matrix::inverse::hard_coded, - Ds...>; + element_getter, Ds...>; // preset(s) as standard option(s) for user's convenience -template -using preset0 = actor, - hard_coded>; +template +using preset0 = actor, hard_coded>; } // namespace inverse diff --git a/frontend/vecmem_cmath/include/algebra/vecmem_cmath.hpp b/frontend/vecmem_cmath/include/algebra/vecmem_cmath.hpp index d0c50380..20861caa 100644 --- a/frontend/vecmem_cmath/include/algebra/vecmem_cmath.hpp +++ b/frontend/vecmem_cmath/include/algebra/vecmem_cmath.hpp @@ -71,78 +71,75 @@ using cmath::normalize; namespace matrix { -template +using size_type = std::size_t; + +template using array_type = vecmem::storage_type; -template + +template using matrix_type = vecmem::matrix_type; -template +template using element_getter = cmath::element_getter; -template +template using block_getter = cmath::block_getter; // matrix actor -template -using actor = cmath::matrix::actor, - block_getter>; +using actor = + cmath::matrix::actor, block_getter>; namespace determinant { // determinant aggregation -template +template using actor = cmath::matrix::determinant::actor; // determinant::cofactor -template +template using cofactor = cmath::matrix::determinant::cofactor, - Ds...>; + element_getter, Ds...>; // determinant::hard_coded -template +template using hard_coded = cmath::matrix::determinant::hard_coded, - Ds...>; + element_getter, Ds...>; // preset(s) as standard option(s) for user's convenience -template -using preset0 = actor, - hard_coded>; +template +using preset0 = actor, hard_coded>; } // namespace determinant namespace inverse { // inverion aggregation -template +template using actor = cmath::matrix::inverse::actor; // inverse::cofactor -template +template using cofactor = cmath::matrix::inverse::cofactor, - Ds...>; + element_getter, Ds...>; // inverse::hard_coded -template +template using hard_coded = cmath::matrix::inverse::hard_coded, - Ds...>; + element_getter, Ds...>; // preset(s) as standard option(s) for user's convenience -template -using preset0 = actor, - hard_coded>; +template +using preset0 = actor, hard_coded>; } // namespace inverse @@ -154,9 +151,8 @@ namespace vecmem { /// @{ template -using transform3_actor = - matrix::actor, - matrix::inverse::preset0>; +using transform3_actor = matrix::actor, + matrix::inverse::preset0>; template using transform3 = cmath::transform3>; diff --git a/tests/accelerator/cuda/array_cmath.cu b/tests/accelerator/cuda/array_cmath.cu index 3174c55b..50797dbf 100644 --- a/tests/accelerator/cuda/array_cmath.cu +++ b/tests/accelerator/cuda/array_cmath.cu @@ -40,20 +40,18 @@ typedef testing::Types< algebra::array::transform3, algebra::array::cartesian2, algebra::array::polar2, algebra::array::cylindrical2, std::size_t, algebra::array::matrix_type, - algebra::matrix::actor< - std::size_t, float, - algebra::matrix::determinant::preset0, - algebra::matrix::inverse::preset0>>, + algebra::matrix::actor, + algebra::matrix::inverse::preset0>>, test_types< double, algebra::array::point2, algebra::array::point3, algebra::array::vector2, algebra::array::vector3, algebra::array::transform3, algebra::array::cartesian2, algebra::array::polar2, algebra::array::cylindrical2, std::size_t, algebra::array::matrix_type, - algebra::matrix::actor< - std::size_t, double, - algebra::matrix::determinant::preset0, - algebra::matrix::inverse::preset0>>> + algebra::matrix::actor, + algebra::matrix::inverse::preset0>>> array_cmath_types; INSTANTIATE_TYPED_TEST_SUITE_P(algebra_plugins, test_cuda_basics, array_cmath_types, test_specialisation_name); diff --git a/tests/accelerator/cuda/eigen_cmath.cu b/tests/accelerator/cuda/eigen_cmath.cu index b526298b..ceba4b5d 100644 --- a/tests/accelerator/cuda/eigen_cmath.cu +++ b/tests/accelerator/cuda/eigen_cmath.cu @@ -40,18 +40,18 @@ typedef testing::Types< algebra::eigen::transform3, algebra::eigen::cartesian2, algebra::eigen::polar2, algebra::eigen::cylindrical2, int, algebra::eigen::matrix_type, - algebra::matrix::actor< - int, float, algebra::matrix::determinant::preset0, - algebra::matrix::inverse::preset0>>, + algebra::matrix::actor, + algebra::matrix::inverse::preset0>>, test_types< double, algebra::eigen::point2, algebra::eigen::point3, algebra::eigen::vector2, algebra::eigen::vector3, algebra::eigen::transform3, algebra::eigen::cartesian2, algebra::eigen::polar2, algebra::eigen::cylindrical2, int, algebra::eigen::matrix_type, - algebra::matrix::actor< - int, double, algebra::matrix::determinant::preset0, - algebra::matrix::inverse::preset0>>> + algebra::matrix::actor, + algebra::matrix::inverse::preset0>>> eigen_cmath_types; INSTANTIATE_TYPED_TEST_SUITE_P(algebra_plugins, test_cuda_basics, eigen_cmath_types, test_specialisation_name); diff --git a/tests/accelerator/cuda/vecmem_cmath.cu b/tests/accelerator/cuda/vecmem_cmath.cu index d5238528..1e54f7f3 100644 --- a/tests/accelerator/cuda/vecmem_cmath.cu +++ b/tests/accelerator/cuda/vecmem_cmath.cu @@ -40,10 +40,9 @@ typedef testing::Types< algebra::vecmem::transform3, algebra::vecmem::cartesian2, algebra::vecmem::polar2, algebra::vecmem::cylindrical2, std::size_t, algebra::vecmem::matrix_type, - algebra::matrix::actor< - std::size_t, float, - algebra::matrix::determinant::preset0, - algebra::matrix::inverse::preset0>>, + algebra::matrix::actor, + algebra::matrix::inverse::preset0>>, test_types< double, algebra::vecmem::point2, algebra::vecmem::point3, algebra::vecmem::vector2, @@ -51,10 +50,9 @@ typedef testing::Types< algebra::vecmem::cartesian2, algebra::vecmem::polar2, algebra::vecmem::cylindrical2, std::size_t, algebra::vecmem::matrix_type, - algebra::matrix::actor< - std::size_t, double, - algebra::matrix::determinant::preset0, - algebra::matrix::inverse::preset0>>> + algebra::matrix::actor, + algebra::matrix::inverse::preset0>>> vecmem_cmath_types; INSTANTIATE_TYPED_TEST_SUITE_P(algebra_plugins, test_cuda_basics, vecmem_cmath_types, test_specialisation_name); diff --git a/tests/accelerator/sycl/array_cmath.sycl b/tests/accelerator/sycl/array_cmath.sycl index d906b213..7d9694a9 100644 --- a/tests/accelerator/sycl/array_cmath.sycl +++ b/tests/accelerator/sycl/array_cmath.sycl @@ -40,20 +40,18 @@ typedef testing::Types< algebra::array::transform3, algebra::array::cartesian2, algebra::array::polar2, algebra::array::cylindrical2, std::size_t, algebra::array::matrix_type, - algebra::matrix::actor< - std::size_t, float, - algebra::matrix::determinant::preset0, - algebra::matrix::inverse::preset0>>, + algebra::matrix::actor, + algebra::matrix::inverse::preset0>>, test_types< double, algebra::array::point2, algebra::array::point3, algebra::array::vector2, algebra::array::vector3, algebra::array::transform3, algebra::array::cartesian2, algebra::array::polar2, algebra::array::cylindrical2, std::size_t, algebra::array::matrix_type, - algebra::matrix::actor< - std::size_t, double, - algebra::matrix::determinant::preset0, - algebra::matrix::inverse::preset0>>> + algebra::matrix::actor, + algebra::matrix::inverse::preset0>>> array_cmath_types; INSTANTIATE_TYPED_TEST_SUITE_P(algebra_plugins, test_sycl_basics, array_cmath_types, test_specialisation_name); diff --git a/tests/accelerator/sycl/vecmem_cmath.sycl b/tests/accelerator/sycl/vecmem_cmath.sycl index b79aab2e..3d74bc74 100644 --- a/tests/accelerator/sycl/vecmem_cmath.sycl +++ b/tests/accelerator/sycl/vecmem_cmath.sycl @@ -40,10 +40,9 @@ typedef testing::Types< algebra::vecmem::transform3, algebra::vecmem::cartesian2, algebra::vecmem::polar2, algebra::vecmem::cylindrical2, std::size_t, algebra::vecmem::matrix_type, - algebra::matrix::actor< - std::size_t, float, - algebra::matrix::determinant::preset0, - algebra::matrix::inverse::preset0>>, + algebra::matrix::actor, + algebra::matrix::inverse::preset0>>, test_types< double, algebra::vecmem::point2, algebra::vecmem::point3, algebra::vecmem::vector2, @@ -51,10 +50,9 @@ typedef testing::Types< algebra::vecmem::cartesian2, algebra::vecmem::polar2, algebra::vecmem::cylindrical2, std::size_t, algebra::vecmem::matrix_type, - algebra::matrix::actor< - std::size_t, double, - algebra::matrix::determinant::preset0, - algebra::matrix::inverse::preset0>>> + algebra::matrix::actor, + algebra::matrix::inverse::preset0>>> vecmem_cmath_types; INSTANTIATE_TYPED_TEST_SUITE_P(algebra_plugins, test_sycl_basics, vecmem_cmath_types, test_specialisation_name); diff --git a/tests/array/array_cmath.cpp b/tests/array/array_cmath.cpp index ba184d8e..c3afcbf1 100644 --- a/tests/array/array_cmath.cpp +++ b/tests/array/array_cmath.cpp @@ -40,20 +40,18 @@ typedef testing::Types< algebra::array::transform3, algebra::array::cartesian2, algebra::array::polar2, algebra::array::cylindrical2, std::size_t, algebra::array::matrix_type, - algebra::matrix::actor< - std::size_t, float, - algebra::matrix::determinant::preset0, - algebra::matrix::inverse::preset0>>, + algebra::matrix::actor, + algebra::matrix::inverse::preset0>>, test_types< double, algebra::array::point2, algebra::array::point3, algebra::array::vector2, algebra::array::vector3, algebra::array::transform3, algebra::array::cartesian2, algebra::array::polar2, algebra::array::cylindrical2, std::size_t, algebra::array::matrix_type, - algebra::matrix::actor< - std::size_t, double, - algebra::matrix::determinant::preset0, - algebra::matrix::inverse::preset0>>> + algebra::matrix::actor, + algebra::matrix::inverse::preset0>>> array_cmath_types; INSTANTIATE_TYPED_TEST_SUITE_P(algebra_plugins, test_host_basics, array_cmath_types, test_specialisation_name); diff --git a/tests/eigen/eigen_cmath.cpp b/tests/eigen/eigen_cmath.cpp index 57c9186b..bd2bbee8 100644 --- a/tests/eigen/eigen_cmath.cpp +++ b/tests/eigen/eigen_cmath.cpp @@ -40,18 +40,18 @@ typedef testing::Types< algebra::eigen::transform3, algebra::eigen::cartesian2, algebra::eigen::polar2, algebra::eigen::cylindrical2, int, algebra::eigen::matrix_type, - algebra::matrix::actor< - int, float, algebra::matrix::determinant::preset0, - algebra::matrix::inverse::preset0>>, + algebra::matrix::actor, + algebra::matrix::inverse::preset0>>, test_types< double, algebra::eigen::point2, algebra::eigen::point3, algebra::eigen::vector2, algebra::eigen::vector3, algebra::eigen::transform3, algebra::eigen::cartesian2, algebra::eigen::polar2, algebra::eigen::cylindrical2, int, algebra::eigen::matrix_type, - algebra::matrix::actor< - int, double, algebra::matrix::determinant::preset0, - algebra::matrix::inverse::preset0>>> + algebra::matrix::actor, + algebra::matrix::inverse::preset0>>> eigen_cmath_types; INSTANTIATE_TYPED_TEST_SUITE_P(algebra_plugins, test_host_basics, eigen_cmath_types, test_specialisation_name); diff --git a/tests/smatrix/smatrix_cmath.cpp b/tests/smatrix/smatrix_cmath.cpp index 09ff99f0..16a6739c 100644 --- a/tests/smatrix/smatrix_cmath.cpp +++ b/tests/smatrix/smatrix_cmath.cpp @@ -41,10 +41,9 @@ typedef testing::Types< algebra::smatrix::cartesian2, algebra::smatrix::polar2, algebra::smatrix::cylindrical2, unsigned int, algebra::smatrix::matrix_type, - algebra::matrix::actor< - unsigned int, float, - algebra::matrix::determinant::preset0, - algebra::matrix::inverse::preset0>>, + algebra::matrix::actor, + algebra::matrix::inverse::preset0>>, test_types< double, algebra::smatrix::point2, algebra::smatrix::point3, algebra::smatrix::vector2, @@ -52,10 +51,9 @@ typedef testing::Types< algebra::smatrix::cartesian2, algebra::smatrix::polar2, algebra::smatrix::cylindrical2, unsigned int, algebra::smatrix::matrix_type, - algebra::matrix::actor< - unsigned int, double, - algebra::matrix::determinant::preset0, - algebra::matrix::inverse::preset0>>> + algebra::matrix::actor, + algebra::matrix::inverse::preset0>>> smatrix_cmath_types; INSTANTIATE_TYPED_TEST_SUITE_P(algebra_plugins, test_host_basics, smatrix_cmath_types, test_specialisation_name); diff --git a/tests/vc/vc_cmath.cpp b/tests/vc/vc_cmath.cpp index 2bd37814..1fc8114d 100644 --- a/tests/vc/vc_cmath.cpp +++ b/tests/vc/vc_cmath.cpp @@ -40,18 +40,16 @@ typedef testing::Types< algebra::vc::polar2, algebra::vc::cylindrical2, std::size_t, algebra::vc::matrix_type, algebra::matrix::actor< - std::size_t, float, - algebra::matrix::determinant::preset0, - algebra::matrix::inverse::preset0>>, + float, algebra::matrix::determinant::preset0, + algebra::matrix::inverse::preset0>>, test_types, Vc::array, Vc::array, Vc::array, algebra::vc::transform3, algebra::vc::cartesian2, algebra::vc::polar2, algebra::vc::cylindrical2, std::size_t, algebra::vc::matrix_type, algebra::matrix::actor< - std::size_t, double, - algebra::matrix::determinant::preset0, - algebra::matrix::inverse::preset0>>> + double, algebra::matrix::determinant::preset0, + algebra::matrix::inverse::preset0>>> vc_cmath_types; INSTANTIATE_TYPED_TEST_SUITE_P(algebra_plugins, test_host_basics, vc_cmath_types, test_specialisation_name); diff --git a/tests/vc/vc_vc.cpp b/tests/vc/vc_vc.cpp index 572218a5..4d8736fb 100644 --- a/tests/vc/vc_vc.cpp +++ b/tests/vc/vc_vc.cpp @@ -40,18 +40,16 @@ typedef testing::Types< algebra::vc::polar2, algebra::vc::cylindrical2, std::size_t, algebra::vc::matrix_type, algebra::matrix::actor< - std::size_t, float, - algebra::matrix::determinant::preset0, - algebra::matrix::inverse::preset0>>, + float, algebra::matrix::determinant::preset0, + algebra::matrix::inverse::preset0>>, test_types, algebra::vc::point3, algebra::vc::vector2, algebra::vc::vector3, algebra::vc::transform3, algebra::vc::cartesian2, algebra::vc::polar2, algebra::vc::cylindrical2, std::size_t, algebra::vc::matrix_type, algebra::matrix::actor< - std::size_t, double, - algebra::matrix::determinant::preset0, - algebra::matrix::inverse::preset0>>> + double, algebra::matrix::determinant::preset0, + algebra::matrix::inverse::preset0>>> vc_vc_types; INSTANTIATE_TYPED_TEST_SUITE_P(algebra_plugins, test_host_basics, vc_vc_types, test_specialisation_name); diff --git a/tests/vecmem/vecmem_cmath.cpp b/tests/vecmem/vecmem_cmath.cpp index 64ecef0f..eeee394e 100644 --- a/tests/vecmem/vecmem_cmath.cpp +++ b/tests/vecmem/vecmem_cmath.cpp @@ -40,10 +40,9 @@ typedef testing::Types< algebra::vecmem::transform3, algebra::vecmem::cartesian2, algebra::vecmem::polar2, algebra::vecmem::cylindrical2, std::size_t, algebra::vecmem::matrix_type, - algebra::matrix::actor< - std::size_t, float, - algebra::matrix::determinant::preset0, - algebra::matrix::inverse::preset0>>, + algebra::matrix::actor, + algebra::matrix::inverse::preset0>>, test_types< double, algebra::vecmem::point2, algebra::vecmem::point3, algebra::vecmem::vector2, @@ -51,10 +50,9 @@ typedef testing::Types< algebra::vecmem::cartesian2, algebra::vecmem::polar2, algebra::vecmem::cylindrical2, std::size_t, algebra::vecmem::matrix_type, - algebra::matrix::actor< - std::size_t, double, - algebra::matrix::determinant::preset0, - algebra::matrix::inverse::preset0>>> + algebra::matrix::actor, + algebra::matrix::inverse::preset0>>> vecmem_cmath_types; INSTANTIATE_TYPED_TEST_SUITE_P(algebra_plugins, test_host_basics, vecmem_cmath_types, test_specialisation_name);