refactor: Remove delete_label (#2925)

* refactor: Remove delete_label * Formatting * Update simple_label_parser.cc
VowpalWabbit · Apr 7, 2021 · dc0f65b · dc0f65b
1 parent aa9f8ee
commit dc0f65b
Show file tree

Hide file tree

Showing 18 changed files with 15 additions and 72 deletions.
diff --git a/vowpalwabbit/cb.cc b/vowpalwabbit/cb.cc
@@ -95,8 +95,6 @@ label_parser cb_label = {
   [](polylabel* v, reduction_features&, io_buf& cache) { CB::cache_label(v->cb, cache); },
   // read_cached_label
   [](shared_data* sd, polylabel* v, reduction_features&, io_buf& cache) { return CB::read_cached_label(sd, v->cb, cache); },
-  // delete_label
-  [](polylabel* v) { CB::delete_label(v->cb); },
    // get_weight
   [](polylabel*, const reduction_features&) { return 1.f; },
   // test_label
@@ -182,7 +180,6 @@ void default_label(CB_EVAL::label& ld)
 
 bool test_label(CB_EVAL::label& ld) { return CB::is_test_label(ld.event); }
 
-void delete_label(CB_EVAL::label& ld) { CB::delete_label(ld.event); }
 
 void parse_label(parser* p, shared_data* sd, CB_EVAL::label& ld, std::vector<VW::string_view>& words,
     reduction_features& red_features)
@@ -210,9 +207,7 @@ label_parser cb_eval = {
   [](polylabel* v, reduction_features&, io_buf& cache) { CB_EVAL::cache_label(v->cb_eval, cache); },
   // read_cached_label
   [](shared_data* sd, polylabel* v, reduction_features&, io_buf& cache) { return CB_EVAL::read_cached_label(sd, v->cb_eval, cache); },
-  // delete_label
-  [](polylabel* v) { CB_EVAL::delete_label(v->cb_eval); },
-   // get_weight
+  // get_weight
   [](polylabel*, const reduction_features&) { return 1.f; },
   // test_label
   [](polylabel* v) { return CB_EVAL::test_label(v->cb_eval); },

diff --git a/vowpalwabbit/cb_algs.cc b/vowpalwabbit/cb_algs.cc
@@ -26,11 +26,6 @@ namespace CB_ALGS
 struct cb
 {
   cb_to_cs cbcs;
-
-  ~cb()
-  {
-    COST_SENSITIVE::delete_label(cbcs.pred_scores);
-  }
 };
 
 bool know_all_cost_example(CB::label& ld)

diff --git a/vowpalwabbit/cb_continuous_label.cc b/vowpalwabbit/cb_continuous_label.cc
@@ -137,8 +137,6 @@ label_parser the_label_parser = {
   [](polylabel* v, reduction_features&, io_buf& cache) { CB::cache_label<continuous_label, continuous_label_elm>(v->cb_cont, cache); },
   // read_cached_label
   [](shared_data* sd, polylabel* v, reduction_features&, io_buf& cache) { return CB::read_cached_label<continuous_label, continuous_label_elm>(sd, v->cb_cont, cache); },
-  // delete_label
-  [](polylabel* v) { CB::delete_label<continuous_label>(v->cb_cont); },
   // get_weight
   // CB::weight just returns 1.f? This seems like it could be a bug...
   [](polylabel*, const reduction_features&) { return 1.f; },

diff --git a/vowpalwabbit/cb_label_parser.h b/vowpalwabbit/cb_label_parser.h
@@ -118,10 +118,4 @@ bool is_test_label(LabelT& ld)
   return true;
 }
 
-template <typename LabelT = CB::label>
-void delete_label(LabelT& ld)
-{
-  ld.costs.delete_v();
-}
-
 }  // namespace CB
diff --git a/vowpalwabbit/ccb_label.cc b/vowpalwabbit/ccb_label.cc
@@ -174,16 +174,6 @@ void default_label(label& ld)
 
 bool test_label(CCB::label& ld) { return ld.outcome == nullptr; }
 
-void delete_label(label& ld)
-{
-  if (ld.outcome)
-  {
-    delete ld.outcome;
-    ld.outcome = nullptr;
-  }
-  ld.explicit_included_actions.delete_v();
-}
-
 ACTION_SCORE::action_score convert_to_score(
     const VW::string_view& action_id_str, const VW::string_view& probability_str)
 {
@@ -314,9 +304,7 @@ label_parser ccb_label_parser = {
   [](polylabel* v, ::reduction_features&, io_buf& cache) { cache_label(v->conditional_contextual_bandit, cache); },
   // read_cached_label
   [](shared_data* sd, polylabel* v, ::reduction_features&, io_buf& cache) { return read_cached_label(sd, v->conditional_contextual_bandit, cache); },
-  // delete_label
-  [](polylabel* v) { delete_label(v->conditional_contextual_bandit); },
-   // get_weight
+  // get_weight
   [](polylabel* v, const ::reduction_features&) { return ccb_weight(v->conditional_contextual_bandit); },
   // test_label
   [](polylabel* v) { return test_label(v->conditional_contextual_bandit); },

diff --git a/vowpalwabbit/ccb_label.h b/vowpalwabbit/ccb_label.h
@@ -104,7 +104,6 @@ struct label
 };
 
 void default_label(CCB::label& ld);
-void delete_label(CCB::label& ld);
 void parse_label(parser* p, shared_data*, CCB::label& ld, std::vector<VW::string_view>& words, ::reduction_features&);
 void cache_label(CCB::label& ld, io_buf& cache);
 size_t read_cached_label(shared_data*, CCB::label& ld, io_buf& cache);

diff --git a/vowpalwabbit/cost_sensitive.cc b/vowpalwabbit/cost_sensitive.cc
@@ -99,8 +99,6 @@ bool test_label(label& ld)
   return true;
 }
 
-void delete_label(label& ld) { ld.costs.delete_v(); }
-
 void parse_label(parser* p, shared_data* sd, label& ld, std::vector<VW::string_view>& words, reduction_features&)
 {
   ld.costs.clear();
@@ -177,9 +175,7 @@ label_parser cs_label = {
   [](polylabel* v, reduction_features&, io_buf& cache) { cache_label(v->cs, cache); },
   // read_cached_label
   [](shared_data* sd, polylabel* v, reduction_features&, io_buf& cache) { return read_cached_label(sd, v->cs, cache); },
-  // delete_label
-  [](polylabel* v) { if (v) delete_label(v->cs); },
-   // get_weight
+  // get_weight
   [](polylabel* v, const reduction_features&) { return weight(v->cs); },
   // test_label
   [](polylabel* v) { return test_label(v->cs); },

diff --git a/vowpalwabbit/cost_sensitive.h b/vowpalwabbit/cost_sensitive.h
@@ -37,7 +37,6 @@ void finish_example(vw& all, T&, example& ec)
   finish_example(all, ec);
 }
 
-void delete_label(label& ld);
 void default_label(label& ld);
 extern label_parser cs_label;
 

diff --git a/vowpalwabbit/label_parser.h b/vowpalwabbit/label_parser.h
@@ -35,7 +35,6 @@ struct label_parser
   void (*parse_label)(parser*, shared_data*, polylabel*, std::vector<VW::string_view>&, reduction_features&);
   void (*cache_label)(polylabel*, reduction_features&, io_buf& cache);
   size_t (*read_cached_label)(shared_data*, polylabel*, reduction_features&, io_buf& cache);
-  void (*delete_label)(polylabel*);
   float (*get_weight)(polylabel*, const reduction_features&);
   bool (*test_label)(polylabel*);
   label_type_t label_type;

diff --git a/vowpalwabbit/multiclass.cc b/vowpalwabbit/multiclass.cc
@@ -97,9 +97,7 @@ label_parser mc_label = {
   [](polylabel* v, reduction_features&, io_buf& cache) { cache_label(v->multi, cache); },
   // read_cached_label
   [](shared_data* sd, polylabel* v, reduction_features&, io_buf& cache) { return read_cached_label(sd, v->multi, cache); },
-  // delete_label
-  [](polylabel*) {},
-   // get_weight
+  // get_weight
   [](polylabel* v, const reduction_features&) { return weight(v->multi); },
   // test_label
   [](polylabel* v) { return test_label(v->multi); },

diff --git a/vowpalwabbit/multilabel.cc b/vowpalwabbit/multilabel.cc
@@ -74,8 +74,6 @@ void default_label(MULTILABEL::labels& ld) { ld.label_v.clear(); }
 
 bool test_label(MULTILABEL::labels& ld) { return ld.label_v.size() == 0; }
 
-void delete_label(MULTILABEL::labels& ld) { ld.label_v.delete_v(); }
-
 void parse_label(
     parser* p, shared_data*, MULTILABEL::labels& ld, std::vector<VW::string_view>& words, reduction_features&)
 {
@@ -109,9 +107,7 @@ label_parser multilabel = {
   [](polylabel* v, reduction_features&, io_buf& cache) { cache_label(v->multilabels, cache); },
   // read_cached_label
   [](shared_data* sd, polylabel* v, reduction_features&, io_buf& cache) { return read_cached_label(sd, v->multilabels, cache); },
-  // delete_label
-  [](polylabel* v) { if (v) delete_label(v->multilabels); },
-   // get_weight
+  // get_weight
   [](polylabel* v, const reduction_features&) { return weight(v->multilabels); },
   // test_label
   [](polylabel* v) { return test_label(v->multilabels); },

diff --git a/vowpalwabbit/no_label.cc b/vowpalwabbit/no_label.cc
@@ -46,8 +46,6 @@ label_parser no_label_parser = {
   [](polylabel*, reduction_features&, io_buf&) {},
   // read_cached_label
   [](shared_data*, polylabel*, reduction_features&, io_buf&) -> size_t { return 1; },
-  // delete_label
-  [](polylabel*) {},
    // get_weight
   [](polylabel*, const reduction_features&) { return 1.f; },
   // test_label

diff --git a/vowpalwabbit/search.cc b/vowpalwabbit/search.cc
@@ -2234,13 +2234,13 @@ void train_single_example(search& sch, bool is_test_ex, bool is_holdout_ex, mult
     cdbg << "gte" << endl;
     generate_training_example(priv, priv.learn_losses, 1., true);  // , min_loss);  // TODO: weight
     if (!priv.examples_dont_change)
-      for (size_t n = 0; n < priv.learn_ec_copy.size(); n++)
+    {
+      for (auto& ex : priv.learn_ec_copy)
       {
-        if (sch.priv->is_ldf)
-          CS::cs_label.delete_label(&priv.learn_ec_copy[n].l);
-        else
-          MC::mc_label.delete_label(&priv.learn_ec_copy[n].l);
+        // Reset the state of the polylabel
+        ex.l = polylabel{};
       }
+    }
     if (priv.cb_learner)
       priv.learn_losses.cb.costs.clear();
     else

diff --git a/vowpalwabbit/simple_label_parser.cc b/vowpalwabbit/simple_label_parser.cc
@@ -112,8 +112,6 @@ label_parser simple_label_parser = {
   [](polylabel* v, reduction_features& red_features, io_buf& cache) { cache_simple_label(v->simple, red_features, cache); },
   // read_cached_label
   [](shared_data* sd, polylabel* v, reduction_features& red_features, io_buf& cache) { return read_cached_simple_label(sd, v->simple, red_features, cache); },
-  // delete_label
-  [](polylabel*) {},
    // get_weight
   [](polylabel* v, const reduction_features& red) { return get_weight(v->simple, red); },
   // test_label

diff --git a/vowpalwabbit/slates.cc b/vowpalwabbit/slates.cc
@@ -99,7 +99,6 @@ void slates_data::learn_or_predict(VW::LEARNER::multi_learner& base, multi_ex& e
 
   for (size_t i = 0; i < examples.size(); i++)
   {
-    CCB::delete_label(examples[i]->l.conditional_contextual_bandit);
     examples[i]->l.slates = std::move(_stashed_labels[i]);
   }
   _stashed_labels.clear();

diff --git a/vowpalwabbit/slates_label.cc b/vowpalwabbit/slates_label.cc
@@ -78,8 +78,6 @@ void default_label(slates::label& ld) { ld.reset_to_default(); }
 
 bool test_label(slates::label& ld) { return ld.labeled == false; }
 
-void delete_label(slates::label& ld) { ld.probabilities.delete_v(); }
-
 // Slates labels come in three types, shared, action and slot with the following structure:
 // slates shared [global_cost]
 // slates action <slot_id>
@@ -182,9 +180,7 @@ label_parser slates_label_parser = {
   [](polylabel* v, reduction_features&, io_buf& cache) { cache_label(v->slates, cache); },
   // read_cached_label
   [](shared_data* sd, polylabel* v, reduction_features&, io_buf& cache) { return read_cached_label(sd, v->slates, cache); },
-  // delete_label
-  [](polylabel* v) { delete_label(v->slates); },
-   // get_weight
+  // get_weight
   [](polylabel* v, const reduction_features&) { return weight(v->slates); },
   // test_label
   [](polylabel* v) { return test_label(v->slates); },

diff --git a/vowpalwabbit/slates_label.h b/vowpalwabbit/slates_label.h
@@ -57,7 +57,6 @@ struct label
 void default_label(VW::slates::label& v);
 void parse_label(
     parser* p, shared_data* /*sd*/, VW::slates::label& ld, std::vector<VW::string_view>& words, reduction_features&);
-void delete_label(VW::slates::label& ld);
 void cache_label(VW::slates::label& ld, io_buf& cache);
 size_t read_cached_label(shared_data* /*sd*/, VW::slates::label& ld, io_buf& cache);
 

diff --git a/vowpalwabbit/warm_cb.cc b/vowpalwabbit/warm_cb.cc
@@ -85,16 +85,12 @@ struct warm_cb
   uint32_t inter_iter;
   MULTICLASS::label_t mc_label;
   COST_SENSITIVE::label cs_label;
-  COST_SENSITIVE::label* csls;
-  CB::label* cbls;
+  std::vector<COST_SENSITIVE::label> csls;
+  std::vector<CB::label> cbls;
   bool use_cs;
 
   ~warm_cb()
   {
-    for (size_t a = 0; a < num_actions; ++a) { COST_SENSITIVE::delete_label(csls[a]); }
-    free(csls);
-    free(cbls);
-
     for (size_t a = 0; a < num_actions; ++a) { VW::dealloc_examples(ecs[a], 1); }
 
     for (auto* ex : ws_vali) { VW::dealloc_examples(ex, 1); }
@@ -506,13 +502,13 @@ void init_adf_data(warm_cb& data, const uint32_t num_actions)
   }
 
   // The rest of the initialization is for warm start CB
-  data.csls = calloc_or_throw<COST_SENSITIVE::label>(num_actions);
+  data.csls.resize(num_actions);
   for (uint32_t a = 0; a < num_actions; ++a)
   {
     COST_SENSITIVE::default_label(data.csls[a]);
     data.csls[a].costs.push_back({0, a + 1, 0, 0});
   }
-  data.cbls = calloc_or_throw<CB::label>(num_actions);
+  data.cbls.resize(num_actions);
 
   data.ws_train_size = data.ws_period;
   data.ws_vali_size = 0;