Move task-config out of global template and adjust init func as per review

seberg · seberg · commit 114a05fef24f · 2025-03-18T13:24:45.000+01:00
Signed-off-by: Sebastian Berg &lt;sebastianb@nvidia.com&gt;
diff --git a/src/cpp_utils/cpp_utils.h b/src/cpp_utils/cpp_utils.h
@@ -311,6 +311,8 @@ inline void extract_scalars(std::tuple<>& t, legate::TaskContext context) {}
 template <typename F, int OpCode>
 class UnaryOpTask : public Task<UnaryOpTask<F, OpCode>, OpCode> {
  public:
+  static inline const auto TASK_CONFIG = legate::TaskConfig{legate::LocalTaskID{OpCode}};
+
   template <std::int32_t kDim, typename Policy>
   struct DispatchTypeOp {
     template <typename T>
diff --git a/src/encoder/target_encoder.cc b/src/encoder/target_encoder.cc
@@ -223,7 +223,7 @@ struct target_encoder_encode_fn {
 namespace  // unnamed
 {
 
-const auto reg_tasks_ = []() -> char {
+static const auto reg_id_ = []() -> char {
   legateboost::TargetEncoderMeanTask::register_variants();
   legateboost::TargetEncoderEncodeTask::register_variants();
   legateboost::TargetEncoderVarianceTask::register_variants();
diff --git a/src/encoder/target_encoder.h b/src/encoder/target_encoder.h
@@ -22,6 +22,8 @@ class TargetEncoderMeanTask : public Task<TargetEncoderMeanTask, TARGET_ENCODER_
  public:
   static constexpr auto CPU_VARIANT_OPTIONS = legate::VariantOptions{}.with_has_allocations(false);
   static constexpr auto GPU_VARIANT_OPTIONS = legate::VariantOptions{}.with_has_allocations(false);
+  static inline const auto TASK_CONFIG =
+    legate::TaskConfig{legate::LocalTaskID{TARGET_ENCODER_MEAN}};
 
   static void cpu_variant(legate::TaskContext context);
 #ifdef LEGATEBOOST_USE_CUDA
@@ -33,6 +35,8 @@ class TargetEncoderVarianceTask : public Task<TargetEncoderVarianceTask, TARGET_
  public:
   static constexpr auto CPU_VARIANT_OPTIONS = legate::VariantOptions{}.with_has_allocations(false);
   static constexpr auto GPU_VARIANT_OPTIONS = legate::VariantOptions{}.with_has_allocations(false);
+  static inline const auto TASK_CONFIG =
+    legate::TaskConfig{legate::LocalTaskID{TARGET_ENCODER_VARIANCE}};
 
   static void cpu_variant(legate::TaskContext context);
 #ifdef LEGATEBOOST_USE_CUDA
@@ -44,6 +48,8 @@ class TargetEncoderEncodeTask : public Task<TargetEncoderEncodeTask, TARGET_ENCO
  public:
   static constexpr auto CPU_VARIANT_OPTIONS = legate::VariantOptions{}.with_has_allocations(false);
   static constexpr auto GPU_VARIANT_OPTIONS = legate::VariantOptions{}.with_has_allocations(false);
+  static inline const auto TASK_CONFIG =
+    legate::TaskConfig{legate::LocalTaskID{TARGET_ENCODER_ENCODE}};
 
   static void cpu_variant(legate::TaskContext context);
 #ifdef LEGATEBOOST_USE_CUDA
diff --git a/src/legate_library.h b/src/legate_library.h
@@ -26,8 +26,7 @@ struct Task : public legate::LegateTask<T> {
   Task() = default;
 
  public:
-  using Registrar                      = Registry;
-  static inline const auto TASK_CONFIG = legate::TaskConfig{legate::LocalTaskID{ID}};
+  using Registrar = Registry;
   friend T;
 };
 
diff --git a/src/models/krr/rbf.cc b/src/models/krr/rbf.cc
@@ -17,8 +17,10 @@
 #include "models/krr/rbf.h"
 namespace  // unnamed
 {
-const auto reg_tasks_ = []() -> char {
-  legateboost::RbfTask::register_variants();
+struct RbfTask : legateboost::RbfTask {};
+
+static const auto reg_id_ = []() -> char {
+  RbfTask::register_variants();
   return 0;
 }();
 }  // namespace
diff --git a/src/models/nn/build_nn.cc b/src/models/nn/build_nn.cc
@@ -570,7 +570,7 @@ struct build_nn_fn {
 }  // namespace legateboost
 namespace  // unnamed
 {
-const auto reg_tasks_ = []() -> char {
+static const auto reg_id_ = []() -> char {
   legateboost::BuildNNTask::register_variants();
   return 0;
 }();
diff --git a/src/models/nn/build_nn.h b/src/models/nn/build_nn.h
@@ -167,6 +167,7 @@ class BuildNNTask : public Task<BuildNNTask, BUILD_NN> {
  public:
   static constexpr auto CPU_VARIANT_OPTIONS = legate::VariantOptions{}.with_has_allocations(true);
   static constexpr auto GPU_VARIANT_OPTIONS = legate::VariantOptions{}.with_has_allocations(true);
+  static inline const auto TASK_CONFIG      = legate::TaskConfig{legate::LocalTaskID{BUILD_NN}};
 
   static void cpu_variant(legate::TaskContext context);
 #ifdef LEGATEBOOST_USE_CUDA
diff --git a/src/models/tree/build_tree.cc b/src/models/tree/build_tree.cc
@@ -542,7 +542,7 @@ struct build_tree_fn {
 
 namespace  // unnamed
 {
-const auto reg_tasks_ = []() -> char {
+static const auto reg_id_ = []() -> char {
   legateboost::BuildTreeTask::register_variants();
   return 0;
 }();
diff --git a/src/models/tree/build_tree.h b/src/models/tree/build_tree.h
@@ -289,6 +289,7 @@ class BuildTreeTask : public Task<BuildTreeTask, BUILD_TREE> {
  public:
   static constexpr auto CPU_VARIANT_OPTIONS = legate::VariantOptions{}.with_has_allocations(true);
   static constexpr auto GPU_VARIANT_OPTIONS = legate::VariantOptions{}.with_has_allocations(true);
+  static inline const auto TASK_CONFIG      = legate::TaskConfig{legate::LocalTaskID{BUILD_TREE}};
 
   static void cpu_variant(legate::TaskContext context);
 #ifdef LEGATEBOOST_USE_CUDA
diff --git a/src/models/tree/predict.cc b/src/models/tree/predict.cc
@@ -77,7 +77,7 @@ struct predict_fn {
 
 namespace  // unnamed
 {
-const auto reg_tasks_ = []() -> char {
+static const auto reg_id_ = []() -> char {
   legateboost::PredictTask::register_variants();
   return 0;
 }();
diff --git a/src/models/tree/predict.h b/src/models/tree/predict.h
@@ -22,6 +22,8 @@ namespace legateboost {
 
 class PredictTask : public Task<PredictTask, PREDICT> {
  public:
+  static inline const auto TASK_CONFIG = legate::TaskConfig{legate::LocalTaskID{PREDICT}};
+
   static void cpu_variant(legate::TaskContext context);
 #ifdef LEGATEBOOST_USE_CUDA
   static void gpu_variant(legate::TaskContext context);
diff --git a/src/models/tree/update_tree.cc b/src/models/tree/update_tree.cc
@@ -122,6 +122,7 @@ struct update_tree_fn {
 class UpdateTreeTask : public Task<UpdateTreeTask, UPDATE_TREE> {
  public:
   static constexpr auto CPU_VARIANT_OPTIONS = legate::VariantOptions{}.with_has_allocations(true);
+  static inline const auto TASK_CONFIG      = legate::TaskConfig{legate::LocalTaskID{UPDATE_TREE}};
 
   static void cpu_variant(legate::TaskContext context)
   {
@@ -134,7 +135,7 @@ class UpdateTreeTask : public Task<UpdateTreeTask, UPDATE_TREE> {
 
 namespace  // unnamed
 {
-const auto reg_tasks_ = []() -> char {
+static const auto reg_id_ = []() -> char {
   legateboost::UpdateTreeTask::register_variants();
   return 0;
 }();
diff --git a/src/special/special.cc b/src/special/special.cc
@@ -16,12 +16,18 @@
 #include "../cpp_utils/cpp_utils.h"
 namespace  // unnamed
 {
-const auto reg_tasks_ = []() -> char {
-  legateboost::ErfTask::register_variants();
-  legateboost::LgammaTask::register_variants();
-  legateboost::TgammaTask::register_variants();
-  legateboost::DigammaTask::register_variants();
-  legateboost::ZetaTask::register_variants();
+struct ErfTask : legateboost::ErfTask {};
+struct LgammaTask : legateboost::LgammaTask {};
+struct TgammaTask : legateboost::TgammaTask {};
+struct DigammaTask : legateboost::DigammaTask {};
+struct ZetaTask : legateboost::ZetaTask {};
+
+static const auto reg_id_ = []() -> char {
+  ErfTask::register_variants();
+  LgammaTask::register_variants();
+  TgammaTask::register_variants();
+  DigammaTask::register_variants();
+  ZetaTask::register_variants();
   return 0;
 }();
 }  // namespace
diff --git a/src/special/special.h b/src/special/special.h
@@ -315,8 +315,8 @@ struct ZetaOp {
 };
 
 using ErfTask     = UnaryOpTask<ErfOp, ERF>;
-using TgammaTask  = UnaryOpTask<TgammaOp, TGAMMA>;
 using LgammaTask  = UnaryOpTask<LgammaOp, LGAMMA>;
+using TgammaTask  = UnaryOpTask<TgammaOp, TGAMMA>;
 using DigammaTask = UnaryOpTask<DigammaOp, DIGAMMA>;
 using ZetaTask    = UnaryOpTask<ZetaOp, ZETA>;
 
diff --git a/src/utils/gather.cc b/src/utils/gather.cc
@@ -75,7 +75,7 @@ struct gather_fn {
 
 namespace  // unnamed
 {
-const auto reg_tasks_ = []() -> char {
+static const auto reg_id_ = []() -> char {
   legateboost::GatherTask::register_variants();
   return 0;
 }();
diff --git a/src/utils/gather.h b/src/utils/gather.h
@@ -23,6 +23,7 @@ class GatherTask : public Task<GatherTask, GATHER> {
  public:
   // GPU variant may create buffer to copy from host
   static constexpr auto GPU_VARIANT_OPTIONS = legate::VariantOptions{}.with_has_allocations(true);
+  static inline const auto TASK_CONFIG      = legate::TaskConfig{legate::LocalTaskID{GATHER}};
 
   static void cpu_variant(legate::TaskContext context);
 #ifdef LEGATEBOOST_USE_CUDA

Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ struct target_encoder_encode_fn {`
`223`	`223`	`namespace // unnamed`
`224`	`224`	`{`
`225`	`225`
`226`		`-const auto reg_tasks_ = []() -> char {`
	`226`	`+static const auto reg_id_ = []() -> char {`
`227`	`227`	`legateboost::TargetEncoderMeanTask::register_variants();`
`228`	`228`	`legateboost::TargetEncoderEncodeTask::register_variants();`
`229`	`229`	`legateboost::TargetEncoderVarianceTask::register_variants();`
Original file line number	Diff line number	Diff line change
`@@ -570,7 +570,7 @@ struct build_nn_fn {`
`570`	`570`	`} // namespace legateboost`
`571`	`571`	`namespace // unnamed`
`572`	`572`	`{`
`573`		`-const auto reg_tasks_ = []() -> char {`
	`573`	`+static const auto reg_id_ = []() -> char {`
`574`	`574`	`legateboost::BuildNNTask::register_variants();`
`575`	`575`	`return 0;`
`576`	`576`	`}();`
Original file line number	Diff line number	Diff line change
`@@ -542,7 +542,7 @@ struct build_tree_fn {`
`542`	`542`
`543`	`543`	`namespace // unnamed`
`544`	`544`	`{`
`545`		`-const auto reg_tasks_ = []() -> char {`
	`545`	`+static const auto reg_id_ = []() -> char {`
`546`	`546`	`legateboost::BuildTreeTask::register_variants();`
`547`	`547`	`return 0;`
`548`	`548`	`}();`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ struct predict_fn {`
`77`	`77`
`78`	`78`	`namespace // unnamed`
`79`	`79`	`{`
`80`		`-const auto reg_tasks_ = []() -> char {`
	`80`	`+static const auto reg_id_ = []() -> char {`
`81`	`81`	`legateboost::PredictTask::register_variants();`
`82`	`82`	`return 0;`
`83`	`83`	`}();`
Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,7 @@ struct update_tree_fn {`
`122`	`122`	`class UpdateTreeTask : public Task<UpdateTreeTask, UPDATE_TREE> {`
`123`	`123`	`public:`
`124`	`124`	`static constexpr auto CPU_VARIANT_OPTIONS = legate::VariantOptions{}.with_has_allocations(true);`
	`125`	`+ static inline const auto TASK_CONFIG = legate::TaskConfig{legate::LocalTaskID{UPDATE_TREE}};`
`125`	`126`
`126`	`127`	`static void cpu_variant(legate::TaskContext context)`
`127`	`128`	`{`
`@@ -134,7 +135,7 @@ class UpdateTreeTask : public Task<UpdateTreeTask, UPDATE_TREE> {`
`134`	`135`
`135`	`136`	`namespace // unnamed`
`136`	`137`	`{`
`137`		`-const auto reg_tasks_ = []() -> char {`
	`138`	`+static const auto reg_id_ = []() -> char {`
`138`	`139`	`legateboost::UpdateTreeTask::register_variants();`
`139`	`140`	`return 0;`
`140`	`141`	`}();`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ struct gather_fn {`
`75`	`75`
`76`	`76`	`namespace // unnamed`
`77`	`77`	`{`
`78`		`-const auto reg_tasks_ = []() -> char {`
	`78`	`+static const auto reg_id_ = []() -> char {`
`79`	`79`	`legateboost::GatherTask::register_variants();`
`80`	`80`	`return 0;`
`81`	`81`	`}();`