Skip to content

Commit fc32798

Browse files
hcho3trivialfisrazdoburdin
authored
[CI] Various CI fixes (dmlc#11196)
* Fix dmlc#10752 (dmlc#10972) * Fix dmlc#10752 * [CI] Replace Mambaforge -> Miniforge3 * Fix formatting * Increase timeout for Multi-GPU approx tests. (dmlc#11111) * Fix tests with the latest scikit-learn. (dmlc#11086) * Fix tests with the latest scikit-learn. * dask. * Remove scikit-learn pin --------- Co-authored-by: Philip Hyunsu Cho <[email protected]> * Revert base class change * SYCL. Fix CI failures (dmlc#10987) * [CI] Use Python 3.10 + latest sklearn in Windows * Increase timeout in C++ tests from 1 to 5 seconds. (dmlc#10756) To avoid CI failures on FreeBSD. * [CI] Pin sklearn to 1.5.2 * [CI] Apply part of dmlc#10434 --------- Co-authored-by: Jiaming Yuan <[email protected]> Co-authored-by: Dmitry Razdoburdin <[email protected]>
1 parent a406528 commit fc32798

26 files changed

+51
-48
lines changed

.github/workflows/jvm_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
3232
with:
33-
miniforge-variant: Mambaforge
33+
miniforge-variant: Miniforge3
3434
miniforge-version: latest
3535
activate-environment: jvm_tests
3636
environment-file: tests/ci_build/conda_env/jvm_tests.yml

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
submodules: 'true'
8282
- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
8383
with:
84-
miniforge-variant: Mambaforge
84+
miniforge-variant: Miniforge3
8585
miniforge-version: latest
8686
activate-environment: linux_sycl_test
8787
environment-file: tests/ci_build/conda_env/linux_sycl_test.yml
@@ -123,7 +123,7 @@ jobs:
123123
submodules: 'true'
124124
- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
125125
with:
126-
miniforge-variant: Mambaforge
126+
miniforge-variant: Miniforge3
127127
miniforge-version: latest
128128
activate-environment: cpp_test
129129
environment-file: tests/ci_build/conda_env/cpp_test.yml

.github/workflows/python_tests.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
submodules: 'true'
2727
- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
2828
with:
29-
miniforge-variant: Mambaforge
29+
miniforge-variant: Miniforge3
3030
miniforge-version: latest
3131
activate-environment: python_lint
3232
environment-file: tests/ci_build/conda_env/python_lint.yml
@@ -58,7 +58,7 @@ jobs:
5858
submodules: 'true'
5959
- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
6060
with:
61-
miniforge-variant: Mambaforge
61+
miniforge-variant: Miniforge3
6262
miniforge-version: latest
6363
activate-environment: sdist_test
6464
environment-file: tests/ci_build/conda_env/sdist_test.yml
@@ -130,7 +130,7 @@ jobs:
130130

131131
- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
132132
with:
133-
miniforge-variant: Mambaforge
133+
miniforge-variant: Miniforge3
134134
miniforge-version: latest
135135
activate-environment: macos_cpu_test
136136
environment-file: tests/ci_build/conda_env/macos_cpu_test.yml
@@ -227,7 +227,7 @@ jobs:
227227

228228
- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
229229
with:
230-
miniforge-variant: Mambaforge
230+
miniforge-variant: Miniforge3
231231
miniforge-version: latest
232232
activate-environment: linux_cpu_test
233233
environment-file: tests/ci_build/conda_env/linux_cpu_test.yml
@@ -280,7 +280,7 @@ jobs:
280280

281281
- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
282282
with:
283-
miniforge-variant: Mambaforge
283+
miniforge-variant: Miniforge3
284284
miniforge-version: latest
285285
activate-environment: linux_sycl_test
286286
environment-file: tests/ci_build/conda_env/linux_sycl_test.yml

.github/workflows/python_wheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
run: brew install libomp
3535
- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
3636
with:
37-
miniforge-variant: Mambaforge
37+
miniforge-variant: Miniforge3
3838
miniforge-version: latest
3939
python-version: 3.9
4040
use-mamba: true

plugin/sycl/common/hist_util.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "../data/gradient_index.h"
1010
#include "hist_util.h"
1111

12-
#include <CL/sycl.hpp>
12+
#include <sycl/sycl.hpp>
1313

1414
namespace xgboost {
1515
namespace sycl {

plugin/sycl/common/hist_util.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "../../src/common/hist_util.h"
1616
#include "../data/gradient_index.h"
1717

18-
#include <CL/sycl.hpp>
18+
#include <sycl/sycl.hpp>
1919

2020
namespace xgboost {
2121
namespace sycl {

plugin/sycl/common/partition_builder.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "../data/gradient_index.h"
2626
#include "../tree/expand_entry.h"
2727

28-
#include <CL/sycl.hpp>
28+
#include <sycl/sycl.hpp>
2929

3030
namespace xgboost {
3131
namespace sycl {

plugin/sycl/common/row_set.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
#include "../data.h"
1717

18-
#include <CL/sycl.hpp>
18+
#include <sycl/sycl.hpp>
1919

2020
namespace xgboost {
2121
namespace sycl {

plugin/sycl/data.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#include "../../src/common/threading_utils.h"
2424

25-
#include "CL/sycl.hpp"
25+
#include <sycl/sycl.hpp>
2626

2727
namespace xgboost {
2828
namespace sycl {

plugin/sycl/data/gradient_index.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include "gradient_index.h"
1010

11-
#include <CL/sycl.hpp>
11+
#include <sycl/sycl.hpp>
1212

1313
namespace xgboost {
1414
namespace sycl {

0 commit comments

Comments
 (0)