From 987c605a20116434b3eb77d2a3c1ae596f35f117 Mon Sep 17 00:00:00 2001
From: Bernhard Manfred Gruber <bernhardmgruber@gmail.com>
Date: Fri, 13 Jan 2023 18:12:23 +0100
Subject: [PATCH] Use mp11 directly in the unit tests

---
 tests/common.hpp               |  9 +++--
 tests/computedprop.cpp         |  2 +-
 tests/copy.cpp                 | 35 +++++++++---------
 tests/core.cpp                 | 24 ++++++-------
 tests/dump.cpp                 |  2 +-
 tests/mapping.BitPackedInt.cpp |  6 ++--
 tests/mapping.Bytesplit.cpp    |  4 +--
 tests/mapping.ChangeType.cpp   | 17 ++++-----
 tests/mapping.Projection.cpp   | 15 ++++----
 tests/mapping.Split.cpp        | 65 ++++++++++++++--------------------
 tests/mapping.cpp              | 30 +++++++---------
 tests/proxyrefopmixin.cpp      |  2 +-
 tests/recordcoord.cpp          |  5 ++-
 tests/view.cpp                 | 14 ++++----
 14 files changed, 103 insertions(+), 127 deletions(-)

diff --git a/tests/common.hpp b/tests/common.hpp
index 4db2dee0de..eece288c4b 100644
--- a/tests/common.hpp
+++ b/tests/common.hpp
@@ -12,9 +12,12 @@
 #include <string>
 #include <typeinfo>
 
+// make boost::mp11 directly available in all testing code
+using namespace boost::mp11; // NOLINT(google-global-names-in-headers)
+
 // NOLINTNEXTLINE(google-runtime-int)
-using SizeTypes = boost::mp11::mp_list<int, unsigned, long, unsigned long, long long, unsigned long long>;
-static_assert(boost::mp11::mp_contains<SizeTypes, std::size_t>::value);
+using SizeTypes = mp_list<int, unsigned, long, unsigned long, long long, unsigned long long>;
+static_assert(mp_contains<SizeTypes, std::size_t>::value);
 
 // clang-format off
 namespace tag
@@ -195,7 +198,7 @@ struct ModulusMapping : TArrayExtents
     using ArrayExtents = TArrayExtents;
     using ArrayIndex = typename ArrayExtents::Index;
     using RecordDim = TRecordDim;
-    static constexpr std::size_t blobCount = boost::mp11::mp_size<llama::FlatRecordDim<RecordDim>>::value;
+    static constexpr std::size_t blobCount = mp_size<llama::FlatRecordDim<RecordDim>>::value;
 
     LLAMA_FN_HOST_ACC_INLINE
     constexpr explicit ModulusMapping(ArrayExtents extents, RecordDim = {}) : ArrayExtents(extents)
diff --git a/tests/computedprop.cpp b/tests/computedprop.cpp
index 03c497d06b..2400ea4d5b 100644
--- a/tests/computedprop.cpp
+++ b/tests/computedprop.cpp
@@ -93,7 +93,7 @@ namespace
         using ArrayExtents = TArrayExtents;
         using ArrayIndex = typename ArrayExtents::Index;
         using RecordDim = TRecordDim;
-        static constexpr std::size_t blobCount = boost::mp11::mp_size<llama::FlatRecordDim<RecordDim>>::value;
+        static constexpr std::size_t blobCount = mp_size<llama::FlatRecordDim<RecordDim>>::value;
 
         constexpr CompressedBoolMapping() = default;
 
diff --git a/tests/copy.cpp b/tests/copy.cpp
index 4b06035b0a..2e14ca3e68 100644
--- a/tests/copy.cpp
+++ b/tests/copy.cpp
@@ -23,7 +23,7 @@ namespace
     }
 
     // Do not test all combinations as this exlodes the unit test compile and runtime.
-    using AoSMappings = boost::mp11::mp_list<
+    using AoSMappings = mp_list<
         llama::mapping::
             AoS<ArrayExtents, RecordDim, llama::mapping::FieldAlignment::Pack, llama::mapping::LinearizeArrayDimsCpp>,
         // llama::mapping::AoS<ArrayExtents, RecordDim, llama::mapping::FieldAlignment::Pack,
@@ -35,7 +35,7 @@ namespace
             llama::mapping::FieldAlignment::Align,
             llama::mapping::LinearizeArrayDimsFortran>>;
 
-    using OtherMappings = boost::mp11::mp_list<
+    using OtherMappings = mp_list<
         llama::mapping::SoA<
             ArrayExtents,
             RecordDim,
@@ -65,27 +65,26 @@ namespace
         // llama::mapping::AoSoA<ArrayExtents, RecordDim, 8, llama::mapping::LinearizeArrayDimsCpp>,
         llama::mapping::AoSoA<ArrayExtents, RecordDim, 8, llama::mapping::LinearizeArrayDimsFortran>>;
 
-    using AllMappings = boost::mp11::mp_append<AoSMappings, OtherMappings>;
+    using AllMappings = mp_append<AoSMappings, OtherMappings>;
 
