Merge pull request #167 from hcho3/xgb_210

Upgrade to XGBoost 2.1.0
conda-forge · Jul 26, 2024 · be9dd6a · be9dd6a
2 parents 8ff4972 + 0349fc6
commit be9dd6a
Show file tree

Hide file tree

Showing 22 changed files with 276 additions and 194 deletions.
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/...c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/...c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml
@@ -32,11 +32,7 @@ pin_run_as_build:
     min_pin: x.x
     max_pin: x.x
 python:
-- 3.10.* *_cpython
-- 3.11.* *_cpython
 - 3.12.* *_cpython
-- 3.8.* *_cpython
-- 3.9.* *_cpython
 r_base:
 - '4.3'
 target_platform:

diff --git a/...c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/...c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml
@@ -32,11 +32,7 @@ pin_run_as_build:
     min_pin: x.x
     max_pin: x.x
 python:
-- 3.10.* *_cpython
-- 3.11.* *_cpython
 - 3.12.* *_cpython
-- 3.8.* *_cpython
-- 3.9.* *_cpython
 r_base:
 - '4.3'
 target_platform:

diff --git a/...piler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/...piler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml
@@ -32,11 +32,7 @@ pin_run_as_build:
     min_pin: x.x
     max_pin: x.x
 python:
-- 3.10.* *_cpython
-- 3.11.* *_cpython
 - 3.12.* *_cpython
-- 3.8.* *_cpython
-- 3.9.* *_cpython
 r_base:
 - '4.3'
 target_platform:

diff --git a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml
@@ -16,12 +16,6 @@ m2w64_c_compiler:
 - m2w64-toolchain
 m2w64_cxx_compiler:
 - m2w64-toolchain
-pin_run_as_build:
-  r-base:
-    min_pin: x.x
-    max_pin: x.x
-r_base:
-- '4.1'
 target_platform:
 - win-64
 zip_keys:

diff --git a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml
@@ -16,12 +16,6 @@ m2w64_c_compiler:
 - m2w64-toolchain
 m2w64_cxx_compiler:
 - m2w64-toolchain
-pin_run_as_build:
-  r-base:
-    min_pin: x.x
-    max_pin: x.x
-r_base:
-- '4.1'
 target_platform:
 - win-64
 zip_keys:

diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/README.md b/README.md
diff --git a/conda-forge.yml b/conda-forge.yml
@@ -18,4 +18,4 @@ os_version:
 provider:
   linux_aarch64: default
   linux_ppc64le: default
-test: native_and_emulated
+test: native
diff --git a/recipe/0002-Enable-latest-libcxx-on-MacOS.patch b/recipe/0002-Enable-latest-libcxx-on-MacOS.patch
diff --git a/recipe/0004-Undo-dmlc-xgboost-9436.patch b/recipe/0004-Undo-dmlc-xgboost-9436.patch
diff --git a/recipe/bld.bat b/recipe/bld.bat
@@ -1,20 +1,22 @@
-mkdir "%SRC_DIR%"\build
-pushd "%SRC_DIR%"\build
+@echo on
 
-if NOT "%cuda_compiler_version%"=="None" (
+mkdir %SRC_DIR%\build
+pushd %SRC_DIR%\build
+
+if not "%cuda_compiler_version%" == "None" (
     set "CMAKE_ARGS=-DUSE_CUDA=ON %CMAKE_ARGS%"
 )
 
 cmake -G "Ninja" ^
     %CMAKE_ARGS% ^
     -DCMAKE_BUILD_TYPE:STRING="Release" ^
-    -DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%" ^
+    -DCMAKE_INSTALL_PREFIX:PATH="%LIBRARY_PREFIX%" ^
     -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=ON ^
-    -DR_LIB=OFF ^
+    -DR_LIB:BOOL=OFF ^
     "%SRC_DIR%"
 if errorlevel 1 exit 1
 
-cmake --build . --target install --config Release
+cmake --build . --target install --config Release -- -v
 if errorlevel 1 exit 1
 
 popd
diff --git a/recipe/install-libxgboost.sh b/recipe/install-libxgboost.sh
@@ -27,8 +27,6 @@ else
 fi
 
 mkdir -p ${LIBDIR} ${INCDIR}/xgboost ${BINDIR} || true
-cp ${SRC_DIR}/xgboost${EXEEXT} ${BINDIR}/
 cp ${SRC_DIR}/lib/${XGBOOSTDSO} ${SODIR}/
 cp -Rf ${SRC_DIR}/include/xgboost ${INCDIR}/
-cp -Rf ${SRC_DIR}/rabit/include/rabit ${INCDIR}/xgboost/
 cp -f ${SRC_DIR}/src/c_api/*.h ${INCDIR}/xgboost/
diff --git a/recipe/install-py-xgboost.sh b/recipe/install-py-xgboost.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
 pushd ${SRC_DIR}/python-package
-  ${PYTHON} -m  pip install . -vv --config-settings use_system_libxgboost=True
+  ${PYTHON} -m pip install . -vv --config-settings use_system_libxgboost=True
 popd