replace sycl-specific implementation for multiclass obj

razdoburdin · Nov 26, 2024 · 9c847ff · 9c847ff
1 parent 7c22f22
commit 9c847ff
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 229 deletions.
diff --git a/include/xgboost/objective.h b/include/xgboost/objective.h
@@ -133,12 +133,6 @@ 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);
 };
 
 /*!

diff --git a/plugin/CMakeLists.txt b/plugin/CMakeLists.txt
@@ -4,7 +4,8 @@ if(PLUGIN_SYCL)
     list(APPEND SYCL_SOURCES
     ${xgboost_SOURCE_DIR}/src/objective/regression_obj.cc
     ${xgboost_SOURCE_DIR}/src/objective/hinge.cc
-    ${xgboost_SOURCE_DIR}/src/objective/quantile_obj.cc)
+    ${xgboost_SOURCE_DIR}/src/objective/quantile_obj.cc
+    ${xgboost_SOURCE_DIR}/src/objective/multiclass_obj.cc)
   add_library(plugin_sycl OBJECT ${SYCL_SOURCES})
   target_include_directories(plugin_sycl
     PRIVATE

diff --git a/plugin/sycl/objective/multiclass_obj.cc b/plugin/sycl/objective/multiclass_obj.cc
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -5,6 +5,7 @@ if(PLUGIN_SYCL)
   list(REMOVE_ITEM CPU_SOURCES ${xgboost_SOURCE_DIR}/src/objective/regression_obj.cc)
   list(REMOVE_ITEM CPU_SOURCES ${xgboost_SOURCE_DIR}/src/objective/hinge.cc)
   list(REMOVE_ITEM CPU_SOURCES ${xgboost_SOURCE_DIR}/src/objective/quantile_obj.cc)
+  list(REMOVE_ITEM CPU_SOURCES ${xgboost_SOURCE_DIR}/src/objective/multiclass_obj.cc)
 endif()
 
 #-- Object library

diff --git a/src/objective/objective.cc b/src/objective/objective.cc
@@ -19,9 +19,6 @@ namespace xgboost {
 // implement factory functions
 ObjFunction* ObjFunction::Create(const std::string& name, Context const* ctx) {
   std::string obj_name = name;
-  if (ctx->IsSycl()) {
-    obj_name = GetSyclImplementationName(obj_name);
-  }
   auto *e = ::dmlc::Registry< ::xgboost::ObjFunctionReg>::Get()->Find(obj_name);
   if (e == nullptr) {
     std::stringstream ss;
@@ -36,22 +33,6 @@ ObjFunction* ObjFunction::Create(const std::string& name, Context const* ctx) {
   return pobj;
 }
 
-/* If the objective function has sycl-specific implementation,
- * returns the specific implementation name.
- * Otherwise return the orginal name without modifications.
- */
-std::string ObjFunction::GetSyclImplementationName(const std::string& name) {
-  const std::string sycl_postfix = "_sycl";
-  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);