-    using AllMappingsProduct = boost::mp11::mp_product<boost::mp11::mp_list, AllMappings, AllMappings>;
+    using AllMappingsProduct = mp_product<mp_list, AllMappings, AllMappings>;
 
     template<typename List>
     using BothAreSoAOrHaveDifferentLinearizer = std::bool_constant<
-        (llama::mapping::isSoA<boost::mp11::mp_first<List>> && llama::mapping::isSoA<boost::mp11::mp_second<List>>)
+        (llama::mapping::isSoA<mp_first<List>> && llama::mapping::isSoA<mp_second<List>>)
         || !std::is_same_v<
-            typename boost::mp11::mp_first<List>::LinearizeArrayDimsFunctor,
-            typename boost::mp11::mp_second<List>::LinearizeArrayDimsFunctor>>;
+            typename mp_first<List>::LinearizeArrayDimsFunctor,
+            typename mp_second<List>::LinearizeArrayDimsFunctor>>;
 
-    using AoSoAMappingsProduct = boost::mp11::mp_remove_if<
-        boost::mp11::mp_product<boost::mp11::mp_list, OtherMappings, OtherMappings>,
-        BothAreSoAOrHaveDifferentLinearizer>;
+    using AoSoAMappingsProduct
+        = mp_remove_if<mp_product<mp_list, OtherMappings, OtherMappings>, BothAreSoAOrHaveDifferentLinearizer>;
 } // namespace
 
 // NOLINTNEXTLINE(cert-err58-cpp)
 TEMPLATE_LIST_TEST_CASE("copy", "", AllMappingsProduct)
 {
-    using SrcMapping = boost::mp11::mp_first<TestType>;
-    using DstMapping = boost::mp11::mp_second<TestType>;
+    using SrcMapping = mp_first<TestType>;
+    using DstMapping = mp_second<TestType>;
     testCopy<SrcMapping, DstMapping>([](const auto& srcView, auto& dstView) { llama::copy(srcView, dstView); });
 }
 
@@ -98,8 +97,8 @@ TEMPLATE_LIST_TEST_CASE("blobMemcpy", "", AllMappings)
 // NOLINTNEXTLINE(cert-err58-cpp)
 TEMPLATE_LIST_TEST_CASE("fieldWiseCopy", "", AllMappingsProduct)
 {
-    using SrcMapping = boost::mp11::mp_first<TestType>;
-    using DstMapping = boost::mp11::mp_second<TestType>;
+    using SrcMapping = mp_first<TestType>;
+    using DstMapping = mp_second<TestType>;
     testCopy<SrcMapping, DstMapping>([](const auto& srcView, auto& dstView)
                                      { llama::fieldWiseCopy(srcView, dstView); });
 }
@@ -107,8 +106,8 @@ TEMPLATE_LIST_TEST_CASE("fieldWiseCopy", "", AllMappingsProduct)
 // NOLINTNEXTLINE(cert-err58-cpp)
 TEMPLATE_LIST_TEST_CASE("aosoaCommonBlockCopy.readOpt", "", AoSoAMappingsProduct)
 {
-    using SrcMapping = boost::mp11::mp_first<TestType>;
-    using DstMapping = boost::mp11::mp_second<TestType>;
+    using SrcMapping = mp_first<TestType>;
+    using DstMapping = mp_second<TestType>;
     testCopy<SrcMapping, DstMapping>([](const auto& srcView, auto& dstView)
                                      { llama::aosoaCommonBlockCopy(srcView, dstView, true); });
 }
