Skip to content
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

refactor: allow reduction to control print frequency #4315

Merged
merged 3 commits into from
Dec 6, 2022
Merged

refactor: allow reduction to control print frequency #4315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7648552
refactor: allow reduction to control print frequency
jackgerrits Dec 6, 2022
7c5d94e
add check for slates
jackgerrits Dec 6, 2022
46c9dbc
Merge branch 'master' into control_print_internally_to_reduction
jackgerrits Dec 6, 2022
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
4 changes: 1 addition & 3 deletions vowpalwabbit/core/include/vw/core/learner.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,9 +423,7 @@ class learner

if (has_output_example_prediction()) { output_example_prediction(all, ec); }

const bool should_print_driver_update =
all.sd->weighted_examples() >= all.sd->dump_interval && !all.quiet && !all.bfgs;
if (has_print_update() && should_print_driver_update) { print_update(all, ec); }
if (has_print_update()) { print_update(all, ec); }

if (has_cleanup_example()) { cleanup_example(ec); }

Expand Down
5 changes: 4 additions & 1 deletion vowpalwabbit/core/src/reductions/conditional_contextual_bandit.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,10 @@ void output_example_prediction_ccb(
void print_update_ccb(VW::workspace& all, shared_data& /* sd */, const ccb_data& data, const VW::multi_ex& ec_seq,
VW::io::logger& /* unused */)
{
if (!ec_seq.empty() && !data.no_pred)
const bool should_print_driver_update =
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe throw this in SD as a default print update cadence

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Discussed offline, will address later

all.sd->weighted_examples() >= all.sd->dump_interval && !all.quiet && !all.bfgs;

if (should_print_driver_update && !ec_seq.empty() && !data.no_pred)
{
// Print progress
size_t num_features = 0;
Expand Down
5 changes: 4 additions & 1 deletion vowpalwabbit/core/src/reductions/mwt.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,10 @@ void output_example_prediction_mwt(
void print_update_mwt(
VW::workspace& all, shared_data& /* sd */, const mwt& data, const VW::example& ec, VW::io::logger& /* unused */)
{
if (data.learn)
const bool should_print_driver_update =
all.sd->weighted_examples() >= all.sd->dump_interval && !all.quiet && !all.bfgs;

if (should_print_driver_update && data.learn)
{
size_t num_features = ec.get_num_features();
size_t pred = ec.pred.multiclass;
Expand Down
5 changes: 5 additions & 0 deletions vowpalwabbit/core/src/reductions/slates.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,11 @@ void output_example_prediction_slates(VW::workspace& all, const VW::reductions::
void print_update_slates(VW::workspace& all, shared_data& /* sd */, const VW::reductions::slates_data& /* data */,
const VW::multi_ex& ec_seq, VW::io::logger& /* unused */)
{
const bool should_print_driver_update =
all.sd->weighted_examples() >= all.sd->dump_interval && !all.quiet && !all.bfgs;

if (!should_print_driver_update) { return; }

const auto& predictions = ec_seq[0]->pred.decision_scores;
VW::multi_ex slots;
size_t num_features = 0;
Expand Down
10 changes: 8 additions & 2 deletions vowpalwabbit/core/src/simple_label.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,14 @@ void VW::details::update_stats_simple_label(
void VW::details::print_update_simple_label(
VW::workspace& all, shared_data& sd, const VW::example& ec, VW::io::logger& /* logger */)
{
sd.print_update(*all.trace_message, all.holdout_set_off, all.current_pass, ec.l.simple.label, ec.pred.scalar,
ec.get_num_features(), all.progress_add, all.progress_arg);
const bool should_print_driver_update =
all.sd->weighted_examples() >= all.sd->dump_interval && !all.quiet && !all.bfgs;

if (should_print_driver_update)
{
sd.print_update(*all.trace_message, all.holdout_set_off, all.current_pass, ec.l.simple.label, ec.pred.scalar,
ec.get_num_features(), all.progress_add, all.progress_arg);
}
}

void VW::details::output_example_prediction_simple_label(
Expand Down