Merge pull request #41873 from iarspider/fix-new-eigen

CMSSW changes for Eigen API changes
cms-sw · Jun 6, 2023 · 8617c80 · 8617c80
2 parents c9955c4 + 431cc20
commit 8617c80
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/HeterogeneousCore/AlpakaTest/plugins/TestAlpakaAnalyzer.cc b/HeterogeneousCore/AlpakaTest/plugins/TestAlpakaAnalyzer.cc
@@ -101,7 +101,7 @@ class TestAlpakaAnalyzer : public edm::global::EDAnalyzer<> {
           << "  id   @ " << view.metadata().addressOf_id() << " = " << Column(view.id(), view.metadata().size())
           << ",\n"
           << "  r    @ " << view.metadata().addressOf_r() << " = " << view.r() << '\n'
-          << "  m    @ " << view.metadata().addressOf_m() << " = { ... {" << view[1].m()(1, Eigen::all)
+          << "  m    @ " << view.metadata().addressOf_m() << " = { ... {" << view[1].m()(1, Eigen::indexing::all)
           << " } ... } \n";
       msg << std::hex << "  [y - x] = 0x"
           << reinterpret_cast<intptr_t>(view.metadata().addressOf_y()) -

diff --git a/HeterogeneousCore/CUDATest/plugins/TestPortableAnalyzer.cc b/HeterogeneousCore/CUDATest/plugins/TestPortableAnalyzer.cc
@@ -71,7 +71,8 @@ class TestPortableAnalyzer : public edm::stream::EDAnalyzer<> {
         << "  z    @ " << view.metadata().addressOf_z() << " = " << Column(view.z(), view.metadata().size()) << ",\n"
         << "  id   @ " << view.metadata().addressOf_id() << " = " << Column(view.id(), view.metadata().size()) << ",\n"
         << "  r    @ " << view.metadata().addressOf_r() << " = " << view.r() << '\n'
-        << "  m    @ " << view.metadata().addressOf_m() << " = { ... {" << view[1].m()(1, Eigen::all) << " } ... } \n";
+        << "  m    @ " << view.metadata().addressOf_m() << " = { ... {" << view[1].m()(1, Eigen::indexing::all)
+        << " } ... } \n";
     msg << std::hex << "  [y - x] = 0x"
         << reinterpret_cast<intptr_t>(view.metadata().addressOf_y()) -
                reinterpret_cast<intptr_t>(view.metadata().addressOf_x())