@@ -116,8 +115,8 @@ TEMPLATE_LIST_TEST_CASE("aosoaCommonBlockCopy.readOpt", "", AoSoAMappingsProduct
 // NOLINTNEXTLINE(cert-err58-cpp)
 TEMPLATE_LIST_TEST_CASE("aosoaCommonBlockCopy.writeOpt", "", AoSoAMappingsProduct)
 {
-    using SrcMapping = boost::mp11::mp_first<TestType>;
-    using DstMapping = boost::mp11::mp_second<TestType>;
+    using SrcMapping = mp_first<TestType>;
+    using DstMapping = mp_second<TestType>;
     testCopy<SrcMapping, DstMapping>([](const auto& srcView, auto& dstView)
                                      { llama::aosoaCommonBlockCopy(srcView, dstView, false); });
 }
diff --git a/tests/core.cpp b/tests/core.cpp
index 6f6d16d873..ab2495de6d 100644
--- a/tests/core.cpp
+++ b/tests/core.cpp
@@ -204,10 +204,9 @@ TEST_CASE("GetCoordFromTags")
 
 TEST_CASE("GetCoordFromTags.List")
 {
-    STATIC_REQUIRE(std::is_same_v<llama::GetCoordFromTags<Particle, boost::mp11::mp_list<>>, llama::RecordCoord<>>);
-    STATIC_REQUIRE(std::is_same_v<
-                   llama::GetCoordFromTags<Particle, boost::mp11::mp_list<tag::Vel, tag::Z>>,
-                   llama::RecordCoord<2, 2>>);
+    STATIC_REQUIRE(std::is_same_v<llama::GetCoordFromTags<Particle, mp_list<>>, llama::RecordCoord<>>);
+    STATIC_REQUIRE(
+        std::is_same_v<llama::GetCoordFromTags<Particle, mp_list<tag::Vel, tag::Z>>, llama::RecordCoord<2, 2>>);
 }
 
 TEST_CASE("GetCoordFromTags.RecordCoord")
@@ -243,10 +242,10 @@ TEST_CASE("GetType")
 TEST_CASE("GetTags")
 {
     // clang-format off
-    STATIC_REQUIRE(std::is_same_v<llama::GetTags<Particle, llama::RecordCoord<0, 0>>, boost::mp11::mp_list<tag::Pos, tag::X >>);
-    STATIC_REQUIRE(std::is_same_v<llama::GetTags<Particle, llama::RecordCoord<0   >>, boost::mp11::mp_list<tag::Pos         >>);
-    STATIC_REQUIRE(std::is_same_v<llama::GetTags<Particle, llama::RecordCoord<    >>, boost::mp11::mp_list<                 >>);
-    STATIC_REQUIRE(std::is_same_v<llama::GetTags<Particle, llama::RecordCoord<2, 1>>, boost::mp11::mp_list<tag::Vel, tag::Y >>);
+    STATIC_REQUIRE(std::is_same_v<llama::GetTags<Particle, llama::RecordCoord<0, 0>>, mp_list<tag::Pos, tag::X >>);
+    STATIC_REQUIRE(std::is_same_v<llama::GetTags<Particle, llama::RecordCoord<0   >>, mp_list<tag::Pos         >>);
+    STATIC_REQUIRE(std::is_same_v<llama::GetTags<Particle, llama::RecordCoord<    >>, mp_list<                 >>);
+    STATIC_REQUIRE(std::is_same_v<llama::GetTags<Particle, llama::RecordCoord<2, 1>>, mp_list<tag::Vel, tag::Y >>);
     // clang-format on
 }
 
@@ -264,7 +263,7 @@ TEST_CASE("LeafRecordCoords")
 {
     STATIC_REQUIRE(std::is_same_v<
                    llama::LeafRecordCoords<Particle>,
-                   boost::mp11::mp_list<
+                   mp_list<
                        llama::RecordCoord<0, 0>,
                        llama::RecordCoord<0, 1>,
                        llama::RecordCoord<0, 2>,
@@ -331,10 +330,9 @@ TEST_CASE("hasSameTags")
 
 TEST_CASE("FlatRecordDim")
 {
-    STATIC_REQUIRE(
-        std::is_same_v<
-            llama::FlatRecordDim<Particle>,
-            boost::mp11::mp_list<double, double, double, float, double, double, double, bool, bool, bool, bool>>);
+    STATIC_REQUIRE(std::is_same_v<
+                   llama::FlatRecordDim<Particle>,
+                   mp_list<double, double, double, float, double, double, double, bool, bool, bool, bool>>);
 }
 
 TEST_CASE("flatRecordCoord")
diff --git a/tests/dump.cpp b/tests/dump.cpp
index 48f7a09eef..5d222b4104 100644
--- a/tests/dump.cpp
+++ b/tests/dump.cpp
@@ -291,7 +291,7 @@ TEST_CASE("dump.ParticleUnaligned.Split.Multilist.SoA.One")
     dump(llama::mapping::Split<
          ArrayExtents,
          Particle,
-         boost::mp11::mp_list<llama::RecordCoord<0>, llama::RecordCoord<2>>,
+         mp_list<llama::RecordCoord<0>, llama::RecordCoord<2>>,
          llama::mapping::BindSoA<>::fn,
          llama::mapping::AlignedOne,
          true>{extents});
diff --git a/tests/mapping.BitPackedInt.cpp b/tests/mapping.BitPackedInt.cpp
index 1c3fa29e27..21fa7003c3 100644
--- a/tests/mapping.BitPackedInt.cpp
+++ b/tests/mapping.BitPackedInt.cpp
@@ -363,7 +363,7 @@ TEMPLATE_TEST_CASE(
     std::uint64_t)
 {
     using Integral = TestType;
-    boost::mp11::mp_for_each<boost::mp11::mp_list<std::uint32_t, std::uint64_t>>(
+    mp_for_each<mp_list<std::uint32_t, std::uint64_t>>(
         [](auto si)
         {
             using StoredIntegral = decltype(si);
@@ -428,7 +428,7 @@ TEMPLATE_TEST_CASE(
     std::uint64_t)
 {
     using Integral = TestType;
-    boost::mp11::mp_for_each<boost::mp11::mp_list<std::uint32_t, std::uint64_t>>(
+    mp_for_each<mp_list<std::uint32_t, std::uint64_t>>(
         [](auto si)
         {
             using StoredIntegral = decltype(si);
@@ -469,7 +469,7 @@ TEMPLATE_TEST_CASE(
     std::uint64_t)
 {
     using Integral = TestType;
-    boost::mp11::mp_for_each<boost::mp11::mp_list<std::uint32_t, std::uint64_t>>(
+    mp_for_each<mp_list<std::uint32_t, std::uint64_t>>(
         []<typename StoredIntegral>(StoredIntegral)
         {
             if constexpr(sizeof(StoredIntegral) >= sizeof(TestType))
diff --git a/tests/mapping.Bytesplit.cpp b/tests/mapping.Bytesplit.cpp
index 41100f0ee5..487725036a 100644
--- a/tests/mapping.Bytesplit.cpp
+++ b/tests/mapping.Bytesplit.cpp
@@ -37,9 +37,7 @@ TEST_CASE("mapping.ByteSplit.ChangeType.SoA")
     using Mapping = llama::mapping::Bytesplit<
         llama::ArrayExtentsDynamic<std::size_t, 1>,
         Vec3I,
-        llama::mapping::BindChangeType<
-            llama::mapping::BindSoA<>::fn,
-            boost::mp11::mp_list<boost::mp11::mp_list<std::byte, unsigned char>>>::fn>;
+        llama::mapping::BindChangeType<llama::mapping::BindSoA<>::fn, mp_list<mp_list<std::byte, unsigned char>>>::fn>;
 
     STATIC_REQUIRE(std::is_same_v<Mapping::RecordDim, Vec3I>);
     STATIC_REQUIRE(std::is_same_v<
diff --git a/tests/mapping.ChangeType.cpp b/tests/mapping.ChangeType.cpp
index dc62f5f0b2..fbbf4afe7c 100644
--- a/tests/mapping.ChangeType.cpp
+++ b/tests/mapping.ChangeType.cpp
@@ -11,7 +11,7 @@ TEST_CASE("mapping.ChangeType.AoS")
         llama::ArrayExtents<std::size_t, 128>,
         Vec3D,
         llama::mapping::BindAoS<llama::mapping::FieldAlignment::Pack>::fn,
-        boost::mp11::mp_list<>>{{}};
+        mp_list<>>{{}};
     CHECK(mapping.blobSize(0) == 3072);
     auto view = llama::allocView(mapping);
     iotaFillView(view);
@@ -24,7 +24,7 @@ TEST_CASE("mapping.ChangeType.AoS.doubleToFloat")
         llama::ArrayExtents<std::size_t, 128>,
         Vec3D,
         llama::mapping::BindAoS<llama::mapping::FieldAlignment::Pack>::fn,
-        boost::mp11::mp_list<boost::mp11::mp_list<double, float>>>{{}};
+        mp_list<mp_list<double, float>>>{{}};
     CHECK(mapping.blobSize(0) == 1536);
     auto view = llama::allocView(mapping);
     iotaFillView(view);
@@ -37,7 +37,7 @@ TEST_CASE("mapping.ChangeType.AoS.Coord1ToFloat")
         llama::ArrayExtents<std::size_t, 128>,
         Vec3D,
         llama::mapping::BindAoS<llama::mapping::FieldAlignment::Pack>::fn,
-        boost::mp11::mp_list<boost::mp11::mp_list<llama::RecordCoord<1>, float>>>{{}};
+        mp_list<mp_list<llama::RecordCoord<1>, float>>>{{}};
     CHECK(mapping.blobSize(0) == 2560);
     auto view = llama::allocView(mapping);
     iotaFillView(view);
@@ -50,8 +50,8 @@ TEST_CASE("mapping.ChangeType.AoS.CoordsAndTypes")
         llama::ArrayExtents<std::size_t, 128>,
         Vec3D,
         llama::mapping::BindAoS<llama::mapping::FieldAlignment::Pack>::fn,
-        boost::mp11::
-            mp_list<boost::mp11::mp_list<double, float>, boost::mp11::mp_list<llama::RecordCoord<1>, double>>>{{}};
+
+        mp_list<mp_list<double, float>, mp_list<llama::RecordCoord<1>, double>>>{{}};
     CHECK(mapping.blobSize(0) == 2048);
     auto view = llama::allocView(mapping);
     iotaFillView(view);
@@ -67,10 +67,7 @@ TEST_CASE("mapping.ChangeType.SoA.particle.types")
         llama::ArrayExtents<std::size_t, 128>,
         Particle,
         llama::mapping::BindAoS<llama::mapping::FieldAlignment::Pack>::fn,
-        boost::mp11::mp_list<
-            boost::mp11::mp_list<double, float>,
-            boost::mp11::mp_list<float, std::int16_t>,
-            boost::mp11::mp_list<bool, std::int32_t>>>{{}};
+        mp_list<mp_list<double, float>, mp_list<float, std::int16_t>, mp_list<bool, std::int32_t>>>{{}};
     CHECK(mapping.blobSize(0) == 128 * (6 * sizeof(float) + 1 * sizeof(std::int16_t) + 4 * sizeof(std::int32_t)));
     auto view = llama::allocView(mapping);
     iotaFillView(view);
@@ -106,7 +103,7 @@ TEST_CASE("mapping.ChangeType.ProxyRef.SwapAndAssign")
         llama::ArrayExtents<std::size_t, 128>,
         Vec3D,
         llama::mapping::BindAoS<llama::mapping::FieldAlignment::Pack>::fn,
-        boost::mp11::mp_list<>>{{}};
+        mp_list<>>{{}};
     auto view = llama::allocView(mapping);
 
     view(0) = 1.0;
diff --git a/tests/mapping.Projection.cpp b/tests/mapping.Projection.cpp
index 08575b5e76..afa119fc57 100644
--- a/tests/mapping.Projection.cpp
+++ b/tests/mapping.Projection.cpp
@@ -11,7 +11,7 @@ TEST_CASE("mapping.Projection.AoS")
         llama::ArrayExtents<std::size_t, 128>,
         Vec3D,
         llama::mapping::BindAoS<llama::mapping::FieldAlignment::Pack>::fn,
-        boost::mp11::mp_list<>>{{}};
+        mp_list<>>{{}};
     CHECK(mapping.blobSize(0) == 3072);
     auto view = llama::allocView(mapping);
     iotaFillView(view);
@@ -40,7 +40,7 @@ TEST_CASE("mapping.Projection.AoS.DoubleToFloat")
         llama::ArrayExtents<std::size_t, 128>,
         Vec3D,
         llama::mapping::BindAoS<llama::mapping::FieldAlignment::Pack>::fn,
-        boost::mp11::mp_list<boost::mp11::mp_list<double, DoubleToFloat>>>{{}};
+        mp_list<mp_list<double, DoubleToFloat>>>{{}};
     CHECK(mapping.blobSize(0) == 1536);
     auto view = llama::allocView(mapping);
     iotaFillView(view);
@@ -53,7 +53,7 @@ TEST_CASE("mapping.Projection.ProxyRef.SwapAndAssign")
         llama::ArrayExtents<int, 2>,
         double,
         llama::mapping::BindAoS<>::fn,
-        boost::mp11::mp_list<boost::mp11::mp_list<double, DoubleToFloat>>>{{}};
+        mp_list<mp_list<double, DoubleToFloat>>>{{}};
     auto view = llama::allocView(mapping);
 
     view(0) = 1.0;
@@ -89,7 +89,7 @@ TEST_CASE("mapping.Projection.AoS.Sqrt")
         llama::ArrayExtents<std::size_t, 128>,
         Vec3D,
         llama::mapping::BindAoS<llama::mapping::FieldAlignment::Pack>::fn,
-        boost::mp11::mp_list<boost::mp11::mp_list<double, Sqrt>>>{{}};
+        mp_list<mp_list<double, Sqrt>>>{{}};
     CHECK(mapping.blobSize(0) == 1536);
     auto view = llama::allocView(mapping);
     iotaFillView(view);
@@ -102,7 +102,7 @@ TEST_CASE("mapping.Projection.AoS.Coord1.Sqrt")
         llama::ArrayExtents<std::size_t, 128>,
         Vec3D,
         llama::mapping::BindAoS<llama::mapping::FieldAlignment::Pack>::fn,
-        boost::mp11::mp_list<boost::mp11::mp_list<llama::RecordCoord<1>, Sqrt>>>{{}};
+        mp_list<mp_list<llama::RecordCoord<1>, Sqrt>>>{{}};
     CHECK(mapping.blobSize(0) == 2560);
     auto view = llama::allocView(mapping);
     iotaFillView(view);
@@ -115,9 +115,8 @@ TEST_CASE("mapping.Projection.AoS.CoordsAndTypes")
         llama::ArrayExtents<std::size_t, 128>,
         Vec3D,
         llama::mapping::BindAoS<llama::mapping::FieldAlignment::Pack>::fn,
-        boost::mp11::
-            mp_list<boost::mp11::mp_list<double, DoubleToFloat>, boost::mp11::mp_list<llama::RecordCoord<1>, Sqrt>>>{
-        {}};
+
+        mp_list<mp_list<double, DoubleToFloat>, mp_list<llama::RecordCoord<1>, Sqrt>>>{{}};
     CHECK(mapping.blobSize(0) == 1536);
     auto view = llama::allocView(mapping);
     iotaFillView(view);
diff --git a/tests/mapping.Split.cpp b/tests/mapping.Split.cpp
index 948c957301..9219ff3a73 100644
--- a/tests/mapping.Split.cpp
+++ b/tests/mapping.Split.cpp
@@ -9,17 +9,15 @@ TEST_CASE("mapping.Split.partitionRecordDim.OneMemberRecord")
 {
     using RecordDim = llama::Record<llama::Field<int, int>>;
     using R = decltype(llama::mapping::internal::partitionRecordDim(RecordDim{}, llama::RecordCoord<0>{}));
-    STATIC_REQUIRE(std::is_same_v<boost::mp11::mp_first<R>, RecordDim>);
-    STATIC_REQUIRE(std::is_same_v<boost::mp11::mp_second<R>, llama::Record<>>);
+    STATIC_REQUIRE(std::is_same_v<mp_first<R>, RecordDim>);
+    STATIC_REQUIRE(std::is_same_v<mp_second<R>, llama::Record<>>);
 }
 
 TEST_CASE("mapping.Split.partitionRecordDim.Vec3I.RC")
 {
     using R = decltype(llama::mapping::internal::partitionRecordDim(Vec3I{}, llama::RecordCoord<1>{}));
-    STATIC_REQUIRE(std::is_same_v<boost::mp11::mp_first<R>, llama::Record<llama::Field<tag::Y, int>>>);
-    STATIC_REQUIRE(
-        std::
-            is_same_v<boost::mp11::mp_second<R>, llama::Record<llama::Field<tag::X, int>, llama::Field<tag::Z, int>>>);
+    STATIC_REQUIRE(std::is_same_v<mp_first<R>, llama::Record<llama::Field<tag::Y, int>>>);
+    STATIC_REQUIRE(std::is_same_v<mp_second<R>, llama::Record<llama::Field<tag::X, int>, llama::Field<tag::Z, int>>>);
 }
 
 template<typename S>
@@ -29,38 +27,33 @@ TEST_CASE("mapping.Split.ReplaceTagListsByCoords")
 {
     // single selector
     STATIC_REQUIRE(std::is_same_v<TestReplace<llama::RecordCoord<2, 2>>, llama::RecordCoord<2, 2>>);
-    STATIC_REQUIRE(std::is_same_v<TestReplace<boost::mp11::mp_list<tag::Vel, tag::Z>>, llama::RecordCoord<2, 2>>);
+    STATIC_REQUIRE(std::is_same_v<TestReplace<mp_list<tag::Vel, tag::Z>>, llama::RecordCoord<2, 2>>);
 
     // list of selectors with single item
-    STATIC_REQUIRE(std::is_same_v<
-                   TestReplace<boost::mp11::mp_list<llama::RecordCoord<2, 2>>>,
-                   boost::mp11::mp_list<llama::RecordCoord<2, 2>>>);
-    STATIC_REQUIRE(std::is_same_v<
-                   TestReplace<boost::mp11::mp_list<boost::mp11::mp_list<tag::Vel, tag::Z>>>,
-                   boost::mp11::mp_list<llama::RecordCoord<2, 2>>>);
+    STATIC_REQUIRE(std::is_same_v<TestReplace<mp_list<llama::RecordCoord<2, 2>>>, mp_list<llama::RecordCoord<2, 2>>>);
+    STATIC_REQUIRE(std::is_same_v<TestReplace<mp_list<mp_list<tag::Vel, tag::Z>>>, mp_list<llama::RecordCoord<2, 2>>>);
 
     // list of selectors with multiple items
     STATIC_REQUIRE(std::is_same_v<
-                   TestReplace<boost::mp11::mp_list<llama::RecordCoord<1>, llama::RecordCoord<2, 2>>>,
-                   boost::mp11::mp_list<llama::RecordCoord<1>, llama::RecordCoord<2, 2>>>);
-    STATIC_REQUIRE(
-        std::is_same_v<
-            TestReplace<boost::mp11::mp_list<boost::mp11::mp_list<tag::Mass>, boost::mp11::mp_list<tag::Vel, tag::Z>>>,
-            boost::mp11::mp_list<llama::RecordCoord<1>, llama::RecordCoord<2, 2>>>);
+                   TestReplace<mp_list<llama::RecordCoord<1>, llama::RecordCoord<2, 2>>>,
+                   mp_list<llama::RecordCoord<1>, llama::RecordCoord<2, 2>>>);
     STATIC_REQUIRE(std::is_same_v<
-                   TestReplace<boost::mp11::mp_list<llama::RecordCoord<1>, boost::mp11::mp_list<tag::Vel, tag::Z>>>,
-                   boost::mp11::mp_list<llama::RecordCoord<1>, llama::RecordCoord<2, 2>>>);
+                   TestReplace<mp_list<mp_list<tag::Mass>, mp_list<tag::Vel, tag::Z>>>,
+                   mp_list<llama::RecordCoord<1>, llama::RecordCoord<2, 2>>>);
+    STATIC_REQUIRE(std::is_same_v<
+                   TestReplace<mp_list<llama::RecordCoord<1>, mp_list<tag::Vel, tag::Z>>>,
+                   mp_list<llama::RecordCoord<1>, llama::RecordCoord<2, 2>>>);
 }
 
 TEST_CASE("mapping.Split.partitionRecordDim.Particle")
 {
     using R = decltype(llama::mapping::internal::partitionRecordDim(Particle{}, llama::RecordCoord<2, 1>{}));
     STATIC_REQUIRE(std::is_same_v<
-                   boost::mp11::mp_first<R>,
+                   mp_first<R>,
                    llama::Record<llama::Field<tag::Vel, llama::Record<llama::Field<tag::Y, double>>>>>);
     STATIC_REQUIRE(
         std::is_same_v<
-            boost::mp11::mp_second<R>,
+            mp_second<R>,
             llama::Record<
                 llama::Field<tag::Pos, Vec3D>,
                 llama::Field<tag::Mass, float>,
@@ -72,13 +65,12 @@ TEST_CASE("mapping.Split.partitionRecordDim.Particle.List")
 {
     using R = decltype(llama::mapping::internal::partitionRecordDim(
         Particle{},
-        boost::mp11::mp_list<llama::RecordCoord<0>, llama::RecordCoord<2>>{}));
-    STATIC_REQUIRE(std::is_same_v<
-                   boost::mp11::mp_first<R>,
-                   llama::Record<llama::Field<tag::Pos, Vec3D>, llama::Field<tag::Vel, Vec3D>>>);
-    STATIC_REQUIRE(std::is_same_v<
-                   boost::mp11::mp_second<R>,
-                   llama::Record<llama::Field<tag::Mass, float>, llama::Field<tag::Flags, bool[4]>>>);
+        mp_list<llama::RecordCoord<0>, llama::RecordCoord<2>>{}));
+    STATIC_REQUIRE(
+        std::is_same_v<mp_first<R>, llama::Record<llama::Field<tag::Pos, Vec3D>, llama::Field<tag::Vel, Vec3D>>>);
+    STATIC_REQUIRE(
+        std::
+            is_same_v<mp_second<R>, llama::Record<llama::Field<tag::Mass, float>, llama::Field<tag::Flags, bool[4]>>>);
 }
 
 TEST_CASE("mapping.Split.SoA_SingleBlob.AoS_Packed.1Buffer")
@@ -121,16 +113,13 @@ TEST_CASE("mapping.Split.AoSoA8.AoS_Packed.One.SoA_SingleBlob.4Buffer")
     auto mapping = llama::mapping::Split<
         ArrayExtents,
         Particle,
-        boost::mp11::mp_list<tag::Vel>,
+        mp_list<tag::Vel>,
         llama::mapping::BindAoSoA<8>::fn,
         llama::mapping::BindSplit<
-            boost::mp11::mp_list<tag::Mass>,
+            mp_list<tag::Mass>,
             llama::mapping::PackedOne,
-            llama::mapping::BindSplit<
-                boost::mp11::mp_list<tag::Pos>,
-                llama::mapping::PackedAoS,
-                llama::mapping::PackedSingleBlobSoA,
-                true>::fn,
+            llama::mapping::
+                BindSplit<mp_list<tag::Pos>, llama::mapping::PackedAoS, llama::mapping::PackedSingleBlobSoA, true>::fn,
             true>::fn,
         true>{extents};
 
@@ -176,7 +165,7 @@ TEST_CASE("mapping.Split.Multilist.SoA.One")
     auto mapping = llama::mapping::Split<
         ArrayExtents,
         Particle,
-        boost::mp11::mp_list<llama::RecordCoord<0>, llama::RecordCoord<2>>,
+        mp_list<llama::RecordCoord<0>, llama::RecordCoord<2>>,
         llama::mapping::BindSoA<>::fn,
         llama::mapping::AlignedOne,
         true>{extents};
diff --git a/tests/mapping.cpp b/tests/mapping.cpp
index aa02988166..27680d2a2c 100644
--- a/tests/mapping.cpp
+++ b/tests/mapping.cpp
@@ -51,7 +51,7 @@ TEMPLATE_LIST_TEST_CASE("mapping.concepts", "", SizeTypes)
                        llama::ArrayExtentsDynamic<TestType, 2>,
                        Particle,
                        llama::mapping::BindAoS<>::fn,
-                       boost::mp11::mp_list<boost::mp11::mp_list<bool, int>>>>);
+                       mp_list<mp_list<bool, int>>>>);
 #    endif
 }
 #endif
@@ -69,11 +69,8 @@ TEMPLATE_LIST_TEST_CASE("mapping.traits", "", SizeTypes)
     using Null = llama::mapping::Null<llama::ArrayExtentsDynamic<TestType, 2>, Particle>;
     using BS
         = llama::mapping::Bytesplit<llama::ArrayExtentsDynamic<TestType, 2>, Particle, llama::mapping::BindAoS<>::fn>;
-    using CT = llama::mapping::ChangeType<
-        llama::ArrayExtentsDynamic<TestType, 2>,
-        Particle,
-        llama::mapping::BindAoS<>::fn,
-        boost::mp11::mp_list<>>;
+    using CT = llama::mapping::
+        ChangeType<llama::ArrayExtentsDynamic<TestType, 2>, Particle, llama::mapping::BindAoS<>::fn, mp_list<>>;
     using BPI = llama::mapping::BitPackedIntSoA<llama::ArrayExtentsDynamic<TestType, 2>, Vec3I>;
     using BPF = llama::mapping::BitPackedFloatSoA<llama::ArrayExtentsDynamic<TestType, 2>, Vec3D>;
     using FAC = llama::mapping::FieldAccessCount<AAoS>;
@@ -355,10 +352,9 @@ TEST_CASE("mapping.LinearizeArrayDimsMorton")
 TEST_CASE("mapping.FlattenRecordDimInOrder")
 {
     using F = llama::mapping::FlattenRecordDimInOrder<Particle>;
-    STATIC_REQUIRE(
-        std::is_same_v<
-            F::FlatRecordDim,
-            boost::mp11::mp_list<double, double, double, float, double, double, double, bool, bool, bool, bool>>);
+    STATIC_REQUIRE(std::is_same_v<
+                   F::FlatRecordDim,
+                   mp_list<double, double, double, float, double, double, double, bool, bool, bool, bool>>);
     STATIC_REQUIRE(F::flatIndex<0, 0> == 0);
     STATIC_REQUIRE(F::flatIndex<0, 1> == 1);
     STATIC_REQUIRE(F::flatIndex<0, 2> == 2);
@@ -375,10 +371,9 @@ TEST_CASE("mapping.FlattenRecordDimInOrder")
 TEST_CASE("mapping.FlattenRecordDimIncreasingAlignment")
 {
     using F = llama::mapping::FlattenRecordDimIncreasingAlignment<Particle>;
-    STATIC_REQUIRE(
-        std::is_same_v<
-            F::FlatRecordDim,
-            boost::mp11::mp_list<bool, bool, bool, bool, float, double, double, double, double, double, double>>);
+    STATIC_REQUIRE(std::is_same_v<
+                   F::FlatRecordDim,
+                   mp_list<bool, bool, bool, bool, float, double, double, double, double, double, double>>);
     STATIC_REQUIRE(F::flatIndex<0, 0> == 5);
     STATIC_REQUIRE(F::flatIndex<0, 1> == 6);
     STATIC_REQUIRE(F::flatIndex<0, 2> == 7);
@@ -395,10 +390,9 @@ TEST_CASE("mapping.FlattenRecordDimIncreasingAlignment")
 TEST_CASE("mapping.FlattenRecordDimDecreasingAlignment")
 {
     using F = llama::mapping::FlattenRecordDimDecreasingAlignment<Particle>;
-    STATIC_REQUIRE(
-        std::is_same_v<
-            F::FlatRecordDim,
-            boost::mp11::mp_list<double, double, double, double, double, double, float, bool, bool, bool, bool>>);
+    STATIC_REQUIRE(std::is_same_v<
+                   F::FlatRecordDim,
+                   mp_list<double, double, double, double, double, double, float, bool, bool, bool, bool>>);
     STATIC_REQUIRE(F::flatIndex<0, 0> == 0);
     STATIC_REQUIRE(F::flatIndex<0, 1> == 1);
     STATIC_REQUIRE(F::flatIndex<0, 2> == 2);
diff --git a/tests/proxyrefopmixin.cpp b/tests/proxyrefopmixin.cpp
index 189260a4e2..649946418a 100644
--- a/tests/proxyrefopmixin.cpp
+++ b/tests/proxyrefopmixin.cpp
@@ -259,6 +259,6 @@ TEST_CASE("proxyrefopmixin.ChangeType")
                                  llama::ArrayExtents<std::size_t, 4>,
                                  Vec3D,
                                  llama::mapping::BindAoS<llama::mapping::FieldAlignment::Pack>::fn,
-                                 boost::mp11::mp_list<boost::mp11::mp_list<double, float>>>{{}});
+                                 mp_list<mp_list<double, float>>>{{}});
     testProxyRef(view(2)(tag::X{}));
 }
diff --git a/tests/recordcoord.cpp b/tests/recordcoord.cpp
index ae4f707c44..b0288eafa4 100644
--- a/tests/recordcoord.cpp
+++ b/tests/recordcoord.cpp
@@ -7,9 +7,8 @@
 
 TEST_CASE("RecordCoord.List")
 {
-    STATIC_REQUIRE(std::is_same_v<typename llama::RecordCoord<>::List, boost::mp11::mp_list_c<std::size_t>>);
-    STATIC_REQUIRE(
-        std::is_same_v<typename llama::RecordCoord<1, 2, 3>::List, boost::mp11::mp_list_c<std::size_t, 1, 2, 3>>);
+    STATIC_REQUIRE(std::is_same_v<typename llama::RecordCoord<>::List, mp_list_c<std::size_t>>);
+    STATIC_REQUIRE(std::is_same_v<typename llama::RecordCoord<1, 2, 3>::List, mp_list_c<std::size_t, 1, 2, 3>>);
 }
 
 TEST_CASE("RecordCoord.front")
diff --git a/tests/view.cpp b/tests/view.cpp
index eb1dabae61..5d2d46bb49 100644
--- a/tests/view.cpp
+++ b/tests/view.cpp
@@ -100,8 +100,8 @@ TEST_CASE("view.non-memory-owning")
             CHECK(v <= storage.get() + blobSize);
         }
     };
-    test(boost::mp11::mp_identity<std::byte>{});
-    test(boost::mp11::mp_identity<const std::byte>{});
+    test(mp_identity<std::byte>{});
+    test(mp_identity<const std::byte>{});
 }
 
 TEST_CASE("view.subscript")
@@ -276,7 +276,7 @@ TEST_CASE("view.indexing")
     auto view = llama::allocView(llama::mapping::AoS{llama::ArrayExtents{16, 16}, Particle{}});
     view(0u, 0u)(tag::Mass{}) = 42.0f;
 
-    using integrals = boost::mp11::mp_list<
+    using integrals = mp_list<
         char,
         unsigned char,
         signed char,
@@ -287,10 +287,10 @@ TEST_CASE("view.indexing")
         long, // NOLINT(google-runtime-int)
         unsigned long>; // NOLINT(google-runtime-int)
 
-    boost::mp11::mp_for_each<integrals>(
+    mp_for_each<integrals>(
         [&](auto i)
         {
-            boost::mp11::mp_for_each<integrals>(
+            mp_for_each<integrals>(
                 [&](auto j)
                 {
                     const float& w = view(i, j)(tag::Mass{});
@@ -299,10 +299,10 @@ TEST_CASE("view.indexing")
         });
 
     llama::SubView subView{view, {0, 0}};
-    boost::mp11::mp_for_each<integrals>(
+    mp_for_each<integrals>(
         [&](auto i)
         {
-            boost::mp11::mp_for_each<integrals>(
+            mp_for_each<integrals>(
                 [&](auto j)
                 {
                     const float& w = subView(i, j)(tag::Mass{});