From a9505620711220dda21298d9de829b1318dcd6ef Mon Sep 17 00:00:00 2001 From: Jiaming Yuan Date: Mon, 6 Jan 2025 15:27:29 +0800 Subject: [PATCH 1/3] Enfore cmake configure file newline style (#11129) --- CMakeLists.txt | 3 ++- cmake/Version.cmake | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0abe69821d14..761aef49d4dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -497,7 +497,8 @@ if(GOOGLE_TEST) configure_file( ${xgboost_SOURCE_DIR}/tests/cli/machine.conf.in ${xgboost_BINARY_DIR}/tests/cli/machine.conf - @ONLY) + @ONLY + NEWLINE_STYLE UNIX) if(BUILD_DEPRECATED_CLI) add_test( NAME TestXGBoostCLI diff --git a/cmake/Version.cmake b/cmake/Version.cmake index 4af6b27d6720..1a7fae3d7645 100644 --- a/cmake/Version.cmake +++ b/cmake/Version.cmake @@ -2,5 +2,7 @@ function(write_version) message(STATUS "xgboost VERSION: ${xgboost_VERSION}") configure_file( ${xgboost_SOURCE_DIR}/cmake/version_config.h.in - ${xgboost_SOURCE_DIR}/include/xgboost/version_config.h @ONLY) + ${xgboost_SOURCE_DIR}/include/xgboost/version_config.h + @ONLY + NEWLINE_STYLE UNIX) endfunction() From 721c3890294629d8e4611e54e98e2166872b3828 Mon Sep 17 00:00:00 2001 From: Michal Golan Date: Mon, 6 Jan 2025 18:16:00 +0200 Subject: [PATCH 2/3] [doc] Update model.rst (#11137) --- doc/tutorials/model.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tutorials/model.rst b/doc/tutorials/model.rst index 97171fc3c437..d4e04262d214 100644 --- a/doc/tutorials/model.rst +++ b/doc/tutorials/model.rst @@ -146,7 +146,7 @@ It remains to ask: which tree do we want at each step? A natural thing is to ad .. math:: - \text{obj}^{(t)} & = \sum_{i=1}^n l(y_i, \hat{y}_i^{(t)}) + \sum_{i=1}^t\omega(f_i) \\ + \text{obj}^{(t)} & = \sum_{i=1}^n l(y_i, \hat{y}_i^{(t)}) + \sum_{k=1}^t\omega(f_k) \\ & = \sum_{i=1}^n l(y_i, \hat{y}_i^{(t-1)} + f_t(x_i)) + \omega(f_t) + \mathrm{constant} If we consider using mean squared error (MSE) as our loss function, the objective becomes From 2183e4950bdc5fe492e9ae34f1342f39c4fa52fd Mon Sep 17 00:00:00 2001 From: Jiaming Yuan Date: Tue, 7 Jan 2025 01:16:44 +0800 Subject: [PATCH 3/3] [CI] Fix R error. (#11142) --- .github/workflows/r_tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/r_tests.yml b/.github/workflows/r_tests.yml index b3d5ad5b1f03..43ad372a1e84 100644 --- a/.github/workflows/r_tests.yml +++ b/.github/workflows/r_tests.yml @@ -46,8 +46,8 @@ jobs: uses: actions/cache@v4 with: path: ${{ env.R_LIBS_USER }} - key: ${{ runner.os }}-r-${{ matrix.r }}-7-${{ hashFiles('R-package/DESCRIPTION') }} - restore-keys: ${{ runner.os }}-r-${{ matrix.r }}-7-${{ hashFiles('R-package/DESCRIPTION') }} + key: ${{ runner.os }}-r-${{ matrix.r }}-8-${{ hashFiles('R-package/DESCRIPTION') }} + restore-keys: ${{ runner.os }}-r-${{ matrix.r }}-8-${{ hashFiles('R-package/DESCRIPTION') }} - uses: actions/setup-python@v5 with: python-version: "3.10"