add more tests for sycl predictor; fixed the found bugs

Author: Dmitry Razdoburdin

include/xgboost/objective.h

@@ -132,6 +132,12 @@ class ObjFunction : public Configurable {
    * \param name Name of the objective.
    */
   static ObjFunction* Create(const std::string& name, Context const* ctx);
+
+  /*!
+   * \brief Return sycl specific implementation name if possible.
+   * \param name Name of the objective.
+   */
+  static std::string GetSyclImplementationName(const std::string& name);
 };
 
 /*!

plugin/updater_oneapi/device_manager_oneapi.cc

@@ -10,7 +10,8 @@ namespace xgboost {
 
 sycl::device DeviceManagerOneAPI::GetDevice(const DeviceOrd& device_spec) const {
     if (!device_spec.IsSycl()) {
-        LOG(WARNING) << "Sycl kernel is executed with non-sycl context. "
+        LOG(WARNING) << "Sycl kernel is executed with non-sycl context: "
+                     << device_spec.Name() << ". "
                      << "Default sycl device_selector will be used.";
     }
 
@@ -45,7 +46,8 @@ sycl::device DeviceManagerOneAPI::GetDevice(const DeviceOrd& device_spec) const
 
 sycl::queue DeviceManagerOneAPI::GetQueue(const DeviceOrd& device_spec) const {
     if (!device_spec.IsSycl()) {
-        LOG(WARNING) << "Sycl kernel is executed with non-sycl context. "
+        LOG(WARNING) << "Sycl kernel is executed with non-sycl context: "
+                     << device_spec.Name() << ". "
                      << "Default sycl device_selector will be used.";
     }
 

plugin/updater_oneapi/predictor_oneapi.cc

@@ -180,6 +180,9 @@ class DeviceModelOneAPI {
     int sum = 0;
     tree_segments_[0] = sum;
     for (int tree_idx = tree_begin; tree_idx < tree_end; tree_idx++) {
+      if (model.trees[tree_idx]->HasCategoricalSplit()) {
+        LOG(FATAL) << "Categorical features are not yet supported by sycl";
+      }
       sum += model.trees[tree_idx]->GetNodes().size();
       tree_segments_[tree_idx - tree_begin + 1] = sum;
     }

src/learner.cc

@@ -528,6 +528,9 @@ class LearnerConfiguration : public Learner {
     auto const& objective_fn = learner_parameters.at("objective");
     if (!obj_) {
       CHECK_EQ(get<String const>(objective_fn["name"]), tparam_.objective);
+      if (ctx_.IsSycl()) {
+        tparam_.objective = ObjFunction::GetSyclImplementationName(tparam_.objective);
+      }
       obj_.reset(ObjFunction::Create(tparam_.objective, &ctx_));
     }
     obj_->LoadConfig(objective_fn);
@@ -791,6 +794,9 @@ class LearnerConfiguration : public Learner {
       // Rename one of them once binary IO is gone.
       cfg_["max_delta_step"] = kMaxDeltaStepDefaultValue;
     }
+    if (ctx_.IsSycl()) {
+      tparam_.objective = ObjFunction::GetSyclImplementationName(tparam_.objective);
+    }
     if (obj_ == nullptr || tparam_.objective != old.objective) {
       obj_.reset(ObjFunction::Create(tparam_.objective, &ctx_));
     }
@@ -882,6 +888,9 @@ class LearnerIO : public LearnerConfiguration {
     auto const& objective_fn = learner.at("objective");
 
     std::string name = get<String>(objective_fn["name"]);
+    if (ctx_.IsSycl()) {
+      name = ObjFunction::GetSyclImplementationName(name);
+    }
     tparam_.UpdateAllowUnknown(Args{{"objective", name}});
     obj_.reset(ObjFunction::Create(name, &ctx_));
     obj_->LoadConfig(objective_fn);
@@ -1009,6 +1018,9 @@ class LearnerIO : public LearnerConfiguration {
     CHECK(fi->Read(&tparam_.objective)) << "BoostLearner: wrong model format";
     CHECK(fi->Read(&tparam_.booster)) << "BoostLearner: wrong model format";
 
+    if (ctx_.IsSycl()) {
+      tparam_.objective = ObjFunction::GetSyclImplementationName(tparam_.objective);
+    }
     obj_.reset(ObjFunction::Create(tparam_.objective, &ctx_));
     gbm_.reset(GradientBooster::Create(tparam_.booster, &ctx_, &learner_model_param_));
     gbm_->Load(fi);

src/objective/objective.cc

@@ -18,27 +18,33 @@ DMLC_REGISTRY_ENABLE(::xgboost::ObjFunctionReg);
 namespace xgboost {
 // implement factory functions
 ObjFunction* ObjFunction::Create(const std::string& name, Context const* ctx) {
-  std::string replaced_name = name;
-  if (ctx->IsSycl()) {
-    auto *e = ::dmlc::Registry< ::xgboost::ObjFunctionReg>::Get()->Find(name + "_oneapi");
-    if (e != nullptr) {
-      replaced_name += "_oneapi";
-    }
-  }
-  auto *e = ::dmlc::Registry< ::xgboost::ObjFunctionReg>::Get()->Find(replaced_name);
+  auto *e = ::dmlc::Registry< ::xgboost::ObjFunctionReg>::Get()->Find(name);
   if (e == nullptr) {
     std::stringstream ss;
     for (const auto& entry : ::dmlc::Registry< ::xgboost::ObjFunctionReg>::List()) {
       ss << "Objective candidate: " << entry->name << "\n";
     }
-    LOG(FATAL) << "Unknown objective function: `" << replaced_name << "`\n"
+    LOG(FATAL) << "Unknown objective function: `" << name << "`\n"
                << ss.str();
   }
   auto pobj = (e->body)();
   pobj->ctx_ = ctx;
   return pobj;
 }
 
+// Return sycl specific implementation name if possible.
+std::string ObjFunction::GetSyclImplementationName(const std::string& name) {
+  const std::string sycl_postfix = "_oneapi";
+  auto *e = ::dmlc::Registry< ::xgboost::ObjFunctionReg>::Get()->Find(name + sycl_postfix);
+  if (e != nullptr) {
+    // Function has specific sycl implementation
+    return name + sycl_postfix;
+  } else {
+    // Function hasn't specific sycl implementation
+    return name;
+  }
+}
+
 void ObjFunction::InitEstimation(MetaInfo const&, linalg::Tensor<float, 1>* base_score) const {
   CHECK(base_score);
   base_score->Reshape(1);