From 85b0c7144e50462d53d50e4850d1b15b66c05a1f Mon Sep 17 00:00:00 2001
From: Kyle Knoepfel <knoepfel@fnal.gov>
Date: Mon, 30 Mar 2026 11:01:47 -0500
Subject: [PATCH] Move public API to phlex namespace

---
 phlex/driver.hpp                | 2 +-
 phlex/model/fixed_hierarchy.cpp | 7 ++++---
 phlex/model/fixed_hierarchy.hpp | 8 ++++----
 plugins/generate_layers.cpp     | 5 ++---
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/phlex/driver.hpp b/phlex/driver.hpp
index 6e9e8093..34ca06fa 100644
--- a/phlex/driver.hpp
+++ b/phlex/driver.hpp
@@ -49,7 +49,7 @@ namespace phlex::experimental {
   };
 }
 
-#define PHLEX_EXPERIMENTAL_REGISTER_DRIVER(...)                                                    \
+#define PHLEX_REGISTER_DRIVER(...)                                                                 \
   PHLEX_DETAIL_REGISTER_DRIVER_PLUGIN(create, create_driver, __VA_ARGS__)
 
 #endif // PHLEX_DRIVER_HPP
diff --git a/phlex/model/fixed_hierarchy.cpp b/phlex/model/fixed_hierarchy.cpp
index 872bb24a..0508eeaa 100644
--- a/phlex/model/fixed_hierarchy.cpp
+++ b/phlex/model/fixed_hierarchy.cpp
@@ -56,11 +56,11 @@ namespace {
   }
 }
 
-namespace phlex::experimental {
+namespace phlex {
 
   data_cell_cursor::data_cell_cursor(data_cell_index_ptr index,
                                      fixed_hierarchy const& h,
-                                     async_driver<data_cell_index_ptr>& d) :
+                                     experimental::async_driver<data_cell_index_ptr>& d) :
     index_{std::move(index)}, hierarchy_{h}, driver_{d}
   {
   }
@@ -98,7 +98,8 @@ namespace phlex::experimental {
       fmt::format("Layer {} is not part of the fixed hierarchy.", index->layer_path()));
   }
 
-  data_cell_cursor fixed_hierarchy::yield_job(async_driver<data_cell_index_ptr>& d) const
+  data_cell_cursor fixed_hierarchy::yield_job(
+    experimental::async_driver<data_cell_index_ptr>& d) const
   {
     auto job = data_cell_index::job();
     d.yield(job);
diff --git a/phlex/model/fixed_hierarchy.hpp b/phlex/model/fixed_hierarchy.hpp
index caf9614d..11268e90 100644
--- a/phlex/model/fixed_hierarchy.hpp
+++ b/phlex/model/fixed_hierarchy.hpp
@@ -13,7 +13,7 @@ namespace phlex::experimental {
   class async_driver;
 }
 
-namespace phlex::experimental {
+namespace phlex {
 
   class fixed_hierarchy;
 
@@ -29,11 +29,11 @@ namespace phlex::experimental {
     friend class fixed_hierarchy;
     data_cell_cursor(data_cell_index_ptr index,
                      fixed_hierarchy const& h,
-                     async_driver<data_cell_index_ptr>& d);
+                     experimental::async_driver<data_cell_index_ptr>& d);
 
     data_cell_index_ptr index_;
     fixed_hierarchy const& hierarchy_;
-    async_driver<data_cell_index_ptr>& driver_;
+    experimental::async_driver<data_cell_index_ptr>& driver_;
   };
 
   class fixed_hierarchy {
@@ -48,7 +48,7 @@ namespace phlex::experimental {
     // Yields the job-level data-cell index to the provided driver and returns a
     // data_cell_cursor for the job.  Must only be called from a function registered
     // via driver_proxy::drive().
-    data_cell_cursor yield_job(async_driver<data_cell_index_ptr>& d) const;
+    data_cell_cursor yield_job(experimental::async_driver<data_cell_index_ptr>& d) const;
 
   private:
     std::vector<std::size_t> layer_hashes_;
diff --git a/plugins/generate_layers.cpp b/plugins/generate_layers.cpp
index e044c9a3..580ef6d5 100644
--- a/plugins/generate_layers.cpp
+++ b/plugins/generate_layers.cpp
@@ -21,7 +21,7 @@
 
 #include <string>
 
-PHLEX_EXPERIMENTAL_REGISTER_DRIVER(d, config)
+PHLEX_REGISTER_DRIVER(d, config)
 {
   using namespace phlex;
 
@@ -36,6 +36,5 @@ PHLEX_EXPERIMENTAL_REGISTER_DRIVER(d, config)
                     .starting_value = layer_config.get<unsigned int>("starting_number", 0)});
   }
 
-  return d.driver(gen->hierarchy(),
-                  [gen](experimental::data_cell_cursor const& job) { (*gen)(job); });
+  return d.driver(gen->hierarchy(), [gen](data_cell_cursor const& job) { (*gen)(job); });
 }