MAINT: Revert most of the legate 25.05 changes (#229)

Legate was update to allow the old patterns which means we
can revert the changes done to support 25.05 (with the exception
of actually bumping it and moving `TASK_CONFIG` to the global
Task template).

Signed-off-by: Sebastian Berg <sebastianb@nvidia.com>

Author: seberg

src/cpp_utils/cpp_utils.cuh

@@ -162,8 +162,8 @@ class ThrustAllocator : public legate::ScopedAllocator {
   void deallocate(char* ptr, size_t /*n*/) { ScopedAllocator::deallocate(ptr); }
 };
 
-template <typename F>
-void UnaryOp<F>::gpu_variant(legate::TaskContext context)
+template <typename F, int OpCode>
+void UnaryOpTask<F, OpCode>::gpu_variant(legate::TaskContext context)
 {
   auto const& in          = context.input(0);
   auto* stream            = context.get_task_stream();

src/cpp_utils/cpp_utils.h

@@ -308,8 +308,8 @@ void extract_scalars(std::tuple<Tp...>& t, legate::TaskContext context)
 }
 inline void extract_scalars(std::tuple<>& t, legate::TaskContext context) {}
 
-template <typename F>
-class UnaryOp {
+template <typename F, int OpCode>
+class UnaryOpTask : public Task<UnaryOpTask<F, OpCode>, OpCode> {
  public:
   template <std::int32_t kDim, typename Policy>
   struct DispatchTypeOp {

src/encoder/target_encoder.cc

@@ -219,15 +219,12 @@ struct target_encoder_encode_fn {
   type_dispatch_float(X.code(), target_encoder_encode_fn(), context);
 }
 }  // namespace legateboost
-
 namespace  // unnamed
 {
-
-const auto reg_id_ = []() -> char {
+void __attribute__((constructor)) register_tasks()
+{
   legateboost::TargetEncoderMeanTask::register_variants();
   legateboost::TargetEncoderEncodeTask::register_variants();
   legateboost::TargetEncoderVarianceTask::register_variants();
-  return 0;
-}();
-
+}
 }  // namespace

src/encoder/target_encoder.h

@@ -22,8 +22,6 @@ 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
@@ -35,8 +33,6 @@ 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
@@ -48,8 +44,6 @@ 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

src/legate_library.h

@@ -26,7 +26,8 @@ struct Task : public legate::LegateTask<T> {
   Task() = default;
 
  public:
-  using Registrar = Registry;
+  using Registrar                      = Registry;
+  static inline const auto TASK_CONFIG = legate::TaskConfig{legate::LocalTaskID{ID}};
   friend T;
 };
 

src/models/krr/rbf.cc

@@ -15,16 +15,7 @@
  *
  */
 #include "models/krr/rbf.h"
-namespace legateboost {
-/*static*/ void RbfTask::cpu_variant(legate::TaskContext context)
+namespace  // unnamed
 {
-  legateboost::UnaryOp<RbfOp>::cpu_variant(context);
-}
-}  // namespace legateboost
-
-namespace {
-const auto reg_id_ = []() -> char {
-  legateboost::RbfTask::register_variants();
-  return 0;
-}();
+void __attribute__((constructor)) register_tasks() { legateboost::RbfTask::register_variants(); }
 }  // namespace

src/models/krr/rbf.cu

@@ -18,8 +18,6 @@
 #include "../../cpp_utils/cpp_utils.cuh"
 
 namespace legateboost {
-/*static*/ void RbfTask::gpu_variant(legate::TaskContext context)
-{
-  UnaryOp<RbfOp>::gpu_variant(context);
-}
+// Explicit instantiation
+template void RbfTask::gpu_variant(legate::TaskContext context);
 };  // namespace legateboost

src/models/krr/rbf.h

@@ -31,12 +31,5 @@ struct RbfOp {
   }
 };
 
-class RbfTask : public Task<RbfTask, RBF> {
- public:
-  static inline const auto TASK_CONFIG = legate::TaskConfig{legate::LocalTaskID{RBF}};
-  static void cpu_variant(legate::TaskContext context);
-#ifdef LEGATEBOOST_USE_CUDA
-  static void gpu_variant(legate::TaskContext context);
-#endif
-};
+using RbfTask = UnaryOpTask<RbfOp, RBF>;
 }  // namespace legateboost

src/models/nn/build_nn.cc

@@ -570,8 +570,8 @@ struct build_nn_fn {
 }  // namespace legateboost
 namespace  // unnamed
 {
-const auto reg_id_ = []() -> char {
+void __attribute__((constructor)) register_tasks()
+{
   legateboost::BuildNNTask::register_variants();
-  return 0;
-}();
+}
 }  // namespace

src/models/nn/build_nn.h

@@ -167,7 +167,6 @@ 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