Skip to content

Public API for Phlex v0.2.0 #469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
knoepfel merged 1 commit into from
Mar 30, 2026
+11 −11
Merged

Public API for Phlex v0.2.0 #469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion phlex/driver.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 4 additions & 3 deletions phlex/model/fixed_hierarchy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
{
}
Expand Down Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions phlex/model/fixed_hierarchy.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace phlex::experimental {
class async_driver;
}

namespace phlex::experimental {
namespace phlex {

class fixed_hierarchy;

Expand All @@ -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 {
Expand All @@ -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_;
Expand Down
5 changes: 2 additions & 3 deletions plugins/generate_layers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#include <string>

PHLEX_EXPERIMENTAL_REGISTER_DRIVER(d, config)
PHLEX_REGISTER_DRIVER(d, config)
{
using namespace phlex;

Expand All @@ -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); });
}
Loading