Merge branch 'master' into python/support-scikit-learn-1.6

dmlc · Dec 3, 2024 · 27a1bcc · 27a1bcc
2 parents a511848 + d6b7e06
commit 27a1bcc
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 243 deletions.
diff --git a/.github/workflows/jvm_tests.yml b/.github/workflows/jvm_tests.yml
@@ -24,12 +24,12 @@ jobs:
       with:
         submodules: 'true'
 
-    - uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73  # v4.4.0
+    - uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b  # v4.5.0
       with:
         distribution: 'temurin'
         java-version: '8'
 
-    - uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca  # v3.0.4
+    - uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d  # v3.1.0
       with:
         miniforge-variant: Miniforge3
         miniforge-version: latest

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -79,7 +79,7 @@ jobs:
     - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
       with:
         submodules: 'true'
-    - uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca  # v3.0.4
+    - uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d  # v3.1.0
       with:
         miniforge-variant: Miniforge3
         miniforge-version: latest
@@ -121,7 +121,7 @@ jobs:
     - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
       with:
         submodules: 'true'
-    - uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca  # v3.0.4
+    - uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d  # v3.1.0
       with:
         miniforge-variant: Miniforge3
         miniforge-version: latest

diff --git a/.github/workflows/python_tests.yml b/.github/workflows/python_tests.yml
@@ -24,7 +24,7 @@ jobs:
     - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
       with:
         submodules: 'true'
-    - uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca  # v3.0.4
+    - uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d  # v3.1.0
       with:
         miniforge-variant: Miniforge3
         miniforge-version: latest
@@ -56,7 +56,7 @@ jobs:
     - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
       with:
         submodules: 'true'
-    - uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca  # v3.0.4
+    - uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d  # v3.1.0
       with:
         miniforge-variant: Miniforge3
         miniforge-version: latest
@@ -93,7 +93,7 @@ jobs:
       if: matrix.os == 'macos-13'
       run: |
         brew install ninja libomp
-    - uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
+    - uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
       with:
         auto-update-conda: true
         python-version: ${{ matrix.python-version }}
@@ -128,7 +128,7 @@ jobs:
       with:
         submodules: 'true'
 
-    - uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca  # v3.0.4
+    - uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d  # v3.1.0
       with:
         miniforge-variant: Miniforge3
         miniforge-version: latest
@@ -181,7 +181,7 @@ jobs:
       with:
         submodules: 'true'
 
-    - uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
+    - uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d # v3.1.0
       with:
         auto-update-conda: true
         python-version: ${{ matrix.config.python-version }}
@@ -225,7 +225,7 @@ jobs:
       with:
         submodules: 'true'
 
-    - uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca  # v3.0.4
+    - uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d  # v3.1.0
       with:
         miniforge-variant: Miniforge3
         miniforge-version: latest
@@ -278,7 +278,7 @@ jobs:
       with:
         submodules: 'true'
 
-    - uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca  # v3.0.4
+    - uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d  # v3.1.0
       with:
         miniforge-variant: Miniforge3
         miniforge-version: latest

diff --git a/.github/workflows/python_wheels.yml b/.github/workflows/python_wheels.yml
@@ -32,7 +32,7 @@ jobs:
       uses: Homebrew/actions/setup-homebrew@68fa6aeb1ccb0596d311f2b34ec74ec21ee68e54
     - name: Install libomp
       run: brew install libomp
-    - uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca  # v3.0.4
+    - uses: conda-incubator/setup-miniconda@d2e6a045a86077fb6cad6f5adf368e9076ddaa8d  # v3.1.0
       with:
         miniforge-variant: Miniforge3
         miniforge-version: latest

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/jvm-packages/pom.xml b/jvm-packages/pom.xml
@@ -52,7 +52,7 @@
         <fasterxml.jackson.version>2.15.0</fasterxml.jackson.version>
         <scala.version>2.12.18</scala.version>
         <scala.binary.version>2.12</scala.binary.version>
-        <hadoop.version>3.4.0</hadoop.version>
+        <hadoop.version>3.4.1</hadoop.version>
         <maven.wagon.http.retryHandler.count>5</maven.wagon.http.retryHandler.count>
         <log.capi.invocation>OFF</log.capi.invocation>
         <use.cuda>OFF</use.cuda>

diff --git a/jvm-packages/xgboost4j/pom.xml b/jvm-packages/xgboost4j/pom.xml
@@ -82,7 +82,7 @@
           <plugin>
               <artifactId>exec-maven-plugin</artifactId>
               <groupId>org.codehaus.mojo</groupId>
-              <version>3.4.1</version>
+              <version>3.5.0</version>
               <executions>
                   <execution>
                       <id>native</id>

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);