From 41956de9fd3038b968b8a02307707ab5c4952fd0 Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Fri, 28 Jun 2024 17:40:59 -0700 Subject: [PATCH 001/121] Upgrade to XGBoost 2.1.0 --- .../0002-Enable-latest-libcxx-on-MacOS.patch | 27 ++++++------ recipe/0004-Undo-dmlc-xgboost-9436.patch | 44 +++++++------------ recipe/meta.yaml | 4 +- 3 files changed, 33 insertions(+), 42 deletions(-) diff --git a/recipe/0002-Enable-latest-libcxx-on-MacOS.patch b/recipe/0002-Enable-latest-libcxx-on-MacOS.patch index 0951d0ec..5321e35a 100644 --- a/recipe/0002-Enable-latest-libcxx-on-MacOS.patch +++ b/recipe/0002-Enable-latest-libcxx-on-MacOS.patch @@ -1,25 +1,26 @@ -From 59ac1090da5ba692238f4baf87d46a4c81b9282c Mon Sep 17 00:00:00 2001 -From: Hyunsu Cho -Date: Wed, 1 Nov 2023 01:01:34 -0700 +From 7bb7bd609859057f80576fc156f4b3e19218a671 Mon Sep 17 00:00:00 2001 +From: Hyunsu Cho +Date: Fri, 28 Jun 2024 17:40:28 -0700 Subject: [PATCH] Enable latest libcxx on MacOS --- - R-package/src/Makevars.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + R-package/src/Makevars.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/R-package/src/Makevars.in b/R-package/src/Makevars.in -index 9e7cbfed..8b3af0ae 100644 +index 93cfb8e5b..e24cfed93 100644 --- a/R-package/src/Makevars.in +++ b/R-package/src/Makevars.in -@@ -7,7 +7,7 @@ CXX_STD = CXX17 - - XGB_RFLAGS = -DXGBOOST_STRICT_R_MODE=1 -DDMLC_LOG_BEFORE_THROW=0\ - -DDMLC_ENABLE_STD_THREAD=$(ENABLE_STD_THREAD) -DDMLC_DISABLE_STDIN=1\ -- -DDMLC_LOG_CUSTOMIZE=1 -+ -DDMLC_LOG_CUSTOMIZE=1 -D_LIBCPP_DISABLE_AVAILABILITY +@@ -10,7 +10,8 @@ XGB_RFLAGS = \ + -DDMLC_LOG_BEFORE_THROW=0 \ + -DDMLC_ENABLE_STD_THREAD=$(ENABLE_STD_THREAD) \ + -DDMLC_DISABLE_STDIN=1 \ +- -DDMLC_LOG_CUSTOMIZE=1 ++ -DDMLC_LOG_CUSTOMIZE=1 \ ++ -D_LIBCPP_DISABLE_AVAILABILITY # disable the use of thread_local for 32 bit windows: ifeq ($(R_OSTYPE)$(WIN),windows) -- -2.25.1 +2.34.1 diff --git a/recipe/0004-Undo-dmlc-xgboost-9436.patch b/recipe/0004-Undo-dmlc-xgboost-9436.patch index 2cbfbb3c..ef25bb7b 100644 --- a/recipe/0004-Undo-dmlc-xgboost-9436.patch +++ b/recipe/0004-Undo-dmlc-xgboost-9436.patch @@ -1,20 +1,20 @@ -From 667a855dfa024ea392e60fa7f352a0781cb7f1e0 Mon Sep 17 00:00:00 2001 -From: Hyunsu Cho -Date: Thu, 2 Nov 2023 08:12:43 -0700 -Subject: [PATCH] Undo dmlc/xgboost#9436 +From 3660a4216763d02d48cb1db63f5fee7ad02ad7d4 Mon Sep 17 00:00:00 2001 +From: Hyunsu Cho +Date: Fri, 28 Jun 2024 17:38:34 -0700 +Subject: [PATCH] [PATCH] Undo dmlc/xgboost#9436 --- CMakeLists.txt | 9 --------- - cmake/Utils.cmake | 4 +--- - 2 files changed, 1 insertion(+), 12 deletions(-) + cmake/Utils.cmake | 1 - + 2 files changed, 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index d6b861ab..ca0125cb 100644 +index c4ca82937..dc0f7e654 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -253,15 +253,6 @@ add_subdirectory(${xgboost_SOURCE_DIR}/plugin) +@@ -301,15 +301,6 @@ add_subdirectory(${xgboost_SOURCE_DIR}/plugin) - if (PLUGIN_RMM) + if(PLUGIN_RMM) find_package(rmm REQUIRED) - - # Patch the rmm targets so they reference the static cudart @@ -25,31 +25,21 @@ index d6b861ab..ca0125cb 100644 - list(APPEND rmm_link_libs CUDA::cudart_static) - set_target_properties(rmm::rmm PROPERTIES INTERFACE_LINK_LIBRARIES "${rmm_link_libs}") - get_target_property(rmm_link_libs rmm::rmm INTERFACE_LINK_LIBRARIES) - endif (PLUGIN_RMM) + endif() - #-- library + if(PLUGIN_SYCL) diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake -index 08050205..98e96e30 100644 +index d555f5edf..8659df7c3 100644 --- a/cmake/Utils.cmake +++ b/cmake/Utils.cmake -@@ -177,8 +177,7 @@ function(xgboost_set_cuda_flags target) - set_target_properties(${target} PROPERTIES - CUDA_STANDARD 17 - CUDA_STANDARD_REQUIRED ON -- CUDA_SEPARABLE_COMPILATION OFF -- CUDA_RUNTIME_LIBRARY Static) -+ CUDA_SEPARABLE_COMPILATION OFF) - endfunction(xgboost_set_cuda_flags) +@@ -240,7 +240,6 @@ macro(xgboost_target_link_libraries target) - macro(xgboost_link_nccl target) -@@ -280,7 +279,6 @@ macro(xgboost_target_link_libraries target) - - if (USE_CUDA) + if(USE_CUDA) xgboost_set_cuda_flags(${target}) - target_link_libraries(${target} PUBLIC CUDA::cudart_static) - endif (USE_CUDA) + endif() - if (PLUGIN_RMM) + if(PLUGIN_RMM) -- -2.25.1 +2.34.1 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6e324b58..4afb117e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set name = "xgboost" %} -{% set version = "2.0.3" %} -{% set build_number = 4 %} +{% set version = "2.1.0" %} +{% set build_number = 1 %} {% set string_prefix = "cuda" ~ (cuda_compiler_version | replace('.', '')) %} # [cuda_compiler_version != "None"] {% set string_prefix = "cpu" %} # [cuda_compiler_version == "None"] From f01972ff0b47c84903b376791dca0bde1d9b429c Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Sat, 29 Jun 2024 00:46:40 +0000 Subject: [PATCH 002/121] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.06.28.19.57.36 --- .scripts/build_steps.sh | 7 +++++++ .scripts/run_osx_build.sh | 7 +++++++ .scripts/run_win_build.bat | 5 +++++ 3 files changed, 19 insertions(+) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 899ba03c..a5836e8d 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -72,6 +72,13 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 07dff219..ba0c8791 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -85,6 +85,13 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" + + ( startgroup "Inspecting artifacts" ) 2> /dev/null + + # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 6d546976..65650bf2 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -58,6 +58,11 @@ echo Building recipe conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! +call :start_group "Inspecting artifacts" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +call :end_group + :: Prepare some environment variables for the upload step if /i "%CI%" == "github_actions" ( set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" From 8cd97b9f761124eb87a697c02794a590f5b09c47 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 28 Jun 2024 23:04:01 -0700 Subject: [PATCH 003/121] Drop `rabit` install This directory doesn't exist in XGBoost 2.1.0. --- recipe/install-libxgboost.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/install-libxgboost.sh b/recipe/install-libxgboost.sh index ad403195..af5cf3ea 100644 --- a/recipe/install-libxgboost.sh +++ b/recipe/install-libxgboost.sh @@ -30,5 +30,4 @@ 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/ From eee9c0eebb67e849a9176a1b25c0f69d4dab4669 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 28 Jun 2024 23:57:50 -0700 Subject: [PATCH 004/121] List source directory contents before copying --- recipe/install-libxgboost.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/install-libxgboost.sh b/recipe/install-libxgboost.sh index af5cf3ea..ef711049 100644 --- a/recipe/install-libxgboost.sh +++ b/recipe/install-libxgboost.sh @@ -26,6 +26,7 @@ else EXEEXT= fi +ls ${SRC_DIR} mkdir -p ${LIBDIR} ${INCDIR}/xgboost ${BINDIR} || true cp ${SRC_DIR}/xgboost${EXEEXT} ${BINDIR}/ cp ${SRC_DIR}/lib/${XGBOOSTDSO} ${SODIR}/ From 7a47d9b5d3b7f1e5b9330e702fb1dce697c6ba23 Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Sat, 29 Jun 2024 00:52:19 -0700 Subject: [PATCH 005/121] Remove CLI --- recipe/install-libxgboost.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/install-libxgboost.sh b/recipe/install-libxgboost.sh index ef711049..55b0381a 100644 --- a/recipe/install-libxgboost.sh +++ b/recipe/install-libxgboost.sh @@ -26,9 +26,7 @@ else EXEEXT= fi -ls ${SRC_DIR} 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 -f ${SRC_DIR}/src/c_api/*.h ${INCDIR}/xgboost/ From aa2382de1994422a1d23c2f9334f977078855a8a Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Sat, 29 Jun 2024 00:57:10 -0700 Subject: [PATCH 006/121] Fix buildno Co-authored-by: jakirkham --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4afb117e..2e2d0e71 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set name = "xgboost" %} {% set version = "2.1.0" %} -{% set build_number = 1 %} +{% set build_number = 0 %} {% set string_prefix = "cuda" ~ (cuda_compiler_version | replace('.', '')) %} # [cuda_compiler_version != "None"] {% set string_prefix = "cpu" %} # [cuda_compiler_version == "None"] From 0cb092821af53e830fe2e531908986c7d199ac14 Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Sat, 29 Jun 2024 16:53:41 -0700 Subject: [PATCH 007/121] Require R 4.3+ --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2e2d0e71..7207ea5b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -176,7 +176,7 @@ outputs: - cmake - ninja - cross-r-base {{ r_base }} # [build_platform != target_platform] - - r-base # [build_platform != target_platform] + - r-base >=4.3 # [build_platform != target_platform] - r-matrix # [build_platform != target_platform] - r-data.table # [build_platform != target_platform] - r-magrittr # [build_platform != target_platform] @@ -184,7 +184,7 @@ outputs: - r-knitr # [build_platform != target_platform] host: - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} - - r-base + - r-base >=4.3 - r-matrix - r-data.table - r-magrittr @@ -193,7 +193,7 @@ outputs: run: - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} - {{ pin_subpackage('_r-xgboost-mutex', exact=True) }} - - r-base + - r-base >=4.3 - r-matrix - r-data.table - r-magrittr From ffa745d65f9717f4ccea3329c43a0c995418cab8 Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Sat, 29 Jun 2024 17:16:56 -0700 Subject: [PATCH 008/121] Require cross-r-base 4.3 --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7207ea5b..dd62a317 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -175,7 +175,7 @@ outputs: - posix # [win] - cmake - ninja - - cross-r-base {{ r_base }} # [build_platform != target_platform] + - cross-r-base {{ r_base }} >= 4.3 # [build_platform != target_platform] - r-base >=4.3 # [build_platform != target_platform] - r-matrix # [build_platform != target_platform] - r-data.table # [build_platform != target_platform] From c875ff182cd57307adcbcd91c8e567f6af017e82 Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Sat, 29 Jun 2024 17:35:42 -0700 Subject: [PATCH 009/121] Consistently require R 4.3 --- recipe/meta.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index dd62a317..b6123bf5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -175,7 +175,7 @@ outputs: - posix # [win] - cmake - ninja - - cross-r-base {{ r_base }} >= 4.3 # [build_platform != target_platform] + - cross-r-base {{ r_base }} # [build_platform != target_platform] - r-base >=4.3 # [build_platform != target_platform] - r-matrix # [build_platform != target_platform] - r-data.table # [build_platform != target_platform] @@ -210,9 +210,9 @@ outputs: skip: true # [cuda_compiler != "None"] requirements: host: - - r-base + - r-base >=4.3 run: - - r-base + - r-base >=4.3 - {{ pin_subpackage('r-xgboost', exact=True) }} - name: r-xgboost-gpu @@ -220,9 +220,9 @@ outputs: skip: true # [cuda_compiler == "None"] requirements: host: - - r-base + - r-base >=4.3 run: - - r-base + - r-base >=4.3 - {{ pin_subpackage('r-xgboost', exact=True) }} - __cuda # [cuda_compiler != "None"] From 800bdbdac85dd5b5636ea0140bc3ce32b37477ec Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Sat, 29 Jun 2024 17:59:05 -0700 Subject: [PATCH 010/121] MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.36.2, and conda-forge-pinning 2024.06.29.20.13.13 --- ...compiler_version11.8cxx_compiler_version11.yaml | 1 - ...compiler_versionNonecxx_compiler_version12.yaml | 1 - ...compiler_version12.0cxx_compiler_version12.yaml | 1 - ...compiler_version11.8cxx_compiler_version11.yaml | 1 - ...compiler_versionNonecxx_compiler_version12.yaml | 1 - ...compiler_version12.0cxx_compiler_version12.yaml | 1 - ...compiler_version11.8cxx_compiler_version11.yaml | 1 - ...compiler_versionNonecxx_compiler_version12.yaml | 1 - ...compiler_version12.0cxx_compiler_version12.yaml | 1 - .ci_support/osx_64_.yaml | 1 - .ci_support/osx_arm64_.yaml | 1 - ...cuda_compilerNonecuda_compiler_versionNone.yaml | 2 +- ...compilercuda-nvcccuda_compiler_version12.0.yaml | 2 +- ...cuda_compilernvcccuda_compiler_version11.8.yaml | 2 +- recipe/conda_build_config.yaml | 2 ++ recipe/meta.yaml | 14 +++++++------- 16 files changed, 12 insertions(+), 21 deletions(-) create mode 100644 recipe/conda_build_config.yaml diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml index 2fde2d0c..e3ccb914 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml @@ -38,7 +38,6 @@ python: - 3.8.* *_cpython - 3.9.* *_cpython r_base: -- '4.2' - '4.3' target_platform: - linux-64 diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml index d6f0a4db..91102458 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml @@ -38,7 +38,6 @@ python: - 3.8.* *_cpython - 3.9.* *_cpython r_base: -- '4.2' - '4.3' target_platform: - linux-64 diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml index 62927796..ca128ee9 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml @@ -38,7 +38,6 @@ python: - 3.8.* *_cpython - 3.9.* *_cpython r_base: -- '4.2' - '4.3' target_platform: - linux-64 diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml index 8c33f9c6..0b20ed6a 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml @@ -33,7 +33,6 @@ pin_run_as_build: min_pin: x.x max_pin: x.x r_base: -- '4.2' - '4.3' target_platform: - linux-aarch64 diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml index 818bd8ac..eecb67d1 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml @@ -33,7 +33,6 @@ pin_run_as_build: min_pin: x.x max_pin: x.x r_base: -- '4.2' - '4.3' target_platform: - linux-aarch64 diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml index c1cb2a4c..b0a65eef 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml @@ -33,7 +33,6 @@ pin_run_as_build: min_pin: x.x max_pin: x.x r_base: -- '4.2' - '4.3' target_platform: - linux-aarch64 diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml index d1c00529..7847bd4f 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml @@ -29,7 +29,6 @@ pin_run_as_build: min_pin: x.x max_pin: x.x r_base: -- '4.2' - '4.3' target_platform: - linux-ppc64le diff --git a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml index 700f1034..a87dd650 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml @@ -29,7 +29,6 @@ pin_run_as_build: min_pin: x.x max_pin: x.x r_base: -- '4.2' - '4.3' target_platform: - linux-ppc64le diff --git a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml index be8ea418..88a6fb8c 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml @@ -29,7 +29,6 @@ pin_run_as_build: min_pin: x.x max_pin: x.x r_base: -- '4.2' - '4.3' target_platform: - linux-ppc64le diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 1e1e8944..15200256 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -31,7 +31,6 @@ pin_run_as_build: min_pin: x.x max_pin: x.x r_base: -- '4.2' - '4.3' target_platform: - osx-64 diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 066ae271..64bad6aa 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -31,7 +31,6 @@ pin_run_as_build: min_pin: x.x max_pin: x.x r_base: -- '4.2' - '4.3' target_platform: - osx-arm64 diff --git a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml index 1767a38f..75b425cf 100644 --- a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml @@ -21,7 +21,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x r_base: -- '4.1' +- '4.3' 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 index 590cce48..6c9c2912 100644 --- a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml +++ b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml @@ -21,7 +21,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x r_base: -- '4.1' +- '4.3' 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 index 8ea29258..a4e6fff3 100644 --- a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml +++ b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml @@ -21,7 +21,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x r_base: -- '4.1' +- '4.3' target_platform: - win-64 zip_keys: diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml new file mode 100644 index 00000000..21bfbbff --- /dev/null +++ b/recipe/conda_build_config.yaml @@ -0,0 +1,2 @@ +r_base: + - 4.3 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b6123bf5..2e2d0e71 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -176,7 +176,7 @@ outputs: - cmake - ninja - cross-r-base {{ r_base }} # [build_platform != target_platform] - - r-base >=4.3 # [build_platform != target_platform] + - r-base # [build_platform != target_platform] - r-matrix # [build_platform != target_platform] - r-data.table # [build_platform != target_platform] - r-magrittr # [build_platform != target_platform] @@ -184,7 +184,7 @@ outputs: - r-knitr # [build_platform != target_platform] host: - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} - - r-base >=4.3 + - r-base - r-matrix - r-data.table - r-magrittr @@ -193,7 +193,7 @@ outputs: run: - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} - {{ pin_subpackage('_r-xgboost-mutex', exact=True) }} - - r-base >=4.3 + - r-base - r-matrix - r-data.table - r-magrittr @@ -210,9 +210,9 @@ outputs: skip: true # [cuda_compiler != "None"] requirements: host: - - r-base >=4.3 + - r-base run: - - r-base >=4.3 + - r-base - {{ pin_subpackage('r-xgboost', exact=True) }} - name: r-xgboost-gpu @@ -220,9 +220,9 @@ outputs: skip: true # [cuda_compiler == "None"] requirements: host: - - r-base >=4.3 + - r-base run: - - r-base >=4.3 + - r-base - {{ pin_subpackage('r-xgboost', exact=True) }} - __cuda # [cuda_compiler != "None"] From f4e8edd9dcf9ae0226026f981e67c60a5d2ab17d Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Sat, 29 Jun 2024 20:39:13 -0700 Subject: [PATCH 011/121] Use evals instead of watchlist --- recipe/test-r-xgboost.r | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/test-r-xgboost.r b/recipe/test-r-xgboost.r index 96285c98..e8978898 100644 --- a/recipe/test-r-xgboost.r +++ b/recipe/test-r-xgboost.r @@ -25,6 +25,6 @@ err <- mean(as.numeric(pred > 0.5) != test$label) print(paste("test-error=", err)) dtrain <- xgb.DMatrix(data = train$data, label=train$label) dtest <- xgb.DMatrix(data = test$data, label=test$label) -watchlist <- list(train=dtrain, test=dtest) -bst <- xgb.train(data=dtrain, max_depth=2, eta=1, nthread = 2, nrounds=2, watchlist=watchlist, objective = "binary:logistic") -bst <- xgb.train(data=dtrain, max_depth=2, eta=1, nthread = 2, nrounds=2, watchlist=watchlist, eval_metric = "error", eval_metric = "logloss", objective = "binary:logistic") +evals <- list(train=dtrain, test=dtest) +bst <- xgb.train(data=dtrain, max_depth=2, eta=1, nthread = 2, nrounds=2, evals=evals, objective = "binary:logistic") +bst <- xgb.train(data=dtrain, max_depth=2, eta=1, nthread = 2, nrounds=2, evals=evals, eval_metric = "error", eval_metric = "logloss", objective = "binary:logistic") From f1337b50168d774d9b4eb147e4ca2032bfcf03a4 Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Sun, 30 Jun 2024 00:26:11 -0700 Subject: [PATCH 012/121] Re-rendered with conda-build 24.3.0, conda-smithy 3.36.2, and conda-forge-pinning 2024.06.29.20.13.13 --- .azure-pipelines/azure-pipelines-win.yml | 58 -------- ...compilerNonecuda_compiler_versionNone.yaml | 29 ---- ...lercuda-nvcccuda_compiler_version12.0.yaml | 29 ---- ...compilernvcccuda_compiler_version11.8.yaml | 29 ---- .scripts/run_win_build.bat | 130 ------------------ README.md | 21 --- azure-pipelines.yml | 3 +- recipe/conda_build_config.yaml | 2 - recipe/meta.yaml | 1 + 9 files changed, 2 insertions(+), 300 deletions(-) delete mode 100755 .azure-pipelines/azure-pipelines-win.yml delete mode 100644 .ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml delete mode 100644 .ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml delete mode 100644 .ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml delete mode 100755 .scripts/run_win_build.bat delete mode 100644 recipe/conda_build_config.yaml diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml deleted file mode 100755 index 6f521937..00000000 --- a/.azure-pipelines/azure-pipelines-win.yml +++ /dev/null @@ -1,58 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- - -jobs: -- job: win - pool: - vmImage: windows-2022 - strategy: - matrix: - win_64_cuda_compilerNonecuda_compiler_versionNone: - CONFIG: win_64_cuda_compilerNonecuda_compiler_versionNone - UPLOAD_PACKAGES: 'True' - win_64_cuda_compilercuda-nvcccuda_compiler_version12.0: - CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.0 - UPLOAD_PACKAGES: 'True' - win_64_cuda_compilernvcccuda_compiler_version11.8: - CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.8 - UPLOAD_PACKAGES: 'True' - timeoutInMinutes: 360 - variables: - CONDA_BLD_PATH: D:\\bld\\ - UPLOAD_TEMP: D:\\tmp - - steps: - - - task: PythonScript@0 - displayName: 'Download Miniforge' - inputs: - scriptSource: inline - script: | - import urllib.request - url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe' - path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" - urllib.request.urlretrieve(url, path) - - - script: | - start /wait "" %BUILD_ARTIFACTSTAGINGDIRECTORY%\Miniforge.exe /InstallationType=JustMe /RegisterPython=0 /S /D=C:\Miniforge - displayName: Install Miniforge - - - powershell: Write-Host "##vso[task.prependpath]C:\Miniforge\Scripts" - displayName: Add conda to PATH - - - script: | - call ".scripts\run_win_build.bat" - displayName: Run Windows build - env: - PYTHONUNBUFFERED: 1 - CONFIG: $(CONFIG) - CI: azure - flow_run_id: azure_$(Build.BuildNumber).$(System.JobAttempt) - remote_url: $(Build.Repository.Uri) - sha: $(Build.SourceVersion) - UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) - UPLOAD_TEMP: $(UPLOAD_TEMP) - BINSTAR_TOKEN: $(BINSTAR_TOKEN) - FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml deleted file mode 100644 index 75b425cf..00000000 --- a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml +++ /dev/null @@ -1,29 +0,0 @@ -c_compiler: -- vs2019 -c_stdlib: -- vs -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cxx_compiler: -- vs2019 -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.3' -target_platform: -- win-64 -zip_keys: -- - cuda_compiler - - cuda_compiler_version 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 deleted file mode 100644 index 6c9c2912..00000000 --- a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml +++ /dev/null @@ -1,29 +0,0 @@ -c_compiler: -- vs2019 -c_stdlib: -- vs -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- cuda-nvcc -cuda_compiler_version: -- '12.0' -cxx_compiler: -- vs2019 -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.3' -target_platform: -- win-64 -zip_keys: -- - cuda_compiler - - cuda_compiler_version diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml deleted file mode 100644 index a4e6fff3..00000000 --- a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml +++ /dev/null @@ -1,29 +0,0 @@ -c_compiler: -- vs2019 -c_stdlib: -- vs -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.8' -cxx_compiler: -- vs2019 -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.3' -target_platform: -- win-64 -zip_keys: -- - cuda_compiler - - cuda_compiler_version diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat deleted file mode 100755 index 65650bf2..00000000 --- a/.scripts/run_win_build.bat +++ /dev/null @@ -1,130 +0,0 @@ -:: PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here -:: will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent -:: changes to this script, consider a proposal to conda-smithy so that other feedstocks can also -:: benefit from the improvement. - -:: Note: we assume a Miniforge installation is available - -:: INPUTS (required environment variables) -:: CONFIG: name of the .ci_support/*.yaml file for this job -:: CI: azure, github_actions, or unset -:: UPLOAD_PACKAGES: true or false -:: UPLOAD_ON_BRANCH: true or false - -setlocal enableextensions enabledelayedexpansion - -call :start_group "Configuring conda" - -:: Activate the base conda environment -call activate base -:: Configure the solver -set "CONDA_SOLVER=libmamba" -if !errorlevel! neq 0 exit /b !errorlevel! -set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" - -:: Provision the necessary dependencies to build the recipe later -echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes -if !errorlevel! neq 0 exit /b !errorlevel! - -:: Set basic configuration -echo Setting up configuration -setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml -if !errorlevel! neq 0 exit /b !errorlevel! -echo Running build setup -CALL run_conda_forge_build_setup - - -if !errorlevel! neq 0 exit /b !errorlevel! - -if EXIST LICENSE.txt ( - echo Copying feedstock license - copy LICENSE.txt "recipe\\recipe-scripts-license.txt" -) -if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( - if [%CROSSCOMPILING_EMULATOR%] == [] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" - ) -) - -if NOT [%flow_run_id%] == [] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" -) - -call :end_group - -:: Build the recipe -echo Building recipe -conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% -if !errorlevel! neq 0 exit /b !errorlevel! - -call :start_group "Inspecting artifacts" -:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 -WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" -call :end_group - -:: Prepare some environment variables for the upload step -if /i "%CI%" == "github_actions" ( - set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" - set "GIT_BRANCH=%GITHUB_REF:refs/heads/=%" - if /i "%GITHUB_EVENT_NAME%" == "pull_request" ( - set "IS_PR_BUILD=True" - ) else ( - set "IS_PR_BUILD=False" - ) - set "TEMP=%RUNNER_TEMP%" -) -if /i "%CI%" == "azure" ( - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" - if /i "%BUILD_REASON%" == "PullRequest" ( - set "IS_PR_BUILD=True" - ) else ( - set "IS_PR_BUILD=False" - ) - set "TEMP=%UPLOAD_TEMP%" -) - -:: Validate -call :start_group "Validating outputs" -validate_recipe_outputs "%FEEDSTOCK_NAME%" -if !errorlevel! neq 0 exit /b !errorlevel! -call :end_group - -if /i "%UPLOAD_PACKAGES%" == "true" ( - if /i "%IS_PR_BUILD%" == "false" ( - call :start_group "Uploading packages" - if not exist "%TEMP%\" md "%TEMP%" - set "TMP=%TEMP%" - upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml - if !errorlevel! neq 0 exit /b !errorlevel! - call :end_group - ) -) - -exit - -:: Logging subroutines - -:start_group -if /i "%CI%" == "github_actions" ( - echo ::group::%~1 - exit /b -) -if /i "%CI%" == "azure" ( - echo ##[group]%~1 - exit /b -) -echo %~1 -exit /b - -:end_group -if /i "%CI%" == "github_actions" ( - echo ::endgroup:: - exit /b -) -if /i "%CI%" == "azure" ( - echo ##[endgroup] - exit /b -) -exit /b \ No newline at end of file diff --git a/README.md b/README.md index dbbb8ddc..c2069196 100644 --- a/README.md +++ b/README.md @@ -117,27 +117,6 @@ Current build status variant - - win_64_cuda_compilerNonecuda_compiler_versionNone - - - variant - - - - win_64_cuda_compilercuda-nvcccuda_compiler_version12.0 - - - variant - - - - win_64_cuda_compilernvcccuda_compiler_version11.8 - - - variant - - diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e5306da9..33a441c1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,5 +4,4 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml deleted file mode 100644 index 21bfbbff..00000000 --- a/recipe/conda_build_config.yaml +++ /dev/null @@ -1,2 +0,0 @@ -r_base: - - 4.3 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2e2d0e71..b4f1d6ff 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -24,6 +24,7 @@ source: build: number: {{ build_number }} skip: True # [cuda_compiler_version == "11.2"] + skip: True # [r_base != "4.3"] requirements: build: From 6ed6754e024cfb2b3ab08bbd68d3c8a065ebdb5b Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Sun, 30 Jun 2024 00:35:48 -0700 Subject: [PATCH 013/121] MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.36.2, and conda-forge-pinning 2024.06.29.20.13.13 --- README.md | 10 +-- recipe/meta.yaml | 155 ++++++++++++++++++++++++----------------------- 2 files changed, 82 insertions(+), 83 deletions(-) diff --git a/README.md b/README.md index c2069196..7f21629b 100644 --- a/README.md +++ b/README.md @@ -131,14 +131,10 @@ Current release info | Name | Downloads | Version | Platforms | | --- | --- | --- | --- | | [![Conda Recipe](https://img.shields.io/badge/recipe-_py--xgboost--mutex-green.svg)](https://anaconda.org/conda-forge/_py-xgboost-mutex) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/_py-xgboost-mutex.svg)](https://anaconda.org/conda-forge/_py-xgboost-mutex) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/_py-xgboost-mutex.svg)](https://anaconda.org/conda-forge/_py-xgboost-mutex) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/_py-xgboost-mutex.svg)](https://anaconda.org/conda-forge/_py-xgboost-mutex) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-_r--xgboost--mutex-green.svg)](https://anaconda.org/conda-forge/_r-xgboost-mutex) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/_r-xgboost-mutex.svg)](https://anaconda.org/conda-forge/_r-xgboost-mutex) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/_r-xgboost-mutex.svg)](https://anaconda.org/conda-forge/_r-xgboost-mutex) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/_r-xgboost-mutex.svg)](https://anaconda.org/conda-forge/_r-xgboost-mutex) | | [![Conda Recipe](https://img.shields.io/badge/recipe-libxgboost-green.svg)](https://anaconda.org/conda-forge/libxgboost) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libxgboost.svg)](https://anaconda.org/conda-forge/libxgboost) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libxgboost.svg)](https://anaconda.org/conda-forge/libxgboost) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libxgboost.svg)](https://anaconda.org/conda-forge/libxgboost) | | [![Conda Recipe](https://img.shields.io/badge/recipe-py--xgboost-green.svg)](https://anaconda.org/conda-forge/py-xgboost) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/py-xgboost.svg)](https://anaconda.org/conda-forge/py-xgboost) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/py-xgboost.svg)](https://anaconda.org/conda-forge/py-xgboost) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/py-xgboost.svg)](https://anaconda.org/conda-forge/py-xgboost) | | [![Conda Recipe](https://img.shields.io/badge/recipe-py--xgboost--cpu-green.svg)](https://anaconda.org/conda-forge/py-xgboost-cpu) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/py-xgboost-cpu.svg)](https://anaconda.org/conda-forge/py-xgboost-cpu) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/py-xgboost-cpu.svg)](https://anaconda.org/conda-forge/py-xgboost-cpu) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/py-xgboost-cpu.svg)](https://anaconda.org/conda-forge/py-xgboost-cpu) | | [![Conda Recipe](https://img.shields.io/badge/recipe-py--xgboost--gpu-green.svg)](https://anaconda.org/conda-forge/py-xgboost-gpu) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/py-xgboost-gpu.svg)](https://anaconda.org/conda-forge/py-xgboost-gpu) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/py-xgboost-gpu.svg)](https://anaconda.org/conda-forge/py-xgboost-gpu) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/py-xgboost-gpu.svg)](https://anaconda.org/conda-forge/py-xgboost-gpu) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-r--xgboost-green.svg)](https://anaconda.org/conda-forge/r-xgboost) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/r-xgboost.svg)](https://anaconda.org/conda-forge/r-xgboost) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/r-xgboost.svg)](https://anaconda.org/conda-forge/r-xgboost) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/r-xgboost.svg)](https://anaconda.org/conda-forge/r-xgboost) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-r--xgboost--cpu-green.svg)](https://anaconda.org/conda-forge/r-xgboost-cpu) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/r-xgboost-cpu.svg)](https://anaconda.org/conda-forge/r-xgboost-cpu) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/r-xgboost-cpu.svg)](https://anaconda.org/conda-forge/r-xgboost-cpu) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/r-xgboost-cpu.svg)](https://anaconda.org/conda-forge/r-xgboost-cpu) | -| [![Conda Recipe](https://img.shields.io/badge/recipe-r--xgboost--gpu-green.svg)](https://anaconda.org/conda-forge/r-xgboost-gpu) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/r-xgboost-gpu.svg)](https://anaconda.org/conda-forge/r-xgboost-gpu) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/r-xgboost-gpu.svg)](https://anaconda.org/conda-forge/r-xgboost-gpu) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/r-xgboost-gpu.svg)](https://anaconda.org/conda-forge/r-xgboost-gpu) | | [![Conda Recipe](https://img.shields.io/badge/recipe-xgboost-green.svg)](https://anaconda.org/conda-forge/xgboost) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/xgboost.svg)](https://anaconda.org/conda-forge/xgboost) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/xgboost.svg)](https://anaconda.org/conda-forge/xgboost) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/xgboost.svg)](https://anaconda.org/conda-forge/xgboost) | Installing xgboost @@ -151,16 +147,16 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `_py-xgboost-mutex, _r-xgboost-mutex, libxgboost, py-xgboost, py-xgboost-cpu, py-xgboost-gpu, r-xgboost, r-xgboost-cpu, r-xgboost-gpu, xgboost` can be installed with `conda`: +Once the `conda-forge` channel has been enabled, `_py-xgboost-mutex, libxgboost, py-xgboost, py-xgboost-cpu, py-xgboost-gpu, xgboost` can be installed with `conda`: ``` -conda install _py-xgboost-mutex _r-xgboost-mutex libxgboost py-xgboost py-xgboost-cpu py-xgboost-gpu r-xgboost r-xgboost-cpu r-xgboost-gpu xgboost +conda install _py-xgboost-mutex libxgboost py-xgboost py-xgboost-cpu py-xgboost-gpu xgboost ``` or with `mamba`: ``` -mamba install _py-xgboost-mutex _r-xgboost-mutex libxgboost py-xgboost py-xgboost-cpu py-xgboost-gpu r-xgboost r-xgboost-cpu r-xgboost-gpu xgboost +mamba install _py-xgboost-mutex libxgboost py-xgboost py-xgboost-cpu py-xgboost-gpu xgboost ``` It is possible to list all of the versions of `_py-xgboost-mutex` available on your platform with `conda`: diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b4f1d6ff..14c52d45 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -150,82 +150,85 @@ outputs: - {{ pin_subpackage('py-xgboost', exact=True) }} - __cuda # [cuda_compiler != "None"] - - name: _r-xgboost-mutex - version: 2.0 - build: - string: {{ "cpu" if cuda_compiler == "None" else "gpu" }}_0 - - - name: r-xgboost - script: install-r-xgboost.sh # [not win] - script: install-r-xgboost.bat # [win] - build: - string: {{ string_prefix }}_r{{ r_base | replace('.', '') }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} - rpaths: - - lib/R/lib - requirements: - build: - - {{ compiler('m2w64_c') }} # [win] - - {{ compiler('m2w64_cxx') }} # [win] - - {{ compiler('c') }} - - {{ compiler('cxx') }} - - {{ stdlib('c') }} - - llvm-openmp # [osx] - - libgomp # [linux] - - git - - make # [not win] - - posix # [win] - - cmake - - ninja - - cross-r-base {{ r_base }} # [build_platform != target_platform] - - r-base # [build_platform != target_platform] - - r-matrix # [build_platform != target_platform] - - r-data.table # [build_platform != target_platform] - - r-magrittr # [build_platform != target_platform] - - r-jsonlite # [build_platform != target_platform] - - r-knitr # [build_platform != target_platform] - host: - - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} - - r-base - - r-matrix - - r-data.table - - r-magrittr - - r-jsonlite - - r-knitr - run: - - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} - - {{ pin_subpackage('_r-xgboost-mutex', exact=True) }} - - r-base - - r-matrix - - r-data.table - - r-magrittr - - r-jsonlite - - __cuda # [cuda_compiler != "None"] - test: - files: - - test-r-xgboost.r - commands: - - Rscript test-r-xgboost.r - - - name: r-xgboost-cpu - build: - skip: true # [cuda_compiler != "None"] - requirements: - host: - - r-base - run: - - r-base - - {{ pin_subpackage('r-xgboost', exact=True) }} - - - name: r-xgboost-gpu - build: - skip: true # [cuda_compiler == "None"] - requirements: - host: - - r-base - run: - - r-base - - {{ pin_subpackage('r-xgboost', exact=True) }} - - __cuda # [cuda_compiler != "None"] +# The R interface is currently undergoing a major refactor. +# Please use the 2.0 version for the time being. +# +# - name: _r-xgboost-mutex +# version: 2.0 +# build: +# string: {{ "cpu" if cuda_compiler == "None" else "gpu" }}_0 +# +# - name: r-xgboost +# script: install-r-xgboost.sh # [not win] +# script: install-r-xgboost.bat # [win] +# build: +# string: {{ string_prefix }}_r{{ r_base | replace('.', '') }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} +# rpaths: +# - lib/R/lib +# requirements: +# build: +# - {{ compiler('m2w64_c') }} # [win] +# - {{ compiler('m2w64_cxx') }} # [win] +# - {{ compiler('c') }} +# - {{ compiler('cxx') }} +# - {{ stdlib('c') }} +# - llvm-openmp # [osx] +# - libgomp # [linux] +# - git +# - make # [not win] +# - posix # [win] +# - cmake +# - ninja +# - cross-r-base {{ r_base }} # [build_platform != target_platform] +# - r-base # [build_platform != target_platform] +# - r-matrix # [build_platform != target_platform] +# - r-data.table # [build_platform != target_platform] +# - r-magrittr # [build_platform != target_platform] +# - r-jsonlite # [build_platform != target_platform] +# - r-knitr # [build_platform != target_platform] +# host: +# - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} +# - r-base +# - r-matrix +# - r-data.table +# - r-magrittr +# - r-jsonlite +# - r-knitr +# run: +# - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} +# - {{ pin_subpackage('_r-xgboost-mutex', exact=True) }} +# - r-base +# - r-matrix +# - r-data.table +# - r-magrittr +# - r-jsonlite +# - __cuda # [cuda_compiler != "None"] +# test: +# files: +# - test-r-xgboost.r +# commands: +# - Rscript test-r-xgboost.r +# +# - name: r-xgboost-cpu +# build: +# skip: true # [cuda_compiler != "None"] +# requirements: +# host: +# - r-base +# run: +# - r-base +# - {{ pin_subpackage('r-xgboost', exact=True) }} +# +# - name: r-xgboost-gpu +# build: +# skip: true # [cuda_compiler == "None"] +# requirements: +# host: +# - r-base +# run: +# - r-base +# - {{ pin_subpackage('r-xgboost', exact=True) }} +# - __cuda # [cuda_compiler != "None"] about: home: https://github.com/dmlc/xgboost From 485748ea9941145b13abbec75581353399170ceb Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Sun, 30 Jun 2024 00:42:11 -0700 Subject: [PATCH 014/121] MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.36.2, and conda-forge-pinning 2024.06.29.20.13.13 --- .azure-pipelines/azure-pipelines-win.yml | 58 ++++++++ ...ler_version11.8cxx_compiler_version11.yaml | 5 - ...ler_versionNonecxx_compiler_version12.yaml | 5 - ...ler_version12.0cxx_compiler_version12.yaml | 5 - ...ler_version11.8cxx_compiler_version11.yaml | 6 - ...ler_versionNonecxx_compiler_version12.yaml | 6 - ...ler_version12.0cxx_compiler_version12.yaml | 6 - ...ler_version11.8cxx_compiler_version11.yaml | 6 - ...ler_versionNonecxx_compiler_version12.yaml | 6 - ...ler_version12.0cxx_compiler_version12.yaml | 6 - .ci_support/osx_64_.yaml | 6 - .ci_support/osx_arm64_.yaml | 6 - ...compilerNonecuda_compiler_versionNone.yaml | 19 +++ ...lercuda-nvcccuda_compiler_version12.0.yaml | 19 +++ ...compilernvcccuda_compiler_version11.8.yaml | 19 +++ .scripts/run_win_build.bat | 130 ++++++++++++++++++ README.md | 21 +++ azure-pipelines.yml | 3 +- recipe/meta.yaml | 1 - 19 files changed, 268 insertions(+), 65 deletions(-) create mode 100755 .azure-pipelines/azure-pipelines-win.yml create mode 100644 .ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml create mode 100644 .ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml create mode 100644 .ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml create mode 100755 .scripts/run_win_build.bat diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml new file mode 100755 index 00000000..6f521937 --- /dev/null +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -0,0 +1,58 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- + +jobs: +- job: win + pool: + vmImage: windows-2022 + strategy: + matrix: + win_64_cuda_compilerNonecuda_compiler_versionNone: + CONFIG: win_64_cuda_compilerNonecuda_compiler_versionNone + UPLOAD_PACKAGES: 'True' + win_64_cuda_compilercuda-nvcccuda_compiler_version12.0: + CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.0 + UPLOAD_PACKAGES: 'True' + win_64_cuda_compilernvcccuda_compiler_version11.8: + CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.8 + UPLOAD_PACKAGES: 'True' + timeoutInMinutes: 360 + variables: + CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_TEMP: D:\\tmp + + steps: + + - task: PythonScript@0 + displayName: 'Download Miniforge' + inputs: + scriptSource: inline + script: | + import urllib.request + url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe' + path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" + urllib.request.urlretrieve(url, path) + + - script: | + start /wait "" %BUILD_ARTIFACTSTAGINGDIRECTORY%\Miniforge.exe /InstallationType=JustMe /RegisterPython=0 /S /D=C:\Miniforge + displayName: Install Miniforge + + - powershell: Write-Host "##vso[task.prependpath]C:\Miniforge\Scripts" + displayName: Add conda to PATH + + - script: | + call ".scripts\run_win_build.bat" + displayName: Run Windows build + env: + PYTHONUNBUFFERED: 1 + CONFIG: $(CONFIG) + CI: azure + flow_run_id: azure_$(Build.BuildNumber).$(System.JobAttempt) + remote_url: $(Build.Repository.Uri) + sha: $(Build.SourceVersion) + UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) + UPLOAD_TEMP: $(UPLOAD_TEMP) + BINSTAR_TOKEN: $(BINSTAR_TOKEN) + FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml index e3ccb914..2ea889f5 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml @@ -28,17 +28,12 @@ pin_run_as_build: python: min_pin: x.x max_pin: x.x - r-base: - 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: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml index 91102458..26423735 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml @@ -28,17 +28,12 @@ pin_run_as_build: python: min_pin: x.x max_pin: x.x - r-base: - 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: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml index ca128ee9..b7af29e8 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml @@ -28,17 +28,12 @@ pin_run_as_build: python: min_pin: x.x max_pin: x.x - r-base: - 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: - linux-64 zip_keys: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml index 0b20ed6a..8be59f79 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml @@ -28,12 +28,6 @@ docker_image: - quay.io/condaforge/linux-anvil-cuda:11.8 nccl: - '2' -pin_run_as_build: - r-base: - min_pin: x.x - max_pin: x.x -r_base: -- '4.3' target_platform: - linux-aarch64 zip_keys: diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml index eecb67d1..ea490896 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml @@ -28,12 +28,6 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 nccl: - '2' -pin_run_as_build: - r-base: - min_pin: x.x - max_pin: x.x -r_base: -- '4.3' target_platform: - linux-aarch64 zip_keys: diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml index b0a65eef..a09cc7ed 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml @@ -28,12 +28,6 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 nccl: - '2' -pin_run_as_build: - r-base: - min_pin: x.x - max_pin: x.x -r_base: -- '4.3' target_platform: - linux-aarch64 zip_keys: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml index 7847bd4f..0d8c72fc 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml @@ -24,12 +24,6 @@ docker_image: - quay.io/condaforge/linux-anvil-cuda:11.8 nccl: - '2' -pin_run_as_build: - r-base: - min_pin: x.x - max_pin: x.x -r_base: -- '4.3' target_platform: - linux-ppc64le zip_keys: diff --git a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml index a87dd650..d4254c06 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml @@ -24,12 +24,6 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 nccl: - '2' -pin_run_as_build: - r-base: - min_pin: x.x - max_pin: x.x -r_base: -- '4.3' target_platform: - linux-ppc64le zip_keys: diff --git a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml index 88a6fb8c..c3ecc0b3 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml @@ -24,12 +24,6 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 nccl: - '2' -pin_run_as_build: - r-base: - min_pin: x.x - max_pin: x.x -r_base: -- '4.3' target_platform: - linux-ppc64le zip_keys: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 15200256..49c3aec1 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -26,12 +26,6 @@ llvm_openmp: - '16' macos_machine: - x86_64-apple-darwin13.4.0 -pin_run_as_build: - r-base: - min_pin: x.x - max_pin: x.x -r_base: -- '4.3' target_platform: - osx-64 zip_keys: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 64bad6aa..ce06fbe6 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -26,12 +26,6 @@ llvm_openmp: - '16' macos_machine: - arm64-apple-darwin20.0.0 -pin_run_as_build: - r-base: - min_pin: x.x - max_pin: x.x -r_base: -- '4.3' target_platform: - osx-arm64 zip_keys: diff --git a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml new file mode 100644 index 00000000..71b287fb --- /dev/null +++ b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml @@ -0,0 +1,19 @@ +c_compiler: +- vs2019 +c_stdlib: +- vs +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- None +cuda_compiler_version: +- None +cxx_compiler: +- vs2019 +target_platform: +- win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version 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 new file mode 100644 index 00000000..32322aae --- /dev/null +++ b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml @@ -0,0 +1,19 @@ +c_compiler: +- vs2019 +c_stdlib: +- vs +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '12.0' +cxx_compiler: +- vs2019 +target_platform: +- win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml new file mode 100644 index 00000000..19cf41bf --- /dev/null +++ b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml @@ -0,0 +1,19 @@ +c_compiler: +- vs2019 +c_stdlib: +- vs +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.8' +cxx_compiler: +- vs2019 +target_platform: +- win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat new file mode 100755 index 00000000..65650bf2 --- /dev/null +++ b/.scripts/run_win_build.bat @@ -0,0 +1,130 @@ +:: PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here +:: will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent +:: changes to this script, consider a proposal to conda-smithy so that other feedstocks can also +:: benefit from the improvement. + +:: Note: we assume a Miniforge installation is available + +:: INPUTS (required environment variables) +:: CONFIG: name of the .ci_support/*.yaml file for this job +:: CI: azure, github_actions, or unset +:: UPLOAD_PACKAGES: true or false +:: UPLOAD_ON_BRANCH: true or false + +setlocal enableextensions enabledelayedexpansion + +call :start_group "Configuring conda" + +:: Activate the base conda environment +call activate base +:: Configure the solver +set "CONDA_SOLVER=libmamba" +if !errorlevel! neq 0 exit /b !errorlevel! +set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" + +:: Provision the necessary dependencies to build the recipe later +echo Installing dependencies +mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes +if !errorlevel! neq 0 exit /b !errorlevel! + +:: Set basic configuration +echo Setting up configuration +setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml +if !errorlevel! neq 0 exit /b !errorlevel! +echo Running build setup +CALL run_conda_forge_build_setup + + +if !errorlevel! neq 0 exit /b !errorlevel! + +if EXIST LICENSE.txt ( + echo Copying feedstock license + copy LICENSE.txt "recipe\\recipe-scripts-license.txt" +) +if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( + if [%CROSSCOMPILING_EMULATOR%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + ) +) + +if NOT [%flow_run_id%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" +) + +call :end_group + +:: Build the recipe +echo Building recipe +conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +if !errorlevel! neq 0 exit /b !errorlevel! + +call :start_group "Inspecting artifacts" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +call :end_group + +:: Prepare some environment variables for the upload step +if /i "%CI%" == "github_actions" ( + set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" + set "GIT_BRANCH=%GITHUB_REF:refs/heads/=%" + if /i "%GITHUB_EVENT_NAME%" == "pull_request" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%RUNNER_TEMP%" +) +if /i "%CI%" == "azure" ( + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" + if /i "%BUILD_REASON%" == "PullRequest" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%UPLOAD_TEMP%" +) + +:: Validate +call :start_group "Validating outputs" +validate_recipe_outputs "%FEEDSTOCK_NAME%" +if !errorlevel! neq 0 exit /b !errorlevel! +call :end_group + +if /i "%UPLOAD_PACKAGES%" == "true" ( + if /i "%IS_PR_BUILD%" == "false" ( + call :start_group "Uploading packages" + if not exist "%TEMP%\" md "%TEMP%" + set "TMP=%TEMP%" + upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml + if !errorlevel! neq 0 exit /b !errorlevel! + call :end_group + ) +) + +exit + +:: Logging subroutines + +:start_group +if /i "%CI%" == "github_actions" ( + echo ::group::%~1 + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[group]%~1 + exit /b +) +echo %~1 +exit /b + +:end_group +if /i "%CI%" == "github_actions" ( + echo ::endgroup:: + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[endgroup] + exit /b +) +exit /b \ No newline at end of file diff --git a/README.md b/README.md index 7f21629b..bfefd9a6 100644 --- a/README.md +++ b/README.md @@ -117,6 +117,27 @@ Current build status variant + + win_64_cuda_compilerNonecuda_compiler_versionNone + + + variant + + + + win_64_cuda_compilercuda-nvcccuda_compiler_version12.0 + + + variant + + + + win_64_cuda_compilernvcccuda_compiler_version11.8 + + + variant + + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 33a441c1..e5306da9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,4 +4,5 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 14c52d45..4f523d02 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -24,7 +24,6 @@ source: build: number: {{ build_number }} skip: True # [cuda_compiler_version == "11.2"] - skip: True # [r_base != "4.3"] requirements: build: From aab8872a91c692b112432c63f9598555005be937 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 9 Jul 2024 18:00:03 -0700 Subject: [PATCH 015/121] Drop extra `conda_*`s from `conda-forge.yml` These precede the `libmamba` solver becoming the default in Conda. Very likely they are unneeded now (and may be causing issues). So drop them to see if it helps. Can always readd one-by-one if needed. --- conda-forge.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/conda-forge.yml b/conda-forge.yml index d1ab294a..92998234 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -7,10 +7,7 @@ build_platform: conda_build: error_overlinking: true pkg_format: '2' -conda_build_tool: conda-build conda_forge_output_validation: true -conda_install_tool: mamba -conda_solver: libmamba github: branch_name: main tooling_branch_name: main From c2290b50b4df19b18107a6805fe034622102f62e Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Sun, 14 Jul 2024 16:55:21 -0700 Subject: [PATCH 016/121] MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.36.2, and conda-forge-pinning 2024.07.14.16.05.21 --- .azure-pipelines/azure-pipelines-win.yml | 58 ------- ...ler_version11.8cxx_compiler_version11.yaml | 5 + ...ler_versionNonecxx_compiler_version12.yaml | 5 + ...ler_version12.0cxx_compiler_version12.yaml | 5 + ...ler_version11.8cxx_compiler_version11.yaml | 6 + ...ler_versionNonecxx_compiler_version12.yaml | 6 + ...ler_version12.0cxx_compiler_version12.yaml | 6 + ...ler_version11.8cxx_compiler_version11.yaml | 6 + ...ler_versionNonecxx_compiler_version12.yaml | 6 + ...ler_version12.0cxx_compiler_version12.yaml | 6 + .ci_support/osx_64_.yaml | 6 + .ci_support/osx_arm64_.yaml | 6 + ...compilerNonecuda_compiler_versionNone.yaml | 19 --- ...lercuda-nvcccuda_compiler_version12.0.yaml | 19 --- ...compilernvcccuda_compiler_version11.8.yaml | 19 --- .scripts/run_win_build.bat | 130 --------------- README.md | 31 +--- azure-pipelines.yml | 3 +- recipe/meta.yaml | 157 +++++++++--------- 19 files changed, 148 insertions(+), 351 deletions(-) delete mode 100755 .azure-pipelines/azure-pipelines-win.yml delete mode 100644 .ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml delete mode 100644 .ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml delete mode 100644 .ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml delete mode 100755 .scripts/run_win_build.bat diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml deleted file mode 100755 index 6f521937..00000000 --- a/.azure-pipelines/azure-pipelines-win.yml +++ /dev/null @@ -1,58 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. -# -*- mode: yaml -*- - -jobs: -- job: win - pool: - vmImage: windows-2022 - strategy: - matrix: - win_64_cuda_compilerNonecuda_compiler_versionNone: - CONFIG: win_64_cuda_compilerNonecuda_compiler_versionNone - UPLOAD_PACKAGES: 'True' - win_64_cuda_compilercuda-nvcccuda_compiler_version12.0: - CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.0 - UPLOAD_PACKAGES: 'True' - win_64_cuda_compilernvcccuda_compiler_version11.8: - CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.8 - UPLOAD_PACKAGES: 'True' - timeoutInMinutes: 360 - variables: - CONDA_BLD_PATH: D:\\bld\\ - UPLOAD_TEMP: D:\\tmp - - steps: - - - task: PythonScript@0 - displayName: 'Download Miniforge' - inputs: - scriptSource: inline - script: | - import urllib.request - url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe' - path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" - urllib.request.urlretrieve(url, path) - - - script: | - start /wait "" %BUILD_ARTIFACTSTAGINGDIRECTORY%\Miniforge.exe /InstallationType=JustMe /RegisterPython=0 /S /D=C:\Miniforge - displayName: Install Miniforge - - - powershell: Write-Host "##vso[task.prependpath]C:\Miniforge\Scripts" - displayName: Add conda to PATH - - - script: | - call ".scripts\run_win_build.bat" - displayName: Run Windows build - env: - PYTHONUNBUFFERED: 1 - CONFIG: $(CONFIG) - CI: azure - flow_run_id: azure_$(Build.BuildNumber).$(System.JobAttempt) - remote_url: $(Build.Repository.Uri) - sha: $(Build.SourceVersion) - UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) - UPLOAD_TEMP: $(UPLOAD_TEMP) - BINSTAR_TOKEN: $(BINSTAR_TOKEN) - FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml index 2ea889f5..e3ccb914 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml @@ -28,12 +28,17 @@ pin_run_as_build: python: min_pin: x.x max_pin: x.x + r-base: + 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: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml index 26423735..91102458 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml @@ -28,12 +28,17 @@ pin_run_as_build: python: min_pin: x.x max_pin: x.x + r-base: + 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: - linux-64 zip_keys: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml index b7af29e8..ca128ee9 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml @@ -28,12 +28,17 @@ pin_run_as_build: python: min_pin: x.x max_pin: x.x + r-base: + 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: - linux-64 zip_keys: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml index 8be59f79..0b20ed6a 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml @@ -28,6 +28,12 @@ docker_image: - quay.io/condaforge/linux-anvil-cuda:11.8 nccl: - '2' +pin_run_as_build: + r-base: + min_pin: x.x + max_pin: x.x +r_base: +- '4.3' target_platform: - linux-aarch64 zip_keys: diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml index ea490896..eecb67d1 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml @@ -28,6 +28,12 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 nccl: - '2' +pin_run_as_build: + r-base: + min_pin: x.x + max_pin: x.x +r_base: +- '4.3' target_platform: - linux-aarch64 zip_keys: diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml index a09cc7ed..b0a65eef 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml @@ -28,6 +28,12 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 nccl: - '2' +pin_run_as_build: + r-base: + min_pin: x.x + max_pin: x.x +r_base: +- '4.3' target_platform: - linux-aarch64 zip_keys: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml index 0d8c72fc..7847bd4f 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml @@ -24,6 +24,12 @@ docker_image: - quay.io/condaforge/linux-anvil-cuda:11.8 nccl: - '2' +pin_run_as_build: + r-base: + min_pin: x.x + max_pin: x.x +r_base: +- '4.3' target_platform: - linux-ppc64le zip_keys: diff --git a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml index d4254c06..a87dd650 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml @@ -24,6 +24,12 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 nccl: - '2' +pin_run_as_build: + r-base: + min_pin: x.x + max_pin: x.x +r_base: +- '4.3' target_platform: - linux-ppc64le zip_keys: diff --git a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml index c3ecc0b3..88a6fb8c 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml @@ -24,6 +24,12 @@ docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 nccl: - '2' +pin_run_as_build: + r-base: + min_pin: x.x + max_pin: x.x +r_base: +- '4.3' target_platform: - linux-ppc64le zip_keys: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 49c3aec1..15200256 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -26,6 +26,12 @@ llvm_openmp: - '16' macos_machine: - x86_64-apple-darwin13.4.0 +pin_run_as_build: + r-base: + min_pin: x.x + max_pin: x.x +r_base: +- '4.3' target_platform: - osx-64 zip_keys: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index ce06fbe6..64bad6aa 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -26,6 +26,12 @@ llvm_openmp: - '16' macos_machine: - arm64-apple-darwin20.0.0 +pin_run_as_build: + r-base: + min_pin: x.x + max_pin: x.x +r_base: +- '4.3' target_platform: - osx-arm64 zip_keys: diff --git a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml deleted file mode 100644 index 71b287fb..00000000 --- a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml +++ /dev/null @@ -1,19 +0,0 @@ -c_compiler: -- vs2019 -c_stdlib: -- vs -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- None -cuda_compiler_version: -- None -cxx_compiler: -- vs2019 -target_platform: -- win-64 -zip_keys: -- - cuda_compiler - - cuda_compiler_version 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 deleted file mode 100644 index 32322aae..00000000 --- a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml +++ /dev/null @@ -1,19 +0,0 @@ -c_compiler: -- vs2019 -c_stdlib: -- vs -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- cuda-nvcc -cuda_compiler_version: -- '12.0' -cxx_compiler: -- vs2019 -target_platform: -- win-64 -zip_keys: -- - cuda_compiler - - cuda_compiler_version diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml deleted file mode 100644 index 19cf41bf..00000000 --- a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml +++ /dev/null @@ -1,19 +0,0 @@ -c_compiler: -- vs2019 -c_stdlib: -- vs -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.8' -cxx_compiler: -- vs2019 -target_platform: -- win-64 -zip_keys: -- - cuda_compiler - - cuda_compiler_version diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat deleted file mode 100755 index 65650bf2..00000000 --- a/.scripts/run_win_build.bat +++ /dev/null @@ -1,130 +0,0 @@ -:: PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here -:: will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent -:: changes to this script, consider a proposal to conda-smithy so that other feedstocks can also -:: benefit from the improvement. - -:: Note: we assume a Miniforge installation is available - -:: INPUTS (required environment variables) -:: CONFIG: name of the .ci_support/*.yaml file for this job -:: CI: azure, github_actions, or unset -:: UPLOAD_PACKAGES: true or false -:: UPLOAD_ON_BRANCH: true or false - -setlocal enableextensions enabledelayedexpansion - -call :start_group "Configuring conda" - -:: Activate the base conda environment -call activate base -:: Configure the solver -set "CONDA_SOLVER=libmamba" -if !errorlevel! neq 0 exit /b !errorlevel! -set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" - -:: Provision the necessary dependencies to build the recipe later -echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes -if !errorlevel! neq 0 exit /b !errorlevel! - -:: Set basic configuration -echo Setting up configuration -setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml -if !errorlevel! neq 0 exit /b !errorlevel! -echo Running build setup -CALL run_conda_forge_build_setup - - -if !errorlevel! neq 0 exit /b !errorlevel! - -if EXIST LICENSE.txt ( - echo Copying feedstock license - copy LICENSE.txt "recipe\\recipe-scripts-license.txt" -) -if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( - if [%CROSSCOMPILING_EMULATOR%] == [] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" - ) -) - -if NOT [%flow_run_id%] == [] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" -) - -call :end_group - -:: Build the recipe -echo Building recipe -conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% -if !errorlevel! neq 0 exit /b !errorlevel! - -call :start_group "Inspecting artifacts" -:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 -WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" -call :end_group - -:: Prepare some environment variables for the upload step -if /i "%CI%" == "github_actions" ( - set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" - set "GIT_BRANCH=%GITHUB_REF:refs/heads/=%" - if /i "%GITHUB_EVENT_NAME%" == "pull_request" ( - set "IS_PR_BUILD=True" - ) else ( - set "IS_PR_BUILD=False" - ) - set "TEMP=%RUNNER_TEMP%" -) -if /i "%CI%" == "azure" ( - set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" - set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" - if /i "%BUILD_REASON%" == "PullRequest" ( - set "IS_PR_BUILD=True" - ) else ( - set "IS_PR_BUILD=False" - ) - set "TEMP=%UPLOAD_TEMP%" -) - -:: Validate -call :start_group "Validating outputs" -validate_recipe_outputs "%FEEDSTOCK_NAME%" -if !errorlevel! neq 0 exit /b !errorlevel! -call :end_group - -if /i "%UPLOAD_PACKAGES%" == "true" ( - if /i "%IS_PR_BUILD%" == "false" ( - call :start_group "Uploading packages" - if not exist "%TEMP%\" md "%TEMP%" - set "TMP=%TEMP%" - upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml - if !errorlevel! neq 0 exit /b !errorlevel! - call :end_group - ) -) - -exit - -:: Logging subroutines - -:start_group -if /i "%CI%" == "github_actions" ( - echo ::group::%~1 - exit /b -) -if /i "%CI%" == "azure" ( - echo ##[group]%~1 - exit /b -) -echo %~1 -exit /b - -:end_group -if /i "%CI%" == "github_actions" ( - echo ::endgroup:: - exit /b -) -if /i "%CI%" == "azure" ( - echo ##[endgroup] - exit /b -) -exit /b \ No newline at end of file diff --git a/README.md b/README.md index bfefd9a6..c2069196 100644 --- a/README.md +++ b/README.md @@ -117,27 +117,6 @@ Current build status variant - - win_64_cuda_compilerNonecuda_compiler_versionNone - - - variant - - - - win_64_cuda_compilercuda-nvcccuda_compiler_version12.0 - - - variant - - - - win_64_cuda_compilernvcccuda_compiler_version11.8 - - - variant - - @@ -152,10 +131,14 @@ Current release info | Name | Downloads | Version | Platforms | | --- | --- | --- | --- | | [![Conda Recipe](https://img.shields.io/badge/recipe-_py--xgboost--mutex-green.svg)](https://anaconda.org/conda-forge/_py-xgboost-mutex) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/_py-xgboost-mutex.svg)](https://anaconda.org/conda-forge/_py-xgboost-mutex) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/_py-xgboost-mutex.svg)](https://anaconda.org/conda-forge/_py-xgboost-mutex) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/_py-xgboost-mutex.svg)](https://anaconda.org/conda-forge/_py-xgboost-mutex) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-_r--xgboost--mutex-green.svg)](https://anaconda.org/conda-forge/_r-xgboost-mutex) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/_r-xgboost-mutex.svg)](https://anaconda.org/conda-forge/_r-xgboost-mutex) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/_r-xgboost-mutex.svg)](https://anaconda.org/conda-forge/_r-xgboost-mutex) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/_r-xgboost-mutex.svg)](https://anaconda.org/conda-forge/_r-xgboost-mutex) | | [![Conda Recipe](https://img.shields.io/badge/recipe-libxgboost-green.svg)](https://anaconda.org/conda-forge/libxgboost) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libxgboost.svg)](https://anaconda.org/conda-forge/libxgboost) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libxgboost.svg)](https://anaconda.org/conda-forge/libxgboost) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libxgboost.svg)](https://anaconda.org/conda-forge/libxgboost) | | [![Conda Recipe](https://img.shields.io/badge/recipe-py--xgboost-green.svg)](https://anaconda.org/conda-forge/py-xgboost) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/py-xgboost.svg)](https://anaconda.org/conda-forge/py-xgboost) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/py-xgboost.svg)](https://anaconda.org/conda-forge/py-xgboost) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/py-xgboost.svg)](https://anaconda.org/conda-forge/py-xgboost) | | [![Conda Recipe](https://img.shields.io/badge/recipe-py--xgboost--cpu-green.svg)](https://anaconda.org/conda-forge/py-xgboost-cpu) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/py-xgboost-cpu.svg)](https://anaconda.org/conda-forge/py-xgboost-cpu) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/py-xgboost-cpu.svg)](https://anaconda.org/conda-forge/py-xgboost-cpu) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/py-xgboost-cpu.svg)](https://anaconda.org/conda-forge/py-xgboost-cpu) | | [![Conda Recipe](https://img.shields.io/badge/recipe-py--xgboost--gpu-green.svg)](https://anaconda.org/conda-forge/py-xgboost-gpu) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/py-xgboost-gpu.svg)](https://anaconda.org/conda-forge/py-xgboost-gpu) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/py-xgboost-gpu.svg)](https://anaconda.org/conda-forge/py-xgboost-gpu) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/py-xgboost-gpu.svg)](https://anaconda.org/conda-forge/py-xgboost-gpu) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-r--xgboost-green.svg)](https://anaconda.org/conda-forge/r-xgboost) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/r-xgboost.svg)](https://anaconda.org/conda-forge/r-xgboost) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/r-xgboost.svg)](https://anaconda.org/conda-forge/r-xgboost) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/r-xgboost.svg)](https://anaconda.org/conda-forge/r-xgboost) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-r--xgboost--cpu-green.svg)](https://anaconda.org/conda-forge/r-xgboost-cpu) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/r-xgboost-cpu.svg)](https://anaconda.org/conda-forge/r-xgboost-cpu) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/r-xgboost-cpu.svg)](https://anaconda.org/conda-forge/r-xgboost-cpu) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/r-xgboost-cpu.svg)](https://anaconda.org/conda-forge/r-xgboost-cpu) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-r--xgboost--gpu-green.svg)](https://anaconda.org/conda-forge/r-xgboost-gpu) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/r-xgboost-gpu.svg)](https://anaconda.org/conda-forge/r-xgboost-gpu) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/r-xgboost-gpu.svg)](https://anaconda.org/conda-forge/r-xgboost-gpu) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/r-xgboost-gpu.svg)](https://anaconda.org/conda-forge/r-xgboost-gpu) | | [![Conda Recipe](https://img.shields.io/badge/recipe-xgboost-green.svg)](https://anaconda.org/conda-forge/xgboost) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/xgboost.svg)](https://anaconda.org/conda-forge/xgboost) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/xgboost.svg)](https://anaconda.org/conda-forge/xgboost) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/xgboost.svg)](https://anaconda.org/conda-forge/xgboost) | Installing xgboost @@ -168,16 +151,16 @@ conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `_py-xgboost-mutex, libxgboost, py-xgboost, py-xgboost-cpu, py-xgboost-gpu, xgboost` can be installed with `conda`: +Once the `conda-forge` channel has been enabled, `_py-xgboost-mutex, _r-xgboost-mutex, libxgboost, py-xgboost, py-xgboost-cpu, py-xgboost-gpu, r-xgboost, r-xgboost-cpu, r-xgboost-gpu, xgboost` can be installed with `conda`: ``` -conda install _py-xgboost-mutex libxgboost py-xgboost py-xgboost-cpu py-xgboost-gpu xgboost +conda install _py-xgboost-mutex _r-xgboost-mutex libxgboost py-xgboost py-xgboost-cpu py-xgboost-gpu r-xgboost r-xgboost-cpu r-xgboost-gpu xgboost ``` or with `mamba`: ``` -mamba install _py-xgboost-mutex libxgboost py-xgboost py-xgboost-cpu py-xgboost-gpu xgboost +mamba install _py-xgboost-mutex _r-xgboost-mutex libxgboost py-xgboost py-xgboost-cpu py-xgboost-gpu r-xgboost r-xgboost-cpu r-xgboost-gpu xgboost ``` It is possible to list all of the versions of `_py-xgboost-mutex` available on your platform with `conda`: diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e5306da9..33a441c1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,5 +4,4 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4f523d02..299749b3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -24,6 +24,7 @@ source: build: number: {{ build_number }} skip: True # [cuda_compiler_version == "11.2"] + skip: True # [r_base != "4.3"] requirements: build: @@ -136,7 +137,6 @@ outputs: - {{ pin_subpackage('py-xgboost', exact=True) }} - __cuda # [cuda_compiler != "None"] - - name: xgboost build: noarch: python @@ -149,85 +149,82 @@ outputs: - {{ pin_subpackage('py-xgboost', exact=True) }} - __cuda # [cuda_compiler != "None"] -# The R interface is currently undergoing a major refactor. -# Please use the 2.0 version for the time being. -# -# - name: _r-xgboost-mutex -# version: 2.0 -# build: -# string: {{ "cpu" if cuda_compiler == "None" else "gpu" }}_0 -# -# - name: r-xgboost -# script: install-r-xgboost.sh # [not win] -# script: install-r-xgboost.bat # [win] -# build: -# string: {{ string_prefix }}_r{{ r_base | replace('.', '') }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} -# rpaths: -# - lib/R/lib -# requirements: -# build: -# - {{ compiler('m2w64_c') }} # [win] -# - {{ compiler('m2w64_cxx') }} # [win] -# - {{ compiler('c') }} -# - {{ compiler('cxx') }} -# - {{ stdlib('c') }} -# - llvm-openmp # [osx] -# - libgomp # [linux] -# - git -# - make # [not win] -# - posix # [win] -# - cmake -# - ninja -# - cross-r-base {{ r_base }} # [build_platform != target_platform] -# - r-base # [build_platform != target_platform] -# - r-matrix # [build_platform != target_platform] -# - r-data.table # [build_platform != target_platform] -# - r-magrittr # [build_platform != target_platform] -# - r-jsonlite # [build_platform != target_platform] -# - r-knitr # [build_platform != target_platform] -# host: -# - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} -# - r-base -# - r-matrix -# - r-data.table -# - r-magrittr -# - r-jsonlite -# - r-knitr -# run: -# - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} -# - {{ pin_subpackage('_r-xgboost-mutex', exact=True) }} -# - r-base -# - r-matrix -# - r-data.table -# - r-magrittr -# - r-jsonlite -# - __cuda # [cuda_compiler != "None"] -# test: -# files: -# - test-r-xgboost.r -# commands: -# - Rscript test-r-xgboost.r -# -# - name: r-xgboost-cpu -# build: -# skip: true # [cuda_compiler != "None"] -# requirements: -# host: -# - r-base -# run: -# - r-base -# - {{ pin_subpackage('r-xgboost', exact=True) }} -# -# - name: r-xgboost-gpu -# build: -# skip: true # [cuda_compiler == "None"] -# requirements: -# host: -# - r-base -# run: -# - r-base -# - {{ pin_subpackage('r-xgboost', exact=True) }} -# - __cuda # [cuda_compiler != "None"] + - name: _r-xgboost-mutex + version: 2.0 + build: + string: {{ "cpu" if cuda_compiler == "None" else "gpu" }}_0 + + - name: r-xgboost + script: install-r-xgboost.sh # [not win] + script: install-r-xgboost.bat # [win] + build: + string: {{ string_prefix }}_r{{ r_base | replace('.', '') }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} + rpaths: + - lib/R/lib + requirements: + build: + - {{ compiler('m2w64_c') }} # [win] + - {{ compiler('m2w64_cxx') }} # [win] + - {{ compiler('c') }} + - {{ compiler('cxx') }} + - {{ stdlib('c') }} + - llvm-openmp # [osx] + - libgomp # [linux] + - git + - make # [not win] + - posix # [win] + - cmake + - ninja + - cross-r-base {{ r_base }} # [build_platform != target_platform] + - r-base # [build_platform != target_platform] + - r-matrix # [build_platform != target_platform] + - r-data.table # [build_platform != target_platform] + - r-magrittr # [build_platform != target_platform] + - r-jsonlite # [build_platform != target_platform] + - r-knitr # [build_platform != target_platform] + host: + - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} + - r-base + - r-matrix + - r-data.table + - r-magrittr + - r-jsonlite + - r-knitr + run: + - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} + - {{ pin_subpackage('_r-xgboost-mutex', exact=True) }} + - r-base + - r-matrix + - r-data.table + - r-magrittr + - r-jsonlite + - __cuda # [cuda_compiler != "None"] + test: + files: + - test-r-xgboost.r + commands: + - Rscript test-r-xgboost.r + + - name: r-xgboost-cpu + build: + skip: true # [cuda_compiler != "None"] + requirements: + host: + - r-base + run: + - r-base + - {{ pin_subpackage('r-xgboost', exact=True) }} + + - name: r-xgboost-gpu + build: + skip: true # [cuda_compiler == "None"] + requirements: + host: + - r-base + run: + - r-base + - {{ pin_subpackage('r-xgboost', exact=True) }} + - __cuda # [cuda_compiler != "None"] about: home: https://github.com/dmlc/xgboost From e9031544245fc4f70738f2ac2b3a430babfb0c79 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 16 Jul 2024 16:43:01 +0000 Subject: [PATCH 017/121] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.0, and conda-forge-pinning 2024.07.16.14.39.10 --- .scripts/build_steps.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index a5836e8d..ba4b251c 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -72,7 +72,6 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" - ( startgroup "Inspecting artifacts" ) 2> /dev/null # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 From 25fb6fba9e4bb8bfc714126732d72dd6c22237bb Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 16 Jul 2024 17:03:01 -0700 Subject: [PATCH 018/121] Add `pin_subpackage` in `host` & `run` In some cases `pin_subpackage` was only added to `requirements/run`. In others it may be in `requirements/host` too. This consistently adds it to both. May help build tools recognize the dependency order when starting builds (and thus more consistently create working test environments). --- recipe/meta.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 299749b3..90663619 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -96,6 +96,7 @@ outputs: - cross-python_{{ target_platform }} # [build_platform != target_platform] host: - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} + - {{ pin_subpackage('_py-xgboost-mutex', exact=True) }} - python - hatchling >=1.12.1 - pip @@ -144,6 +145,7 @@ outputs: requirements: host: - python + - {{ pin_subpackage('py-xgboost', exact=True) }} run: - python - {{ pin_subpackage('py-xgboost', exact=True) }} @@ -184,6 +186,7 @@ outputs: - r-knitr # [build_platform != target_platform] host: - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} + - {{ pin_subpackage('_r-xgboost-mutex', exact=True) }} - r-base - r-matrix - r-data.table @@ -211,6 +214,7 @@ outputs: requirements: host: - r-base + - {{ pin_subpackage('r-xgboost', exact=True) }} run: - r-base - {{ pin_subpackage('r-xgboost', exact=True) }} @@ -221,6 +225,7 @@ outputs: requirements: host: - r-base + - {{ pin_subpackage('r-xgboost', exact=True) }} run: - r-base - {{ pin_subpackage('r-xgboost', exact=True) }} From 57f1b1bb9e526276df15dc7d1176f01702fea16b Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 16 Jul 2024 17:55:06 -0700 Subject: [PATCH 019/121] Ignore missing `ld64.so.2` linkage on `ppc64le` --- recipe/meta.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 90663619..6a9b9537 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -51,7 +51,10 @@ outputs: missing_dso_whitelist: # Conda-build raises the missing `R.dll` linkage erroneously. # xref: https://github.com/conda/conda-build/pull/4786 - - '*/R.dll' # [win] + - '*/R.dll' # [win] + # Conda-build raises the missing `ld64.so.2` linkage erroneously. + # xref: https://github.com/conda/conda-build/issues/5403 + - $RPATH/ld64.so.2 # [ppc64le] requirements: build: - {{ compiler('c') }} From e3b4ef436858cbf1dbccfbd9556b8fc9aede5b90 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 16 Jul 2024 18:02:58 -0700 Subject: [PATCH 020/121] Require R 4.3+ https://github.com/dmlc/xgboost/blob/v2.1.0/R-package/DESCRIPTION#L61-L62 --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6a9b9537..6d073374 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -24,7 +24,7 @@ source: build: number: {{ build_number }} skip: True # [cuda_compiler_version == "11.2"] - skip: True # [r_base != "4.3"] + skip: True # [r_base in ("4.1", "4.2")] requirements: build: From 702135d4f4f5ed010b260ed7cd3e4f718059fa1a Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 16 Jul 2024 18:03:40 -0700 Subject: [PATCH 021/121] Drop outdated CUDA skip (min is 11.8) --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6d073374..54af1934 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,7 +23,6 @@ source: build: number: {{ build_number }} - skip: True # [cuda_compiler_version == "11.2"] skip: True # [r_base in ("4.1", "4.2")] requirements: From 866c306a311195edae16f75bd62259f209f60199 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 16 Jul 2024 18:44:32 -0700 Subject: [PATCH 022/121] Move R skip into relevant packages --- recipe/meta.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 54af1934..112c6f8f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,7 +23,6 @@ source: build: number: {{ build_number }} - skip: True # [r_base in ("4.1", "4.2")] requirements: build: @@ -162,6 +161,7 @@ outputs: script: install-r-xgboost.sh # [not win] script: install-r-xgboost.bat # [win] build: + skip: true # [r_base in ("4.1", "4.2")] string: {{ string_prefix }}_r{{ r_base | replace('.', '') }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} rpaths: - lib/R/lib @@ -213,6 +213,7 @@ outputs: - name: r-xgboost-cpu build: skip: true # [cuda_compiler != "None"] + skip: true # [r_base in ("4.1", "4.2")] requirements: host: - r-base @@ -224,6 +225,7 @@ outputs: - name: r-xgboost-gpu build: skip: true # [cuda_compiler == "None"] + skip: true # [r_base in ("4.1", "4.2")] requirements: host: - r-base From e16c7956840e844427e57e9335cb994617ddcf36 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2024 01:48:05 +0000 Subject: [PATCH 023/121] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.0, and conda-forge-pinning 2024.07.17.01.38.51 --- .azure-pipelines/azure-pipelines-win.yml | 58 ++++++++ ...compilerNonecuda_compiler_versionNone.yaml | 19 +++ ...lercuda-nvcccuda_compiler_version12.0.yaml | 19 +++ ...compilernvcccuda_compiler_version11.8.yaml | 19 +++ .scripts/run_win_build.bat | 130 ++++++++++++++++++ README.md | 21 +++ azure-pipelines.yml | 3 +- 7 files changed, 268 insertions(+), 1 deletion(-) create mode 100755 .azure-pipelines/azure-pipelines-win.yml create mode 100644 .ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml create mode 100644 .ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml create mode 100644 .ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml create mode 100755 .scripts/run_win_build.bat diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml new file mode 100755 index 00000000..6f521937 --- /dev/null +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -0,0 +1,58 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- + +jobs: +- job: win + pool: + vmImage: windows-2022 + strategy: + matrix: + win_64_cuda_compilerNonecuda_compiler_versionNone: + CONFIG: win_64_cuda_compilerNonecuda_compiler_versionNone + UPLOAD_PACKAGES: 'True' + win_64_cuda_compilercuda-nvcccuda_compiler_version12.0: + CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.0 + UPLOAD_PACKAGES: 'True' + win_64_cuda_compilernvcccuda_compiler_version11.8: + CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.8 + UPLOAD_PACKAGES: 'True' + timeoutInMinutes: 360 + variables: + CONDA_BLD_PATH: D:\\bld\\ + UPLOAD_TEMP: D:\\tmp + + steps: + + - task: PythonScript@0 + displayName: 'Download Miniforge' + inputs: + scriptSource: inline + script: | + import urllib.request + url = 'https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Windows-x86_64.exe' + path = r"$(Build.ArtifactStagingDirectory)/Miniforge.exe" + urllib.request.urlretrieve(url, path) + + - script: | + start /wait "" %BUILD_ARTIFACTSTAGINGDIRECTORY%\Miniforge.exe /InstallationType=JustMe /RegisterPython=0 /S /D=C:\Miniforge + displayName: Install Miniforge + + - powershell: Write-Host "##vso[task.prependpath]C:\Miniforge\Scripts" + displayName: Add conda to PATH + + - script: | + call ".scripts\run_win_build.bat" + displayName: Run Windows build + env: + PYTHONUNBUFFERED: 1 + CONFIG: $(CONFIG) + CI: azure + flow_run_id: azure_$(Build.BuildNumber).$(System.JobAttempt) + remote_url: $(Build.Repository.Uri) + sha: $(Build.SourceVersion) + UPLOAD_PACKAGES: $(UPLOAD_PACKAGES) + UPLOAD_TEMP: $(UPLOAD_TEMP) + BINSTAR_TOKEN: $(BINSTAR_TOKEN) + FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file diff --git a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml new file mode 100644 index 00000000..71b287fb --- /dev/null +++ b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml @@ -0,0 +1,19 @@ +c_compiler: +- vs2019 +c_stdlib: +- vs +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- None +cuda_compiler_version: +- None +cxx_compiler: +- vs2019 +target_platform: +- win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version 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 new file mode 100644 index 00000000..32322aae --- /dev/null +++ b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml @@ -0,0 +1,19 @@ +c_compiler: +- vs2019 +c_stdlib: +- vs +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '12.0' +cxx_compiler: +- vs2019 +target_platform: +- win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml new file mode 100644 index 00000000..19cf41bf --- /dev/null +++ b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml @@ -0,0 +1,19 @@ +c_compiler: +- vs2019 +c_stdlib: +- vs +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.8' +cxx_compiler: +- vs2019 +target_platform: +- win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat new file mode 100755 index 00000000..65650bf2 --- /dev/null +++ b/.scripts/run_win_build.bat @@ -0,0 +1,130 @@ +:: PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here +:: will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent +:: changes to this script, consider a proposal to conda-smithy so that other feedstocks can also +:: benefit from the improvement. + +:: Note: we assume a Miniforge installation is available + +:: INPUTS (required environment variables) +:: CONFIG: name of the .ci_support/*.yaml file for this job +:: CI: azure, github_actions, or unset +:: UPLOAD_PACKAGES: true or false +:: UPLOAD_ON_BRANCH: true or false + +setlocal enableextensions enabledelayedexpansion + +call :start_group "Configuring conda" + +:: Activate the base conda environment +call activate base +:: Configure the solver +set "CONDA_SOLVER=libmamba" +if !errorlevel! neq 0 exit /b !errorlevel! +set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" + +:: Provision the necessary dependencies to build the recipe later +echo Installing dependencies +mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes +if !errorlevel! neq 0 exit /b !errorlevel! + +:: Set basic configuration +echo Setting up configuration +setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml +if !errorlevel! neq 0 exit /b !errorlevel! +echo Running build setup +CALL run_conda_forge_build_setup + + +if !errorlevel! neq 0 exit /b !errorlevel! + +if EXIST LICENSE.txt ( + echo Copying feedstock license + copy LICENSE.txt "recipe\\recipe-scripts-license.txt" +) +if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( + if [%CROSSCOMPILING_EMULATOR%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" + ) +) + +if NOT [%flow_run_id%] == [] ( + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --extra-meta flow_run_id=%flow_run_id% remote_url=%remote_url% sha=%sha%" +) + +call :end_group + +:: Build the recipe +echo Building recipe +conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +if !errorlevel! neq 0 exit /b !errorlevel! + +call :start_group "Inspecting artifacts" +:: inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 +WHERE inspect_artifacts >nul 2>nul && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" +call :end_group + +:: Prepare some environment variables for the upload step +if /i "%CI%" == "github_actions" ( + set "FEEDSTOCK_NAME=%GITHUB_REPOSITORY:*/=%" + set "GIT_BRANCH=%GITHUB_REF:refs/heads/=%" + if /i "%GITHUB_EVENT_NAME%" == "pull_request" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%RUNNER_TEMP%" +) +if /i "%CI%" == "azure" ( + set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" + set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" + if /i "%BUILD_REASON%" == "PullRequest" ( + set "IS_PR_BUILD=True" + ) else ( + set "IS_PR_BUILD=False" + ) + set "TEMP=%UPLOAD_TEMP%" +) + +:: Validate +call :start_group "Validating outputs" +validate_recipe_outputs "%FEEDSTOCK_NAME%" +if !errorlevel! neq 0 exit /b !errorlevel! +call :end_group + +if /i "%UPLOAD_PACKAGES%" == "true" ( + if /i "%IS_PR_BUILD%" == "false" ( + call :start_group "Uploading packages" + if not exist "%TEMP%\" md "%TEMP%" + set "TMP=%TEMP%" + upload_package --validate --feedstock-name="%FEEDSTOCK_NAME%" .\ ".\recipe" .ci_support\%CONFIG%.yaml + if !errorlevel! neq 0 exit /b !errorlevel! + call :end_group + ) +) + +exit + +:: Logging subroutines + +:start_group +if /i "%CI%" == "github_actions" ( + echo ::group::%~1 + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[group]%~1 + exit /b +) +echo %~1 +exit /b + +:end_group +if /i "%CI%" == "github_actions" ( + echo ::endgroup:: + exit /b +) +if /i "%CI%" == "azure" ( + echo ##[endgroup] + exit /b +) +exit /b \ No newline at end of file diff --git a/README.md b/README.md index c2069196..dbbb8ddc 100644 --- a/README.md +++ b/README.md @@ -117,6 +117,27 @@ Current build status variant + + win_64_cuda_compilerNonecuda_compiler_versionNone + + + variant + + + + win_64_cuda_compilercuda-nvcccuda_compiler_version12.0 + + + variant + + + + win_64_cuda_compilernvcccuda_compiler_version11.8 + + + variant + + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 33a441c1..e5306da9 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,4 +4,5 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file From 7eb2411e1e33ebfdc58eacbdbe01b42137451e6e Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 16 Jul 2024 19:10:52 -0700 Subject: [PATCH 024/121] Add MinGW compilers to top-level --- recipe/meta.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 112c6f8f..32516888 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -28,7 +28,9 @@ requirements: build: - {{ compiler('c') }} - {{ compiler('cxx') }} - - {{ compiler('cuda') }} # [cuda_compiler != "None" and cuda_compiler_version != "None"] + - {{ compiler('m2w64_c') }} # [win] + - {{ compiler('m2w64_cxx') }} # [win] + - {{ compiler('cuda') }} # [cuda_compiler != "None" and cuda_compiler_version != "None"] - {{ stdlib('c') }} - cmake - llvm-openmp # [osx] From 0879870592203bf5687d773d80029988321d1abd Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2024 02:14:03 +0000 Subject: [PATCH 025/121] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.0, and conda-forge-pinning 2024.07.17.01.38.51 --- .../win_64_cuda_compilerNonecuda_compiler_versionNone.yaml | 4 ++++ ...in_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml | 4 ++++ .../win_64_cuda_compilernvcccuda_compiler_version11.8.yaml | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml index 71b287fb..3fa468c3 100644 --- a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml @@ -12,6 +12,10 @@ cuda_compiler_version: - None cxx_compiler: - vs2019 +m2w64_c_compiler: +- m2w64-toolchain +m2w64_cxx_compiler: +- m2w64-toolchain 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 index 32322aae..d7beb725 100644 --- a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml +++ b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml @@ -12,6 +12,10 @@ cuda_compiler_version: - '12.0' cxx_compiler: - vs2019 +m2w64_c_compiler: +- m2w64-toolchain +m2w64_cxx_compiler: +- m2w64-toolchain 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 index 19cf41bf..dd81f582 100644 --- a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml +++ b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml @@ -12,6 +12,10 @@ cuda_compiler_version: - '11.8' cxx_compiler: - vs2019 +m2w64_c_compiler: +- m2w64-toolchain +m2w64_cxx_compiler: +- m2w64-toolchain target_platform: - win-64 zip_keys: From b524aed86bdebffcb9145929d076478354b4042d Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Tue, 16 Jul 2024 21:38:22 -0700 Subject: [PATCH 026/121] Exclude R 3.4 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 32516888..24ad4b75 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -163,7 +163,7 @@ outputs: script: install-r-xgboost.sh # [not win] script: install-r-xgboost.bat # [win] build: - skip: true # [r_base in ("4.1", "4.2")] + skip: true # [r_base in ("3.4", "4.0", "4.1", "4.2")] string: {{ string_prefix }}_r{{ r_base | replace('.', '') }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} rpaths: - lib/R/lib @@ -215,7 +215,7 @@ outputs: - name: r-xgboost-cpu build: skip: true # [cuda_compiler != "None"] - skip: true # [r_base in ("4.1", "4.2")] + skip: true # [r_base in ("3.4", "4.0", "4.1", "4.2")] requirements: host: - r-base @@ -227,7 +227,7 @@ outputs: - name: r-xgboost-gpu build: skip: true # [cuda_compiler == "None"] - skip: true # [r_base in ("4.1", "4.2")] + skip: true # [r_base in ("3.4", "4.0", "4.1", "4.2")] requirements: host: - r-base From 778a482c7b2f354d86b4ca6255378d1cd92032cb Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Tue, 16 Jul 2024 21:52:41 -0700 Subject: [PATCH 027/121] Explicitly skip windows for R --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 24ad4b75..56b87577 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -163,7 +163,7 @@ outputs: script: install-r-xgboost.sh # [not win] script: install-r-xgboost.bat # [win] build: - skip: true # [r_base in ("3.4", "4.0", "4.1", "4.2")] + skip: true # [r_base in ("4.1", "4.2") or win] string: {{ string_prefix }}_r{{ r_base | replace('.', '') }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} rpaths: - lib/R/lib @@ -215,7 +215,7 @@ outputs: - name: r-xgboost-cpu build: skip: true # [cuda_compiler != "None"] - skip: true # [r_base in ("3.4", "4.0", "4.1", "4.2")] + skip: true # [r_base in ("4.1", "4.2") or win] requirements: host: - r-base @@ -227,7 +227,7 @@ outputs: - name: r-xgboost-gpu build: skip: true # [cuda_compiler == "None"] - skip: true # [r_base in ("3.4", "4.0", "4.1", "4.2")] + skip: true # [r_base in ("4.1", "4.2") or win] requirements: host: - r-base From e23f853144b378cafd9a686409480a82b2fe805a Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Wed, 17 Jul 2024 13:07:57 -0700 Subject: [PATCH 028/121] Use True instead of true --- recipe/meta.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 56b87577..c816fec9 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -119,7 +119,7 @@ outputs: - name: py-xgboost-cpu build: noarch: python - skip: true # [cuda_compiler != "None"] + skip: True # [cuda_compiler != "None"] requirements: host: - python @@ -131,7 +131,7 @@ outputs: - name: py-xgboost-gpu build: noarch: python - skip: true # [cuda_compiler == "None"] + skip: True # [cuda_compiler == "None"] requirements: host: - python @@ -163,7 +163,7 @@ outputs: script: install-r-xgboost.sh # [not win] script: install-r-xgboost.bat # [win] build: - skip: true # [r_base in ("4.1", "4.2") or win] + skip: True # [r_base in ("4.1", "4.2") or win] string: {{ string_prefix }}_r{{ r_base | replace('.', '') }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} rpaths: - lib/R/lib @@ -214,8 +214,8 @@ outputs: - name: r-xgboost-cpu build: - skip: true # [cuda_compiler != "None"] - skip: true # [r_base in ("4.1", "4.2") or win] + skip: True # [cuda_compiler != "None"] + skip: True # [r_base in ("4.1", "4.2") or win] requirements: host: - r-base @@ -226,8 +226,8 @@ outputs: - name: r-xgboost-gpu build: - skip: true # [cuda_compiler == "None"] - skip: true # [r_base in ("4.1", "4.2") or win] + skip: True # [cuda_compiler == "None"] + skip: True # [r_base in ("4.1", "4.2") or win] requirements: host: - r-base From 2ea37be8550f135dca8174ede6f8e3343db654bc Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Wed, 17 Jul 2024 13:09:07 -0700 Subject: [PATCH 029/121] Skip CUDA 11.8 for Windows --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c816fec9..3c032f23 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,6 +23,7 @@ source: build: number: {{ build_number }} + skip: True # [cuda_compiler_version == "11.8" and win] requirements: build: From 8a7d594e326e0c4a45b34a5546d9722bbb734949 Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Wed, 17 Jul 2024 13:13:53 -0700 Subject: [PATCH 030/121] MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.37.1, and conda-forge-pinning 2024.07.17.19.24.35 --- .azure-pipelines/azure-pipelines-win.yml | 3 --- ...compilernvcccuda_compiler_version11.8.yaml | 23 ------------------- README.md | 7 ------ 3 files changed, 33 deletions(-) delete mode 100644 .ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 6f521937..dc397b73 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -14,9 +14,6 @@ jobs: win_64_cuda_compilercuda-nvcccuda_compiler_version12.0: CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.0 UPLOAD_PACKAGES: 'True' - win_64_cuda_compilernvcccuda_compiler_version11.8: - CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.8 - UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml deleted file mode 100644 index dd81f582..00000000 --- a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml +++ /dev/null @@ -1,23 +0,0 @@ -c_compiler: -- vs2019 -c_stdlib: -- vs -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.8' -cxx_compiler: -- vs2019 -m2w64_c_compiler: -- m2w64-toolchain -m2w64_cxx_compiler: -- m2w64-toolchain -target_platform: -- win-64 -zip_keys: -- - cuda_compiler - - cuda_compiler_version diff --git a/README.md b/README.md index dbbb8ddc..0da9fea6 100644 --- a/README.md +++ b/README.md @@ -131,13 +131,6 @@ Current build status variant - - win_64_cuda_compilernvcccuda_compiler_version11.8 - - - variant - - From 8120e401569ae5911fdc32f8e8d182d3d6c503ef Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Wed, 17 Jul 2024 13:28:51 -0700 Subject: [PATCH 031/121] Add missing_dso_whitelist for R package specifically --- recipe/meta.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3c032f23..96034f37 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -168,6 +168,10 @@ outputs: string: {{ string_prefix }}_r{{ r_base | replace('.', '') }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} rpaths: - lib/R/lib + missing_dso_whitelist: + # Conda-build raises the missing `ld64.so.2` linkage erroneously. + # xref: https://github.com/conda/conda-build/issues/5403 + - $RPATH/ld64.so.2 # [ppc64le] requirements: build: - {{ compiler('m2w64_c') }} # [win] From 0bef94b0c936489950f4ffc542cbcefe0a00d708 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 18 Jul 2024 12:36:11 -0700 Subject: [PATCH 032/121] Relax exact pins to `x.x.x` --- recipe/meta.yaml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 96034f37..05291973 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -100,13 +100,13 @@ outputs: - cross-python_{{ target_platform }} # [build_platform != target_platform] host: - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} - - {{ pin_subpackage('_py-xgboost-mutex', exact=True) }} + - {{ pin_subpackage('_py-xgboost-mutex', max_pin='x.x.x') }} - python - hatchling >=1.12.1 - pip run: - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} - - {{ pin_subpackage('_py-xgboost-mutex', exact=True) }} + - {{ pin_subpackage('_py-xgboost-mutex', max_pin='x.x.x') }} - python - numpy - scipy @@ -124,10 +124,10 @@ outputs: requirements: host: - python - - {{ pin_subpackage('py-xgboost', exact=True) }} + - {{ pin_subpackage('py-xgboost', max_pin='x.x.x') }} run: - python - - {{ pin_subpackage('py-xgboost', exact=True) }} + - {{ pin_subpackage('py-xgboost', max_pin='x.x.x') }} - name: py-xgboost-gpu build: @@ -136,10 +136,10 @@ outputs: requirements: host: - python - - {{ pin_subpackage('py-xgboost', exact=True) }} + - {{ pin_subpackage('py-xgboost', max_pin='x.x.x') }} run: - python - - {{ pin_subpackage('py-xgboost', exact=True) }} + - {{ pin_subpackage('py-xgboost', max_pin='x.x.x') }} - __cuda # [cuda_compiler != "None"] - name: xgboost @@ -149,10 +149,10 @@ outputs: requirements: host: - python - - {{ pin_subpackage('py-xgboost', exact=True) }} + - {{ pin_subpackage('py-xgboost', max_pin='x.x.x') }} run: - python - - {{ pin_subpackage('py-xgboost', exact=True) }} + - {{ pin_subpackage('py-xgboost', max_pin='x.x.x') }} - __cuda # [cuda_compiler != "None"] - name: _r-xgboost-mutex @@ -195,7 +195,7 @@ outputs: - r-knitr # [build_platform != target_platform] host: - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} - - {{ pin_subpackage('_r-xgboost-mutex', exact=True) }} + - {{ pin_subpackage('_r-xgboost-mutex', max_pin='x.x.x') }} - r-base - r-matrix - r-data.table @@ -204,7 +204,7 @@ outputs: - r-knitr run: - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} - - {{ pin_subpackage('_r-xgboost-mutex', exact=True) }} + - {{ pin_subpackage('_r-xgboost-mutex', max_pin='x.x.x') }} - r-base - r-matrix - r-data.table @@ -224,10 +224,10 @@ outputs: requirements: host: - r-base - - {{ pin_subpackage('r-xgboost', exact=True) }} + - {{ pin_subpackage('r-xgboost', max_pin='x.x.x') }} run: - r-base - - {{ pin_subpackage('r-xgboost', exact=True) }} + - {{ pin_subpackage('r-xgboost', max_pin='x.x.x') }} - name: r-xgboost-gpu build: @@ -236,10 +236,10 @@ outputs: requirements: host: - r-base - - {{ pin_subpackage('r-xgboost', exact=True) }} + - {{ pin_subpackage('r-xgboost', max_pin='x.x.x') }} run: - r-base - - {{ pin_subpackage('r-xgboost', exact=True) }} + - {{ pin_subpackage('r-xgboost', max_pin='x.x.x') }} - __cuda # [cuda_compiler != "None"] about: From ca09d1c6ce0154d7e73dff866e861a2a57761fba Mon Sep 17 00:00:00 2001 From: jakirkham Date: Thu, 18 Jul 2024 14:00:21 -0700 Subject: [PATCH 033/121] Revert "Relax exact pins to `x.x.x`" This reverts commit 0bef94b0c936489950f4ffc542cbcefe0a00d708. --- recipe/meta.yaml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 05291973..96034f37 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -100,13 +100,13 @@ outputs: - cross-python_{{ target_platform }} # [build_platform != target_platform] host: - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} - - {{ pin_subpackage('_py-xgboost-mutex', max_pin='x.x.x') }} + - {{ pin_subpackage('_py-xgboost-mutex', exact=True) }} - python - hatchling >=1.12.1 - pip run: - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} - - {{ pin_subpackage('_py-xgboost-mutex', max_pin='x.x.x') }} + - {{ pin_subpackage('_py-xgboost-mutex', exact=True) }} - python - numpy - scipy @@ -124,10 +124,10 @@ outputs: requirements: host: - python - - {{ pin_subpackage('py-xgboost', max_pin='x.x.x') }} + - {{ pin_subpackage('py-xgboost', exact=True) }} run: - python - - {{ pin_subpackage('py-xgboost', max_pin='x.x.x') }} + - {{ pin_subpackage('py-xgboost', exact=True) }} - name: py-xgboost-gpu build: @@ -136,10 +136,10 @@ outputs: requirements: host: - python - - {{ pin_subpackage('py-xgboost', max_pin='x.x.x') }} + - {{ pin_subpackage('py-xgboost', exact=True) }} run: - python - - {{ pin_subpackage('py-xgboost', max_pin='x.x.x') }} + - {{ pin_subpackage('py-xgboost', exact=True) }} - __cuda # [cuda_compiler != "None"] - name: xgboost @@ -149,10 +149,10 @@ outputs: requirements: host: - python - - {{ pin_subpackage('py-xgboost', max_pin='x.x.x') }} + - {{ pin_subpackage('py-xgboost', exact=True) }} run: - python - - {{ pin_subpackage('py-xgboost', max_pin='x.x.x') }} + - {{ pin_subpackage('py-xgboost', exact=True) }} - __cuda # [cuda_compiler != "None"] - name: _r-xgboost-mutex @@ -195,7 +195,7 @@ outputs: - r-knitr # [build_platform != target_platform] host: - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} - - {{ pin_subpackage('_r-xgboost-mutex', max_pin='x.x.x') }} + - {{ pin_subpackage('_r-xgboost-mutex', exact=True) }} - r-base - r-matrix - r-data.table @@ -204,7 +204,7 @@ outputs: - r-knitr run: - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} - - {{ pin_subpackage('_r-xgboost-mutex', max_pin='x.x.x') }} + - {{ pin_subpackage('_r-xgboost-mutex', exact=True) }} - r-base - r-matrix - r-data.table @@ -224,10 +224,10 @@ outputs: requirements: host: - r-base - - {{ pin_subpackage('r-xgboost', max_pin='x.x.x') }} + - {{ pin_subpackage('r-xgboost', exact=True) }} run: - r-base - - {{ pin_subpackage('r-xgboost', max_pin='x.x.x') }} + - {{ pin_subpackage('r-xgboost', exact=True) }} - name: r-xgboost-gpu build: @@ -236,10 +236,10 @@ outputs: requirements: host: - r-base - - {{ pin_subpackage('r-xgboost', max_pin='x.x.x') }} + - {{ pin_subpackage('r-xgboost', exact=True) }} run: - r-base - - {{ pin_subpackage('r-xgboost', max_pin='x.x.x') }} + - {{ pin_subpackage('r-xgboost', exact=True) }} - __cuda # [cuda_compiler != "None"] about: From e4275805139d51a65d6ca093695aaed74b599329 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 19 Jul 2024 18:25:52 -0700 Subject: [PATCH 034/121] Test `libxgboost` library is installed --- recipe/meta.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 96034f37..acb0cbce 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -74,6 +74,11 @@ outputs: {% if (cuda_compiler_version or "").startswith("11") %} - cuda-version >=11.2,<12 {% endif %} + test: + commands: + - test -f "${PREFIX}/lib/libxgboost${SHLIB_EXT}" # [unix] + - if not exist %LIBRARY_BIN%/xgboost.dll exit 1 # [win] + - if not exist %LIBRARY_LIB%/xgboost.lib exit 1 # [win] - name: _py-xgboost-mutex version: 2.0 From 80f24566e239bbbebbc686f79c6c62ff950ef66f Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 19 Jul 2024 18:28:27 -0700 Subject: [PATCH 035/121] Test `xgboost` can be `import`ed --- recipe/meta.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index acb0cbce..0a9a71d1 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -159,6 +159,9 @@ outputs: - python - {{ pin_subpackage('py-xgboost', exact=True) }} - __cuda # [cuda_compiler != "None"] + test: + imports: + - xgboost - name: _r-xgboost-mutex version: 2.0 From 9e3a2c207b87f6a51147dbedacb6a04498d4c97a Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 19 Jul 2024 18:36:40 -0700 Subject: [PATCH 036/121] Add mutex no-op tests These are metapackages with nothing really to test. So add a no-op test for the linter to ignore. --- recipe/meta.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0a9a71d1..349df88b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -84,6 +84,9 @@ outputs: version: 2.0 build: string: {{ "cpu" if cuda_compiler == "None" else "gpu" }}_0 + test: + commands: + - exit 0 - name: py-xgboost script: install-py-xgboost.sh # [not win] @@ -167,6 +170,9 @@ outputs: version: 2.0 build: string: {{ "cpu" if cuda_compiler == "None" else "gpu" }}_0 + test: + commands: + - exit 0 - name: r-xgboost script: install-r-xgboost.sh # [not win] From e2fa757783157f3247c9e06ed37db50fa934b941 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 19 Jul 2024 18:37:31 -0700 Subject: [PATCH 037/121] Add Python `import` tests There is more testing in the `py-xgboost` package. So in these other packages depending on `py-xgboost`, just test that they can `import xgboost` and nothing more. --- recipe/meta.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 349df88b..9e34b0da 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -136,6 +136,9 @@ outputs: run: - python - {{ pin_subpackage('py-xgboost', exact=True) }} + test: + imports: + - xgboost - name: py-xgboost-gpu build: @@ -149,6 +152,9 @@ outputs: - python - {{ pin_subpackage('py-xgboost', exact=True) }} - __cuda # [cuda_compiler != "None"] + test: + imports: + - xgboost - name: xgboost build: From fc11ee2f5849713486d18efd87f83fa163dff938 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 19 Jul 2024 18:38:44 -0700 Subject: [PATCH 038/121] Add R equivalent of `import` tests There is more testing in `r-xgboost`. So for these other R packages that depend on `r-xgboost`, just do the equivalent of a Python `import` test. --- recipe/meta.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9e34b0da..ad666743 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -248,6 +248,10 @@ outputs: run: - r-base - {{ pin_subpackage('r-xgboost', exact=True) }} + test: + commands: + - $R -e "library('xgboost')" # [unix] + - "\"%R%\" -e \"library('xgboost')\"" # [win] - name: r-xgboost-gpu build: @@ -261,6 +265,10 @@ outputs: - r-base - {{ pin_subpackage('r-xgboost', exact=True) }} - __cuda # [cuda_compiler != "None"] + test: + commands: + - $R -e "library('xgboost')" # [unix] + - "\"%R%\" -e \"library('xgboost')\"" # [win] about: home: https://github.com/dmlc/xgboost From 0d72bbed9387e47dc5c917c158c29da242c5a07c Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 19 Jul 2024 19:06:10 -0700 Subject: [PATCH 039/121] Fix Windows `libxgboost` tests --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ad666743..309bf317 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -77,8 +77,8 @@ outputs: test: commands: - test -f "${PREFIX}/lib/libxgboost${SHLIB_EXT}" # [unix] - - if not exist %LIBRARY_BIN%/xgboost.dll exit 1 # [win] - - if not exist %LIBRARY_LIB%/xgboost.lib exit 1 # [win] + - if not exist %LIBRARY_BIN%\xgboost.dll exit 1 # [win] + - if not exist %LIBRARY_LIB%\xgboost.lib exit 1 # [win] - name: _py-xgboost-mutex version: 2.0 From fd3194ca23bc2bbd8e5ac988069c68e2a6a29bb6 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 19 Jul 2024 19:41:36 -0700 Subject: [PATCH 040/121] Use `PREFIX` in Windows `libxgboost` tests --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 309bf317..cb4c8231 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -76,9 +76,9 @@ outputs: {% endif %} test: commands: - - test -f "${PREFIX}/lib/libxgboost${SHLIB_EXT}" # [unix] - - if not exist %LIBRARY_BIN%\xgboost.dll exit 1 # [win] - - if not exist %LIBRARY_LIB%\xgboost.lib exit 1 # [win] + - test -f "${PREFIX}/lib/libxgboost${SHLIB_EXT}" # [unix] + - if not exist %PREFIX%\Library\bin\xgboost.dll exit 1 # [win] + - if not exist %PREFIX%\Library\lib\xgboost.lib exit 1 # [win] - name: _py-xgboost-mutex version: 2.0 From e381bfa01efd7802a8b6c56af9e4596b3f800f55 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 19 Jul 2024 19:45:47 -0700 Subject: [PATCH 041/121] Test MinGW path for `libxgboost` on Windows --- recipe/meta.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index cb4c8231..8c730658 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -76,9 +76,8 @@ outputs: {% endif %} test: commands: - - test -f "${PREFIX}/lib/libxgboost${SHLIB_EXT}" # [unix] - - if not exist %PREFIX%\Library\bin\xgboost.dll exit 1 # [win] - - if not exist %PREFIX%\Library\lib\xgboost.lib exit 1 # [win] + - test -f "${PREFIX}/lib/libxgboost${SHLIB_EXT}" # [unix] + - if not exist %LIBRARY_PREFIX%\mingw-w64\bin\xgboost.dll exit 1 # [win] - name: _py-xgboost-mutex version: 2.0 From 4b1596434e12631fc62c5c842d364b9cba60e547 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 19 Jul 2024 19:46:39 -0700 Subject: [PATCH 042/121] Try Windows CUDA 11.8 again --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8c730658..8a02ddec 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,7 +23,7 @@ source: build: number: {{ build_number }} - skip: True # [cuda_compiler_version == "11.8" and win] + # skip: True # [cuda_compiler_version == "11.8" and win] requirements: build: From bda415f548be1f89f8ae56d4178178e4ad43fc0b Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Sat, 20 Jul 2024 02:50:45 +0000 Subject: [PATCH 043/121] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and conda-forge-pinning 2024.07.19.18.26.47 --- .azure-pipelines/azure-pipelines-win.yml | 3 +++ ...compilernvcccuda_compiler_version11.8.yaml | 23 +++++++++++++++++++ README.md | 7 ++++++ 3 files changed, 33 insertions(+) create mode 100644 .ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index dc397b73..6f521937 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -14,6 +14,9 @@ jobs: win_64_cuda_compilercuda-nvcccuda_compiler_version12.0: CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.0 UPLOAD_PACKAGES: 'True' + win_64_cuda_compilernvcccuda_compiler_version11.8: + CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.8 + UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml new file mode 100644 index 00000000..dd81f582 --- /dev/null +++ b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml @@ -0,0 +1,23 @@ +c_compiler: +- vs2019 +c_stdlib: +- vs +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.8' +cxx_compiler: +- vs2019 +m2w64_c_compiler: +- m2w64-toolchain +m2w64_cxx_compiler: +- m2w64-toolchain +target_platform: +- win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version diff --git a/README.md b/README.md index 0da9fea6..dbbb8ddc 100644 --- a/README.md +++ b/README.md @@ -131,6 +131,13 @@ Current build status variant + + win_64_cuda_compilernvcccuda_compiler_version11.8 + + + variant + + From bde32c537add6ca2b16e6c5e08b87687b7123db3 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 19 Jul 2024 19:57:51 -0700 Subject: [PATCH 044/121] Skip NVCC Windows environment activation https://docs.nvidia.com/cuda/archive/12.5.0/cuda-compiler-driver-nvcc/index.html#use-local-env-use-local-env --- recipe/bld.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index c26b2438..b2cd6c68 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -3,6 +3,7 @@ pushd "%SRC_DIR%"\build if NOT "%cuda_compiler_version%"=="None" ( set "CMAKE_ARGS=-DUSE_CUDA=ON %CMAKE_ARGS%" + set "NVCC_APPEND_FLAGS=%NVCC_APPEND_FLAGS% --use-local-env" ) cmake -G "Ninja" ^ From 9d2eadf97d140ee79f1e0760f2542bdf66fc40c9 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 19 Jul 2024 21:33:28 -0700 Subject: [PATCH 045/121] Revert "Skip NVCC Windows environment activation" This reverts commit bde32c537add6ca2b16e6c5e08b87687b7123db3. --- recipe/bld.bat | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index b2cd6c68..c26b2438 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -3,7 +3,6 @@ pushd "%SRC_DIR%"\build if NOT "%cuda_compiler_version%"=="None" ( set "CMAKE_ARGS=-DUSE_CUDA=ON %CMAKE_ARGS%" - set "NVCC_APPEND_FLAGS=%NVCC_APPEND_FLAGS% --use-local-env" ) cmake -G "Ninja" ^ From 98d8ba26af235e6bf2ab060df42b98411a14885a Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 19 Jul 2024 21:46:43 -0700 Subject: [PATCH 046/121] Lower case `not` in `bld.bat` --- recipe/bld.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index c26b2438..9bd7afc4 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -1,7 +1,7 @@ mkdir "%SRC_DIR%"\build pushd "%SRC_DIR%"\build -if NOT "%cuda_compiler_version%"=="None" ( +if not "%cuda_compiler_version%"=="None" ( set "CMAKE_ARGS=-DUSE_CUDA=ON %CMAKE_ARGS%" ) From a3eec4dcabbe25aec9d99a2ef9f752bd50d0b531 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 19 Jul 2024 21:47:40 -0700 Subject: [PATCH 047/121] Space out `==` in `bld.bat` --- recipe/bld.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 9bd7afc4..8e5ca352 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -1,7 +1,7 @@ mkdir "%SRC_DIR%"\build pushd "%SRC_DIR%"\build -if not "%cuda_compiler_version%"=="None" ( +if not "%cuda_compiler_version%" == "None" ( set "CMAKE_ARGS=-DUSE_CUDA=ON %CMAKE_ARGS%" ) From 16938dd7a10c7c2f8ff5fdfe502885010de506e7 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 19 Jul 2024 21:54:52 -0700 Subject: [PATCH 048/121] Pass `WIN32_LEAN_AND_MEAN` on CUDA 11.8 --- recipe/bld.bat | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index 8e5ca352..52121901 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -3,6 +3,11 @@ pushd "%SRC_DIR%"\build if not "%cuda_compiler_version%" == "None" ( set "CMAKE_ARGS=-DUSE_CUDA=ON %CMAKE_ARGS%" + + :: Workaround CUB build errors on CUDA 11.8 + if not "%cuda_compiler_version%" == "11.8" ( + set "CXXFLAGS=%CXXFLAGS% -DWIN32_LEAN_AND_MEAN" + ) ) cmake -G "Ninja" ^ From 5cae8effb241f92a1f60ee15a975640eab9cfb42 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 19 Jul 2024 22:12:00 -0700 Subject: [PATCH 049/121] Pass `WIN32_LEAN_AND_MEAN` to `nvcc` directly --- recipe/bld.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 52121901..edbb61b7 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -6,7 +6,7 @@ if not "%cuda_compiler_version%" == "None" ( :: Workaround CUB build errors on CUDA 11.8 if not "%cuda_compiler_version%" == "11.8" ( - set "CXXFLAGS=%CXXFLAGS% -DWIN32_LEAN_AND_MEAN" + set "NVCC_APPEND_FLAGS=%NVCC_APPEND_FLAGS% /DWIN32_LEAN_AND_MEAN" ) ) From 114cce3f00904497670d966f8b527c461cfe556b Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 19 Jul 2024 22:14:28 -0700 Subject: [PATCH 050/121] Try `-D` instead of `/D` --- recipe/bld.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index edbb61b7..a3af14af 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -6,7 +6,7 @@ if not "%cuda_compiler_version%" == "None" ( :: Workaround CUB build errors on CUDA 11.8 if not "%cuda_compiler_version%" == "11.8" ( - set "NVCC_APPEND_FLAGS=%NVCC_APPEND_FLAGS% /DWIN32_LEAN_AND_MEAN" + set "NVCC_APPEND_FLAGS=%NVCC_APPEND_FLAGS% -DWIN32_LEAN_AND_MEAN" ) ) From 8b1604a3dbf365416ddd07dbec13c2acfc99ae15 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 19 Jul 2024 22:50:13 -0700 Subject: [PATCH 051/121] Use `CXXFLAGS` on Windows --- recipe/bld.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index a3af14af..52121901 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -6,7 +6,7 @@ if not "%cuda_compiler_version%" == "None" ( :: Workaround CUB build errors on CUDA 11.8 if not "%cuda_compiler_version%" == "11.8" ( - set "NVCC_APPEND_FLAGS=%NVCC_APPEND_FLAGS% -DWIN32_LEAN_AND_MEAN" + set "CXXFLAGS=%CXXFLAGS% -DWIN32_LEAN_AND_MEAN" ) ) From 1979c786aa020c488be916f1f5993882030af4ba Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 19 Jul 2024 22:57:20 -0700 Subject: [PATCH 052/121] Use cross-python more consistently --- recipe/meta.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8a02ddec..5f66074f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -129,6 +129,9 @@ outputs: noarch: python skip: True # [cuda_compiler != "None"] requirements: + build: + - python # [build_platform != target_platform] + - cross-python_{{ target_platform }} # [build_platform != target_platform] host: - python - {{ pin_subpackage('py-xgboost', exact=True) }} @@ -144,6 +147,9 @@ outputs: noarch: python skip: True # [cuda_compiler == "None"] requirements: + build: + - python # [build_platform != target_platform] + - cross-python_{{ target_platform }} # [build_platform != target_platform] host: - python - {{ pin_subpackage('py-xgboost', exact=True) }} @@ -160,6 +166,9 @@ outputs: noarch: python string: {{ string_prefix }}_pyh{{ PKG_HASH }}_{{ PKG_BUILDNUM }} requirements: + build: + - python # [build_platform != target_platform] + - cross-python_{{ target_platform }} # [build_platform != target_platform] host: - python - {{ pin_subpackage('py-xgboost', exact=True) }} From f12967ae65f3b8b3c1d03b026b4440795881ece7 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 19 Jul 2024 23:24:16 -0700 Subject: [PATCH 053/121] Drop extra space --- recipe/install-py-xgboost.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/install-py-xgboost.sh b/recipe/install-py-xgboost.sh index ee992d49..ffb96347 100644 --- 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 From 23ba9f370775c3c0682d48922d4f7d0722a1a2db Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 19 Jul 2024 23:26:39 -0700 Subject: [PATCH 054/121] Use `python` instead of env var --- recipe/install-py-xgboost.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/install-py-xgboost.sh b/recipe/install-py-xgboost.sh index ffb96347..9fd94daa 100644 --- 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 From 1487cfb2de179d8822afead653d7571079eccc24 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 19 Jul 2024 23:27:07 -0700 Subject: [PATCH 055/121] Move `test/script` after `test/imports` --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5f66074f..d6dc475c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -120,9 +120,9 @@ outputs: - scikit-learn - __cuda # [cuda_compiler != "None"] test: - script: test-py-xgboost.py imports: - xgboost + script: test-py-xgboost.py - name: py-xgboost-cpu build: From 4ecdf2f8cfc67f931fe28116f14fa193927795e5 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Sat, 20 Jul 2024 00:02:00 -0700 Subject: [PATCH 056/121] Require Python 3.8+ --- recipe/meta.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d6dc475c..db0d2fc5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -108,13 +108,13 @@ outputs: host: - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} - {{ pin_subpackage('_py-xgboost-mutex', exact=True) }} - - python + - python >=3.8 - hatchling >=1.12.1 - pip run: - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} - {{ pin_subpackage('_py-xgboost-mutex', exact=True) }} - - python + - python >=3.8 - numpy - scipy - scikit-learn @@ -133,10 +133,10 @@ outputs: - python # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] host: - - python + - python >=3.8 - {{ pin_subpackage('py-xgboost', exact=True) }} run: - - python + - python >=3.8 - {{ pin_subpackage('py-xgboost', exact=True) }} test: imports: @@ -151,10 +151,10 @@ outputs: - python # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] host: - - python + - python >=3.8 - {{ pin_subpackage('py-xgboost', exact=True) }} run: - - python + - python >=3.8 - {{ pin_subpackage('py-xgboost', exact=True) }} - __cuda # [cuda_compiler != "None"] test: @@ -170,10 +170,10 @@ outputs: - python # [build_platform != target_platform] - cross-python_{{ target_platform }} # [build_platform != target_platform] host: - - python + - python >=3.8 - {{ pin_subpackage('py-xgboost', exact=True) }} run: - - python + - python >=3.8 - {{ pin_subpackage('py-xgboost', exact=True) }} - __cuda # [cuda_compiler != "None"] test: From 297ec13c7ec9308d3472f01e0beebdd90e1363e4 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Sat, 20 Jul 2024 00:06:03 -0700 Subject: [PATCH 057/121] Drop cross-python throughout --- recipe/meta.yaml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index db0d2fc5..f2761dfe 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -102,9 +102,6 @@ outputs: - PIP_CACHE_DIR=pip_cache - PIP_NO_INDEX=True requirements: - build: - - python # [build_platform != target_platform] - - cross-python_{{ target_platform }} # [build_platform != target_platform] host: - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} - {{ pin_subpackage('_py-xgboost-mutex', exact=True) }} @@ -129,9 +126,6 @@ outputs: noarch: python skip: True # [cuda_compiler != "None"] requirements: - build: - - python # [build_platform != target_platform] - - cross-python_{{ target_platform }} # [build_platform != target_platform] host: - python >=3.8 - {{ pin_subpackage('py-xgboost', exact=True) }} @@ -147,9 +141,6 @@ outputs: noarch: python skip: True # [cuda_compiler == "None"] requirements: - build: - - python # [build_platform != target_platform] - - cross-python_{{ target_platform }} # [build_platform != target_platform] host: - python >=3.8 - {{ pin_subpackage('py-xgboost', exact=True) }} @@ -166,9 +157,6 @@ outputs: noarch: python string: {{ string_prefix }}_pyh{{ PKG_HASH }}_{{ PKG_BUILDNUM }} requirements: - build: - - python # [build_platform != target_platform] - - cross-python_{{ target_platform }} # [build_platform != target_platform] host: - python >=3.8 - {{ pin_subpackage('py-xgboost', exact=True) }} From 0e90c760b3555080401909827c86738275bb1682 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Sat, 20 Jul 2024 00:45:18 -0700 Subject: [PATCH 058/121] Explicitly require Python & R in respective tests --- recipe/meta.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f2761dfe..07f3cf40 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -117,6 +117,8 @@ outputs: - scikit-learn - __cuda # [cuda_compiler != "None"] test: + requires: + - python imports: - xgboost script: test-py-xgboost.py @@ -133,6 +135,8 @@ outputs: - python >=3.8 - {{ pin_subpackage('py-xgboost', exact=True) }} test: + requires: + - python imports: - xgboost @@ -149,6 +153,8 @@ outputs: - {{ pin_subpackage('py-xgboost', exact=True) }} - __cuda # [cuda_compiler != "None"] test: + requires: + - python imports: - xgboost @@ -165,6 +171,8 @@ outputs: - {{ pin_subpackage('py-xgboost', exact=True) }} - __cuda # [cuda_compiler != "None"] test: + requires: + - python imports: - xgboost @@ -228,6 +236,8 @@ outputs: - r-jsonlite - __cuda # [cuda_compiler != "None"] test: + requires: + - r-base files: - test-r-xgboost.r commands: @@ -245,6 +255,8 @@ outputs: - r-base - {{ pin_subpackage('r-xgboost', exact=True) }} test: + requires: + - r-base commands: - $R -e "library('xgboost')" # [unix] - "\"%R%\" -e \"library('xgboost')\"" # [win] @@ -262,6 +274,8 @@ outputs: - {{ pin_subpackage('r-xgboost', exact=True) }} - __cuda # [cuda_compiler != "None"] test: + requires: + - r-base commands: - $R -e "library('xgboost')" # [unix] - "\"%R%\" -e \"library('xgboost')\"" # [win] From 6c4122d4fa8a8f29036075582f9152c2c8dcb65e Mon Sep 17 00:00:00 2001 From: jakirkham Date: Sat, 20 Jul 2024 00:52:50 -0700 Subject: [PATCH 059/121] Add `WIN32_LEAN_AND_MEAN` to nvcc flags too --- recipe/bld.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index 52121901..d83dde86 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -7,6 +7,7 @@ if not "%cuda_compiler_version%" == "None" ( :: Workaround CUB build errors on CUDA 11.8 if not "%cuda_compiler_version%" == "11.8" ( set "CXXFLAGS=%CXXFLAGS% -DWIN32_LEAN_AND_MEAN" + set "NVCC_APPEND_FLAGS=%NVCC_APPEND_FLAGS% -DWIN32_LEAN_AND_MEAN" ) ) From c91ed93e8e5078870c726d329080cc6017e2381a Mon Sep 17 00:00:00 2001 From: jakirkham Date: Sat, 20 Jul 2024 00:55:07 -0700 Subject: [PATCH 060/121] Revert to `PYTHON` env var --- recipe/install-py-xgboost.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/install-py-xgboost.sh b/recipe/install-py-xgboost.sh index 9fd94daa..ffb96347 100644 --- 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 From 170d9c45c9a255dcb1d74d1a72ed6d8adce6ec3a Mon Sep 17 00:00:00 2001 From: jakirkham Date: Sat, 20 Jul 2024 01:02:28 -0700 Subject: [PATCH 061/121] Add `CUDAFLAGS` on Windows too --- recipe/bld.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index d83dde86..c00cab03 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -7,6 +7,7 @@ if not "%cuda_compiler_version%" == "None" ( :: Workaround CUB build errors on CUDA 11.8 if not "%cuda_compiler_version%" == "11.8" ( set "CXXFLAGS=%CXXFLAGS% -DWIN32_LEAN_AND_MEAN" + set "CUDAFLAGS=%CUDAFLAGS% -DWIN32_LEAN_AND_MEAN" set "NVCC_APPEND_FLAGS=%NVCC_APPEND_FLAGS% -DWIN32_LEAN_AND_MEAN" ) ) From 0a70b12a800b7559ef1bf4e6c331e0c75968a793 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Sat, 20 Jul 2024 01:33:36 -0700 Subject: [PATCH 062/121] Fix Windows CUDA 11.8 check --- recipe/bld.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index c00cab03..e92875ff 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -5,7 +5,7 @@ if not "%cuda_compiler_version%" == "None" ( set "CMAKE_ARGS=-DUSE_CUDA=ON %CMAKE_ARGS%" :: Workaround CUB build errors on CUDA 11.8 - if not "%cuda_compiler_version%" == "11.8" ( + if "%cuda_compiler_version%" == "11.8" ( set "CXXFLAGS=%CXXFLAGS% -DWIN32_LEAN_AND_MEAN" set "CUDAFLAGS=%CUDAFLAGS% -DWIN32_LEAN_AND_MEAN" set "NVCC_APPEND_FLAGS=%NVCC_APPEND_FLAGS% -DWIN32_LEAN_AND_MEAN" From 80e51a2e0444f591a94be0099899cf3e1181a8f0 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Sat, 20 Jul 2024 03:05:19 -0700 Subject: [PATCH 063/121] Use only `CUDAFLAGS` to set `WIN32_LEAN_AND_MEAN` --- recipe/bld.bat | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index e92875ff..4f2d3d6e 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -6,9 +6,7 @@ if not "%cuda_compiler_version%" == "None" ( :: Workaround CUB build errors on CUDA 11.8 if "%cuda_compiler_version%" == "11.8" ( - set "CXXFLAGS=%CXXFLAGS% -DWIN32_LEAN_AND_MEAN" set "CUDAFLAGS=%CUDAFLAGS% -DWIN32_LEAN_AND_MEAN" - set "NVCC_APPEND_FLAGS=%NVCC_APPEND_FLAGS% -DWIN32_LEAN_AND_MEAN" ) ) From eba7c969dd039777c89ca4fee55f6a8ca77e5848 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Sat, 20 Jul 2024 03:09:29 -0700 Subject: [PATCH 064/121] Add mutex packages first --- recipe/meta.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 07f3cf40..c0fbbd1b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -103,14 +103,14 @@ outputs: - PIP_NO_INDEX=True requirements: host: - - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} - {{ pin_subpackage('_py-xgboost-mutex', exact=True) }} + - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} - python >=3.8 - hatchling >=1.12.1 - pip run: - - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} - {{ pin_subpackage('_py-xgboost-mutex', exact=True) }} + - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} - python >=3.8 - numpy - scipy @@ -218,8 +218,8 @@ outputs: - r-jsonlite # [build_platform != target_platform] - r-knitr # [build_platform != target_platform] host: - - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} - {{ pin_subpackage('_r-xgboost-mutex', exact=True) }} + - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} - r-base - r-matrix - r-data.table @@ -227,8 +227,8 @@ outputs: - r-jsonlite - r-knitr run: - - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} - {{ pin_subpackage('_r-xgboost-mutex', exact=True) }} + - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} - r-base - r-matrix - r-data.table From c637e5fdc83c47a8c17c5c78030d7e06b35daed7 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Sat, 20 Jul 2024 03:10:14 -0700 Subject: [PATCH 065/121] Run test script on native builds only --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c0fbbd1b..d83f5dff 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -121,7 +121,7 @@ outputs: - python imports: - xgboost - script: test-py-xgboost.py + script: test-py-xgboost.py # [build_platform == target_platform] - name: py-xgboost-cpu build: From 1edd47fb59e021d6ccd01f9913c66b5eafa2d7c1 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Sat, 20 Jul 2024 03:13:37 -0700 Subject: [PATCH 066/121] Add `@echo on` to `bld.bat` --- recipe/bld.bat | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index 4f2d3d6e..9dff2d13 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -1,3 +1,5 @@ +@echo on + mkdir "%SRC_DIR%"\build pushd "%SRC_DIR%"\build From c964dd49e7efe25ee2f5b050a78f7b20b65c064b Mon Sep 17 00:00:00 2001 From: jakirkham Date: Sat, 20 Jul 2024 03:15:00 -0700 Subject: [PATCH 067/121] Drop unneeded quotes in `bld.bat` --- recipe/bld.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 9dff2d13..4ebe4f89 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -1,7 +1,7 @@ @echo on -mkdir "%SRC_DIR%"\build -pushd "%SRC_DIR%"\build +mkdir %SRC_DIR%\build +pushd %SRC_DIR%\build if not "%cuda_compiler_version%" == "None" ( set "CMAKE_ARGS=-DUSE_CUDA=ON %CMAKE_ARGS%" From 232b659623cd623df12e84557eecf8138614c0e1 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Sat, 20 Jul 2024 03:16:43 -0700 Subject: [PATCH 068/121] Type CMake args in `bld.bat` --- recipe/bld.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 4ebe4f89..62b2e65a 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -15,9 +15,9 @@ if not "%cuda_compiler_version%" == "None" ( 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 From e0a5290273d63b3e6bd87ce6131deb82c7a530d4 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Sat, 20 Jul 2024 03:56:35 -0700 Subject: [PATCH 069/121] Drop selector from test script --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d83f5dff..c0fbbd1b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -121,7 +121,7 @@ outputs: - python imports: - xgboost - script: test-py-xgboost.py # [build_platform == target_platform] + script: test-py-xgboost.py - name: py-xgboost-cpu build: From ab0501d2225056e9cfc4f863ba2c86ee273d20d3 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Sat, 20 Jul 2024 03:56:57 -0700 Subject: [PATCH 070/121] Test native builds only --- conda-forge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-forge.yml b/conda-forge.yml index 92998234..409be079 100644 --- 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 From a2aaad41541d5473ce37d6f378d3dcd282f47a46 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Sat, 20 Jul 2024 11:12:40 +0000 Subject: [PATCH 071/121] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and conda-forge-pinning 2024.07.19.18.26.47 --- .scripts/build_steps.sh | 3 +-- .scripts/run_win_build.bat | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index ba4b251c..c5dcc648 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -46,11 +46,10 @@ source run_conda_forge_build_setup # make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" -if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]] && [[ "${HOST_PLATFORM}" != linux-* ]] && [[ "${BUILD_WITH_CONDA_DEBUG:-0}" != 1 ]]; then +if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]] && [[ "${BUILD_WITH_CONDA_DEBUG:-0}" != 1 ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - ( endgroup "Configuring conda" ) 2> /dev/null if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 65650bf2..a7e8d062 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -42,9 +42,7 @@ if EXIST LICENSE.txt ( copy LICENSE.txt "recipe\\recipe-scripts-license.txt" ) if NOT [%HOST_PLATFORM%] == [%BUILD_PLATFORM%] ( - if [%CROSSCOMPILING_EMULATOR%] == [] ( - set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" - ) + set "EXTRA_CB_OPTIONS=%EXTRA_CB_OPTIONS% --no-test" ) if NOT [%flow_run_id%] == [] ( From 7e2ccd09683e55edc9845f6358057b5b32956ad6 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Sat, 20 Jul 2024 05:23:55 -0700 Subject: [PATCH 072/121] Readd `cross-python` for building --- recipe/meta.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c0fbbd1b..821a0609 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -102,6 +102,9 @@ outputs: - PIP_CACHE_DIR=pip_cache - PIP_NO_INDEX=True requirements: + build: + - python # [build_platform != target_platform] + - cross-python_{{ target_platform }} # [build_platform != target_platform] host: - {{ pin_subpackage('_py-xgboost-mutex', exact=True) }} - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} From f705ae1ec24124ea241e70a52c983de0f79ab546 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Sat, 20 Jul 2024 05:26:27 -0700 Subject: [PATCH 073/121] Use `cccl` to build `libxgboost` --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 821a0609..42eca860 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -68,6 +68,7 @@ outputs: - llvm-openmp # [osx] - libgomp # [linux] host: + - cccl # [cuda_compiler != "None"] - nccl # [linux and cuda_compiler != "None"] run: - __cuda # [cuda_compiler != "None"] From f8422dedbf256c0c1ac829f7da1781a93b732ce0 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Sat, 20 Jul 2024 05:26:48 -0700 Subject: [PATCH 074/121] Drop Windows CUDA 11.8 workaround --- recipe/bld.bat | 5 ----- 1 file changed, 5 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 62b2e65a..e2348a35 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -5,11 +5,6 @@ pushd %SRC_DIR%\build if not "%cuda_compiler_version%" == "None" ( set "CMAKE_ARGS=-DUSE_CUDA=ON %CMAKE_ARGS%" - - :: Workaround CUB build errors on CUDA 11.8 - if "%cuda_compiler_version%" == "11.8" ( - set "CUDAFLAGS=%CUDAFLAGS% -DWIN32_LEAN_AND_MEAN" - ) ) cmake -G "Ninja" ^ From e0b67b8da5e79a7114e4a49bd1eeb2dc64c1052e Mon Sep 17 00:00:00 2001 From: jakirkham Date: Sat, 20 Jul 2024 05:30:11 -0700 Subject: [PATCH 075/121] Drop commented Windows CUDA 11.8 `skip` --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 42eca860..848bbd81 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,7 +23,6 @@ source: build: number: {{ build_number }} - # skip: True # [cuda_compiler_version == "11.8" and win] requirements: build: From 0d4897a08b803dd67fba86db65bc21733dc82492 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Sat, 20 Jul 2024 05:50:54 -0700 Subject: [PATCH 076/121] Add top-level `noarch: python` to disable matrix --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 848bbd81..d1ee0150 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,6 +23,7 @@ source: build: number: {{ build_number }} + noarch: python requirements: build: From 1b47b5150529c92acad6a3d07bbb7043c366b34b Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Sat, 20 Jul 2024 12:55:10 +0000 Subject: [PATCH 077/121] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and conda-forge-pinning 2024.07.19.18.26.47 --- ...ernvcccuda_compiler_version11.8cxx_compiler_version11.yaml | 4 ---- ...erNonecuda_compiler_versionNonecxx_compiler_version12.yaml | 4 ---- ...a-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml | 4 ---- 3 files changed, 12 deletions(-) diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml index e3ccb914..79b44eaa 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_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/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml index 91102458..ca2c96a8 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_64_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/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml index ca128ee9..772f0755 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_64_c_compiler_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: From c0679447e71290509ac52ebb52de57d7387d3aaf Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Mon, 22 Jul 2024 12:29:54 -0700 Subject: [PATCH 078/121] Apply patch dmlc/xgboost#10624 --- ...e-option-to-build-with-external-CCCL.patch | 62 +++++++++++++++++++ recipe/bld.bat | 2 +- recipe/build.sh | 2 +- recipe/meta.yaml | 1 + 4 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch diff --git a/recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch b/recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch new file mode 100644 index 00000000..1746aeff --- /dev/null +++ b/recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch @@ -0,0 +1,62 @@ +From 6115225b8a7aa6b507169aa774e3edf8284ceeb6 Mon Sep 17 00:00:00 2001 +From: Hyunsu Cho +Date: Mon, 22 Jul 2024 12:20:10 -0700 +Subject: [PATCH] Add CMake option to build with external CCCL + +--- + CMakeLists.txt | 8 ++++++++ + cmake/Utils.cmake | 5 +++++ + 2 files changed, 13 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dc0f7e654..fa48ecec9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -78,6 +78,7 @@ option(USE_NCCL "Build with NCCL to enable distributed GPU support." OFF) + # This is specifically designed for PyPI binary release and should be disabled for most of the cases. + option(USE_DLOPEN_NCCL "Whether to load nccl dynamically." OFF) + option(BUILD_WITH_SHARED_NCCL "Build with shared NCCL library." OFF) ++option(BUILD_WITH_EXTERNAL_CCCL "Build with external CCCL instead of one from CTK" OFF) + + if(USE_CUDA) + if(NOT DEFINED CMAKE_CUDA_ARCHITECTURES AND NOT DEFINED ENV{CUDAARCHS}) +@@ -224,6 +225,10 @@ if(USE_CUDA) + add_subdirectory(${PROJECT_SOURCE_DIR}/gputreeshap) + + find_package(CUDAToolkit REQUIRED) ++ ++ if(BUILD_WITH_EXTERNAL_CCCL) ++ find_package(CCCL REQUIRED CONFIG COMPONENTS cub) ++ endif() + endif() + + if(FORCE_COLORED_OUTPUT AND (CMAKE_GENERATOR STREQUAL "Ninja") AND +@@ -422,6 +427,9 @@ else() + set(INSTALL_TARGETS xgboost) + endif() + endif() ++if(BUILD_WITH_EXTERNAL_CCCL) ++ list(APPEND INSTALL_TARGETS _CUB_CUB _CUB_libcudacxx) ++endif() + + install(TARGETS ${INSTALL_TARGETS} + EXPORT XGBoostTargets +diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake +index 8659df7c3..e8832923b 100644 +--- a/cmake/Utils.cmake ++++ b/cmake/Utils.cmake +@@ -108,6 +108,11 @@ function(xgboost_set_cuda_flags target) + target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_NVTX=1) + endif() + ++ if(BUILD_WITH_EXTERNAL_CCCL) ++ target_compile_definitions(${target} PRIVATE -DTHRUST_IGNORE_CUB_VERSION_CHECK=1) ++ target_link_libraries(${target} PRIVATE CCCL::CUB) ++ endif() ++ + target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_CUDA=1) + target_include_directories( + ${target} PRIVATE +-- +2.45.2 + diff --git a/recipe/bld.bat b/recipe/bld.bat index e2348a35..b71be51a 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -4,7 +4,7 @@ mkdir %SRC_DIR%\build pushd %SRC_DIR%\build if not "%cuda_compiler_version%" == "None" ( - set "CMAKE_ARGS=-DUSE_CUDA=ON %CMAKE_ARGS%" + set "CMAKE_ARGS=-DUSE_CUDA=ON -DBUILD_WITH_EXTERNAL_CCCL=ON %CMAKE_ARGS%" ) cmake -G "Ninja" ^ diff --git a/recipe/build.sh b/recipe/build.sh index 18ee1e4b..cdd4bbe6 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -13,7 +13,7 @@ fi if [[ ${cuda_compiler_version} != "None" ]]; then - XGB_CMAKE_ARGS=(-DUSE_CUDA=ON -DUSE_NCCL=ON -DBUILD_WITH_SHARED_NCCL=ON ${XGB_CMAKE_ARGS[@]+"${XGB_CMAKE_ARGS[@]}"} ) + XGB_CMAKE_ARGS=(-DUSE_CUDA=ON -DUSE_NCCL=ON -DBUILD_WITH_SHARED_NCCL=ON -DBUILD_WITH_EXTERNAL_CCCL=ON ${XGB_CMAKE_ARGS[@]+"${XGB_CMAKE_ARGS[@]}"} ) fi # Limit number of threads used to avoid hardware oversubscription diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d1ee0150..84bbb6aa 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -20,6 +20,7 @@ source: - 0002-Enable-latest-libcxx-on-MacOS.patch # [osx] - 0003-Use-mingw-w64-path.patch - 0004-Undo-dmlc-xgboost-9436.patch + - 0005-Add-CMake-option-to-build-with-external-CCCL.patch build: number: {{ build_number }} From 847d066098108bf40e88d1fb1237eaa04fac05f8 Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Mon, 22 Jul 2024 13:07:25 -0700 Subject: [PATCH 079/121] Update patch --- .../0005-Add-CMake-option-to-build-with-external-CCCL.patch | 6 +++--- recipe/meta.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch b/recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch index 1746aeff..0f42d8dd 100644 --- a/recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch +++ b/recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch @@ -26,7 +26,7 @@ index dc0f7e654..fa48ecec9 100644 find_package(CUDAToolkit REQUIRED) + + if(BUILD_WITH_EXTERNAL_CCCL) -+ find_package(CCCL REQUIRED CONFIG COMPONENTS cub) ++ find_package(CCCL REQUIRED CONFIG) + endif() endif() @@ -36,7 +36,7 @@ index dc0f7e654..fa48ecec9 100644 endif() endif() +if(BUILD_WITH_EXTERNAL_CCCL) -+ list(APPEND INSTALL_TARGETS _CUB_CUB _CUB_libcudacxx) ++ list(APPEND INSTALL_TARGETS _CUB_CUB _CUB_libcudacxx _Thrust_libcudacxx) +endif() install(TARGETS ${INSTALL_TARGETS} @@ -51,7 +51,7 @@ index 8659df7c3..e8832923b 100644 + if(BUILD_WITH_EXTERNAL_CCCL) + target_compile_definitions(${target} PRIVATE -DTHRUST_IGNORE_CUB_VERSION_CHECK=1) -+ target_link_libraries(${target} PRIVATE CCCL::CUB) ++ target_link_libraries(${target} PRIVATE CCCL::CCCL) + endif() + target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_CUDA=1) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 84bbb6aa..6c4e65c5 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -33,6 +33,7 @@ requirements: - {{ compiler('m2w64_c') }} # [win] - {{ compiler('m2w64_cxx') }} # [win] - {{ compiler('cuda') }} # [cuda_compiler != "None" and cuda_compiler_version != "None"] + - cccl # [cuda_compiler != "None"] - {{ stdlib('c') }} - cmake - llvm-openmp # [osx] @@ -69,7 +70,6 @@ outputs: - llvm-openmp # [osx] - libgomp # [linux] host: - - cccl # [cuda_compiler != "None"] - nccl # [linux and cuda_compiler != "None"] run: - __cuda # [cuda_compiler != "None"] From 21f1c9d349fcd7fc2f3a2ecd948e0f7b2e20eea4 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Mon, 22 Jul 2024 13:50:12 -0700 Subject: [PATCH 080/121] Move `cccl` to `host` --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6c4e65c5..f8279769 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -33,13 +33,13 @@ requirements: - {{ compiler('m2w64_c') }} # [win] - {{ compiler('m2w64_cxx') }} # [win] - {{ compiler('cuda') }} # [cuda_compiler != "None" and cuda_compiler_version != "None"] - - cccl # [cuda_compiler != "None"] - {{ stdlib('c') }} - cmake - llvm-openmp # [osx] - libgomp # [linux] - ninja host: + - cccl # [cuda_compiler != "None"] - nccl # [linux and cuda_compiler != "None"] outputs: From f15daa3bd4fa19b17d6437da0bb458464bf0f782 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Mon, 22 Jul 2024 15:19:13 -0700 Subject: [PATCH 081/121] Refresh XGBoost CCCL patch --- ...e-option-to-build-with-external-CCCL.patch | 156 ++++++++++++++++-- 1 file changed, 143 insertions(+), 13 deletions(-) diff --git a/recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch b/recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch index 0f42d8dd..42bb8f23 100644 --- a/recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch +++ b/recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch @@ -1,7 +1,7 @@ -From 6115225b8a7aa6b507169aa774e3edf8284ceeb6 Mon Sep 17 00:00:00 2001 +From 1c5957a09f20e9d089e7be1333bf2d3ebbc6232e Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Mon, 22 Jul 2024 12:20:10 -0700 -Subject: [PATCH] Add CMake option to build with external CCCL +Subject: [PATCH 1/4] Add CMake option to build with external CCCL --- CMakeLists.txt | 8 ++++++++ @@ -9,10 +9,10 @@ Subject: [PATCH] Add CMake option to build with external CCCL 2 files changed, 13 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index dc0f7e654..fa48ecec9 100644 +index 034d52164ad2..fb1d82a75318 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -78,6 +78,7 @@ option(USE_NCCL "Build with NCCL to enable distributed GPU support." OFF) +@@ -75,6 +75,7 @@ option(USE_NCCL "Build with NCCL to enable distributed GPU support." OFF) # This is specifically designed for PyPI binary release and should be disabled for most of the cases. option(USE_DLOPEN_NCCL "Whether to load nccl dynamically." OFF) option(BUILD_WITH_SHARED_NCCL "Build with shared NCCL library." OFF) @@ -20,43 +20,173 @@ index dc0f7e654..fa48ecec9 100644 if(USE_CUDA) if(NOT DEFINED CMAKE_CUDA_ARCHITECTURES AND NOT DEFINED ENV{CUDAARCHS}) -@@ -224,6 +225,10 @@ if(USE_CUDA) +@@ -221,6 +222,10 @@ if(USE_CUDA) add_subdirectory(${PROJECT_SOURCE_DIR}/gputreeshap) find_package(CUDAToolkit REQUIRED) + + if(BUILD_WITH_EXTERNAL_CCCL) -+ find_package(CCCL REQUIRED CONFIG) ++ find_package(CCCL REQUIRED CONFIG COMPONENTS cub) + endif() endif() if(FORCE_COLORED_OUTPUT AND (CMAKE_GENERATOR STREQUAL "Ninja") AND -@@ -422,6 +427,9 @@ else() +@@ -427,6 +432,9 @@ else() set(INSTALL_TARGETS xgboost) endif() endif() +if(BUILD_WITH_EXTERNAL_CCCL) -+ list(APPEND INSTALL_TARGETS _CUB_CUB _CUB_libcudacxx _Thrust_libcudacxx) ++ list(APPEND INSTALL_TARGETS _CUB_CUB _CUB_libcudacxx) +endif() install(TARGETS ${INSTALL_TARGETS} EXPORT XGBoostTargets diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake -index 8659df7c3..e8832923b 100644 +index 266cf29b38b2..6926f4f058a4 100644 --- a/cmake/Utils.cmake +++ b/cmake/Utils.cmake -@@ -108,6 +108,11 @@ function(xgboost_set_cuda_flags target) +@@ -104,6 +104,11 @@ function(xgboost_set_cuda_flags target) target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_NVTX=1) endif() + if(BUILD_WITH_EXTERNAL_CCCL) + target_compile_definitions(${target} PRIVATE -DTHRUST_IGNORE_CUB_VERSION_CHECK=1) -+ target_link_libraries(${target} PRIVATE CCCL::CCCL) ++ target_link_libraries(${target} PRIVATE CCCL::CUB) + endif() + target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_CUDA=1) target_include_directories( ${target} PRIVATE --- -2.45.2 +From 9967f449e29e210e7231b540f0f31dc01d25d829 Mon Sep 17 00:00:00 2001 +From: Hyunsu Cho +Date: Mon, 22 Jul 2024 12:51:24 -0700 +Subject: [PATCH 2/4] Use all components + +--- + CMakeLists.txt | 4 ++-- + cmake/Utils.cmake | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fb1d82a75318..27834553d1c5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -224,7 +224,7 @@ if(USE_CUDA) + find_package(CUDAToolkit REQUIRED) + + if(BUILD_WITH_EXTERNAL_CCCL) +- find_package(CCCL REQUIRED CONFIG COMPONENTS cub) ++ find_package(CCCL REQUIRED CONFIG) + endif() + endif() + +@@ -433,7 +433,7 @@ else() + endif() + endif() + if(BUILD_WITH_EXTERNAL_CCCL) +- list(APPEND INSTALL_TARGETS _CUB_CUB _CUB_libcudacxx) ++ list(APPEND INSTALL_TARGETS _CUB_CUB _CUB_libcudacxx _Thrust_libcudacxx) + endif() + + install(TARGETS ${INSTALL_TARGETS} +diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake +index 6926f4f058a4..0a9da310b9a0 100644 +--- a/cmake/Utils.cmake ++++ b/cmake/Utils.cmake +@@ -106,7 +106,7 @@ function(xgboost_set_cuda_flags target) + + if(BUILD_WITH_EXTERNAL_CCCL) + target_compile_definitions(${target} PRIVATE -DTHRUST_IGNORE_CUB_VERSION_CHECK=1) +- target_link_libraries(${target} PRIVATE CCCL::CUB) ++ target_link_libraries(${target} PRIVATE CCCL::CCCL) + endif() + + target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_CUDA=1) + +From 4ac2b39ea81a14e402d513edda6fe0050313638b Mon Sep 17 00:00:00 2001 +From: Hyunsu Cho +Date: Mon, 22 Jul 2024 14:59:01 -0700 +Subject: [PATCH 3/4] Fallback to CTK CCCL + +--- + CMakeLists.txt | 11 ++++++----- + cmake/Utils.cmake | 6 +----- + 2 files changed, 7 insertions(+), 10 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 27834553d1c5..362b00b43cee 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -75,7 +75,6 @@ option(USE_NCCL "Build with NCCL to enable distributed GPU support." OFF) + # This is specifically designed for PyPI binary release and should be disabled for most of the cases. + option(USE_DLOPEN_NCCL "Whether to load nccl dynamically." OFF) + option(BUILD_WITH_SHARED_NCCL "Build with shared NCCL library." OFF) +-option(BUILD_WITH_EXTERNAL_CCCL "Build with external CCCL instead of one from CTK" OFF) + + if(USE_CUDA) + if(NOT DEFINED CMAKE_CUDA_ARCHITECTURES AND NOT DEFINED ENV{CUDAARCHS}) +@@ -222,9 +221,11 @@ if(USE_CUDA) + add_subdirectory(${PROJECT_SOURCE_DIR}/gputreeshap) + + find_package(CUDAToolkit REQUIRED) +- +- if(BUILD_WITH_EXTERNAL_CCCL) +- find_package(CCCL REQUIRED CONFIG) ++ find_package(CCCL) ++ if(NOT CCCL_FOUND) ++ message(STATUS "Standalone CCCL not found. Attempting to use CCCL from CTK...") ++ find_package(CCCL REQUIRED CONFIG ++ PATHS ${CUDAToolkit_LIBRARY_DIR}/cmake/cccl) + endif() + endif() + +@@ -432,7 +433,7 @@ else() + set(INSTALL_TARGETS xgboost) + endif() + endif() +-if(BUILD_WITH_EXTERNAL_CCCL) ++if(USE_CUDA) + list(APPEND INSTALL_TARGETS _CUB_CUB _CUB_libcudacxx _Thrust_libcudacxx) + endif() + +diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake +index 0a9da310b9a0..6ab337a206e3 100644 +--- a/cmake/Utils.cmake ++++ b/cmake/Utils.cmake +@@ -104,11 +104,7 @@ function(xgboost_set_cuda_flags target) + target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_NVTX=1) + endif() + +- if(BUILD_WITH_EXTERNAL_CCCL) +- target_compile_definitions(${target} PRIVATE -DTHRUST_IGNORE_CUB_VERSION_CHECK=1) +- target_link_libraries(${target} PRIVATE CCCL::CCCL) +- endif() +- ++ target_link_libraries(${target} PRIVATE CCCL::CCCL) + target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_CUDA=1) + target_include_directories( + ${target} PRIVATE + +From aea0977da3ad95dfa173200727a2c20284927fac Mon Sep 17 00:00:00 2001 +From: Hyunsu Cho +Date: Mon, 22 Jul 2024 15:02:04 -0700 +Subject: [PATCH 4/4] Use config + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 362b00b43cee..895950cbfb78 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -221,7 +221,7 @@ if(USE_CUDA) + add_subdirectory(${PROJECT_SOURCE_DIR}/gputreeshap) + + find_package(CUDAToolkit REQUIRED) +- find_package(CCCL) ++ find_package(CCCL CONFIG) + if(NOT CCCL_FOUND) + message(STATUS "Standalone CCCL not found. Attempting to use CCCL from CTK...") + find_package(CCCL REQUIRED CONFIG From 8fa589d9522012cc29e0b1acf94009a3d0bd0165 Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Mon, 22 Jul 2024 15:27:58 -0700 Subject: [PATCH 082/121] Squash patch --- ...e-option-to-build-with-external-CCCL.patch | 178 ++---------------- 1 file changed, 19 insertions(+), 159 deletions(-) diff --git a/recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch b/recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch index 42bb8f23..6e51a259 100644 --- a/recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch +++ b/recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch @@ -1,192 +1,52 @@ -From 1c5957a09f20e9d089e7be1333bf2d3ebbc6232e Mon Sep 17 00:00:00 2001 +From 4165b0eb2665d27142d005b5a062ce6d84fe0432 Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Mon, 22 Jul 2024 12:20:10 -0700 -Subject: [PATCH 1/4] Add CMake option to build with external CCCL +Subject: [PATCH] [CMake] Explicitly link with CCCL (standalone or CTK) --- - CMakeLists.txt | 8 ++++++++ - cmake/Utils.cmake | 5 +++++ - 2 files changed, 13 insertions(+) + CMakeLists.txt | 9 +++++++++ + cmake/Utils.cmake | 1 + + 2 files changed, 10 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 034d52164ad2..fb1d82a75318 100644 +index dc0f7e654..8371a45c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -75,6 +75,7 @@ option(USE_NCCL "Build with NCCL to enable distributed GPU support." OFF) - # This is specifically designed for PyPI binary release and should be disabled for most of the cases. - option(USE_DLOPEN_NCCL "Whether to load nccl dynamically." OFF) - option(BUILD_WITH_SHARED_NCCL "Build with shared NCCL library." OFF) -+option(BUILD_WITH_EXTERNAL_CCCL "Build with external CCCL instead of one from CTK" OFF) - - if(USE_CUDA) - if(NOT DEFINED CMAKE_CUDA_ARCHITECTURES AND NOT DEFINED ENV{CUDAARCHS}) -@@ -221,6 +222,10 @@ if(USE_CUDA) - add_subdirectory(${PROJECT_SOURCE_DIR}/gputreeshap) - - find_package(CUDAToolkit REQUIRED) -+ -+ if(BUILD_WITH_EXTERNAL_CCCL) -+ find_package(CCCL REQUIRED CONFIG COMPONENTS cub) -+ endif() - endif() - - if(FORCE_COLORED_OUTPUT AND (CMAKE_GENERATOR STREQUAL "Ninja") AND -@@ -427,6 +432,9 @@ else() - set(INSTALL_TARGETS xgboost) - endif() - endif() -+if(BUILD_WITH_EXTERNAL_CCCL) -+ list(APPEND INSTALL_TARGETS _CUB_CUB _CUB_libcudacxx) -+endif() - - install(TARGETS ${INSTALL_TARGETS} - EXPORT XGBoostTargets -diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake -index 266cf29b38b2..6926f4f058a4 100644 ---- a/cmake/Utils.cmake -+++ b/cmake/Utils.cmake -@@ -104,6 +104,11 @@ function(xgboost_set_cuda_flags target) - target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_NVTX=1) - endif() - -+ if(BUILD_WITH_EXTERNAL_CCCL) -+ target_compile_definitions(${target} PRIVATE -DTHRUST_IGNORE_CUB_VERSION_CHECK=1) -+ target_link_libraries(${target} PRIVATE CCCL::CUB) -+ endif() -+ - target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_CUDA=1) - target_include_directories( - ${target} PRIVATE - -From 9967f449e29e210e7231b540f0f31dc01d25d829 Mon Sep 17 00:00:00 2001 -From: Hyunsu Cho -Date: Mon, 22 Jul 2024 12:51:24 -0700 -Subject: [PATCH 2/4] Use all components - ---- - CMakeLists.txt | 4 ++-- - cmake/Utils.cmake | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fb1d82a75318..27834553d1c5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -224,7 +224,7 @@ if(USE_CUDA) - find_package(CUDAToolkit REQUIRED) - - if(BUILD_WITH_EXTERNAL_CCCL) -- find_package(CCCL REQUIRED CONFIG COMPONENTS cub) -+ find_package(CCCL REQUIRED CONFIG) - endif() - endif() - -@@ -433,7 +433,7 @@ else() - endif() - endif() - if(BUILD_WITH_EXTERNAL_CCCL) -- list(APPEND INSTALL_TARGETS _CUB_CUB _CUB_libcudacxx) -+ list(APPEND INSTALL_TARGETS _CUB_CUB _CUB_libcudacxx _Thrust_libcudacxx) - endif() - - install(TARGETS ${INSTALL_TARGETS} -diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake -index 6926f4f058a4..0a9da310b9a0 100644 ---- a/cmake/Utils.cmake -+++ b/cmake/Utils.cmake -@@ -106,7 +106,7 @@ function(xgboost_set_cuda_flags target) - - if(BUILD_WITH_EXTERNAL_CCCL) - target_compile_definitions(${target} PRIVATE -DTHRUST_IGNORE_CUB_VERSION_CHECK=1) -- target_link_libraries(${target} PRIVATE CCCL::CUB) -+ target_link_libraries(${target} PRIVATE CCCL::CCCL) - endif() - - target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_CUDA=1) - -From 4ac2b39ea81a14e402d513edda6fe0050313638b Mon Sep 17 00:00:00 2001 -From: Hyunsu Cho -Date: Mon, 22 Jul 2024 14:59:01 -0700 -Subject: [PATCH 3/4] Fallback to CTK CCCL - ---- - CMakeLists.txt | 11 ++++++----- - cmake/Utils.cmake | 6 +----- - 2 files changed, 7 insertions(+), 10 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 27834553d1c5..362b00b43cee 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -75,7 +75,6 @@ option(USE_NCCL "Build with NCCL to enable distributed GPU support." OFF) - # This is specifically designed for PyPI binary release and should be disabled for most of the cases. - option(USE_DLOPEN_NCCL "Whether to load nccl dynamically." OFF) - option(BUILD_WITH_SHARED_NCCL "Build with shared NCCL library." OFF) --option(BUILD_WITH_EXTERNAL_CCCL "Build with external CCCL instead of one from CTK" OFF) - - if(USE_CUDA) - if(NOT DEFINED CMAKE_CUDA_ARCHITECTURES AND NOT DEFINED ENV{CUDAARCHS}) -@@ -222,9 +221,11 @@ if(USE_CUDA) +@@ -224,6 +224,12 @@ if(USE_CUDA) add_subdirectory(${PROJECT_SOURCE_DIR}/gputreeshap) find_package(CUDAToolkit REQUIRED) -- -- if(BUILD_WITH_EXTERNAL_CCCL) -- find_package(CCCL REQUIRED CONFIG) -+ find_package(CCCL) ++ find_package(CCCL CONFIG) + if(NOT CCCL_FOUND) + message(STATUS "Standalone CCCL not found. Attempting to use CCCL from CTK...") + find_package(CCCL REQUIRED CONFIG + PATHS ${CUDAToolkit_LIBRARY_DIR}/cmake/cccl) - endif() ++ endif() endif() -@@ -432,7 +433,7 @@ else() + if(FORCE_COLORED_OUTPUT AND (CMAKE_GENERATOR STREQUAL "Ninja") AND +@@ -422,6 +428,9 @@ else() set(INSTALL_TARGETS xgboost) endif() endif() --if(BUILD_WITH_EXTERNAL_CCCL) +if(USE_CUDA) - list(APPEND INSTALL_TARGETS _CUB_CUB _CUB_libcudacxx _Thrust_libcudacxx) - endif() ++ list(APPEND INSTALL_TARGETS _CUB_CUB _CUB_libcudacxx _Thrust_libcudacxx) ++endif() + install(TARGETS ${INSTALL_TARGETS} + EXPORT XGBoostTargets diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake -index 0a9da310b9a0..6ab337a206e3 100644 +index 8659df7c3..01dca611c 100644 --- a/cmake/Utils.cmake +++ b/cmake/Utils.cmake -@@ -104,11 +104,7 @@ function(xgboost_set_cuda_flags target) +@@ -108,6 +108,7 @@ function(xgboost_set_cuda_flags target) target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_NVTX=1) endif() -- if(BUILD_WITH_EXTERNAL_CCCL) -- target_compile_definitions(${target} PRIVATE -DTHRUST_IGNORE_CUB_VERSION_CHECK=1) -- target_link_libraries(${target} PRIVATE CCCL::CCCL) -- endif() -- + target_link_libraries(${target} PRIVATE CCCL::CCCL) target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_CUDA=1) target_include_directories( ${target} PRIVATE +-- +2.34.1 -From aea0977da3ad95dfa173200727a2c20284927fac Mon Sep 17 00:00:00 2001 -From: Hyunsu Cho -Date: Mon, 22 Jul 2024 15:02:04 -0700 -Subject: [PATCH 4/4] Use config - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 362b00b43cee..895950cbfb78 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -221,7 +221,7 @@ if(USE_CUDA) - add_subdirectory(${PROJECT_SOURCE_DIR}/gputreeshap) - - find_package(CUDAToolkit REQUIRED) -- find_package(CCCL) -+ find_package(CCCL CONFIG) - if(NOT CCCL_FOUND) - message(STATUS "Standalone CCCL not found. Attempting to use CCCL from CTK...") - find_package(CCCL REQUIRED CONFIG From d685506e9138fb4ee09cf8642d97e2379321d354 Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Mon, 22 Jul 2024 15:29:01 -0700 Subject: [PATCH 083/121] Remove outdated CMake option --- recipe/bld.bat | 2 +- recipe/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index b71be51a..e2348a35 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -4,7 +4,7 @@ mkdir %SRC_DIR%\build pushd %SRC_DIR%\build if not "%cuda_compiler_version%" == "None" ( - set "CMAKE_ARGS=-DUSE_CUDA=ON -DBUILD_WITH_EXTERNAL_CCCL=ON %CMAKE_ARGS%" + set "CMAKE_ARGS=-DUSE_CUDA=ON %CMAKE_ARGS%" ) cmake -G "Ninja" ^ diff --git a/recipe/build.sh b/recipe/build.sh index cdd4bbe6..18ee1e4b 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -13,7 +13,7 @@ fi if [[ ${cuda_compiler_version} != "None" ]]; then - XGB_CMAKE_ARGS=(-DUSE_CUDA=ON -DUSE_NCCL=ON -DBUILD_WITH_SHARED_NCCL=ON -DBUILD_WITH_EXTERNAL_CCCL=ON ${XGB_CMAKE_ARGS[@]+"${XGB_CMAKE_ARGS[@]}"} ) + XGB_CMAKE_ARGS=(-DUSE_CUDA=ON -DUSE_NCCL=ON -DBUILD_WITH_SHARED_NCCL=ON ${XGB_CMAKE_ARGS[@]+"${XGB_CMAKE_ARGS[@]}"} ) fi # Limit number of threads used to avoid hardware oversubscription From dafc853601ca1a6c3d243d3686fa3793105573eb Mon Sep 17 00:00:00 2001 From: jakirkham Date: Mon, 22 Jul 2024 16:25:31 -0700 Subject: [PATCH 084/121] Remove install targets --- recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch | 3 --- 1 file changed, 3 deletions(-) diff --git a/recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch b/recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch index 6e51a259..4ccb7e38 100644 --- a/recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch +++ b/recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch @@ -29,9 +29,6 @@ index dc0f7e654..8371a45c0 100644 set(INSTALL_TARGETS xgboost) endif() endif() -+if(USE_CUDA) -+ list(APPEND INSTALL_TARGETS _CUB_CUB _CUB_libcudacxx _Thrust_libcudacxx) -+endif() install(TARGETS ${INSTALL_TARGETS} EXPORT XGBoostTargets From c9a3ae927a48c39f20af688347bdf00036d8fe22 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Mon, 22 Jul 2024 16:28:44 -0700 Subject: [PATCH 085/121] Switch to using source tarball Lets us use bot version bumps to keep up-to-date. --- recipe/meta.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f8279769..ac1cfacd 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,10 +10,8 @@ package: version: {{ version }} source: - # we have to use git urls here to get the submodules needed for the - # build - git_url: https://github.com/dmlc/xgboost - git_tag: v{{ version }} + url: https://github.com/dmlc/xgboost/releases/download/v{{ version }}/xgboost-{{ version }}.tar.gz + sha256: 28bec8e821b1fefcea722d96add66024adba399063f723bc5c815f7af4a5f5e4 patches: # xgboost patches - 0001-Force-endian-flag-in-cross-compilation-mode.patch # [arm64 or aarch64 or ppc64le] From a466561e649b5df3449776a7b42b46ee736c97d6 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Mon, 22 Jul 2024 16:39:07 -0700 Subject: [PATCH 086/121] Fix patch header --- .../0005-Add-CMake-option-to-build-with-external-CCCL.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch b/recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch index 4ccb7e38..153b618d 100644 --- a/recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch +++ b/recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch @@ -4,9 +4,9 @@ Date: Mon, 22 Jul 2024 12:20:10 -0700 Subject: [PATCH] [CMake] Explicitly link with CCCL (standalone or CTK) --- - CMakeLists.txt | 9 +++++++++ + CMakeLists.txt | 6 ++++++ cmake/Utils.cmake | 1 + - 2 files changed, 10 insertions(+) + 2 files changed, 7 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index dc0f7e654..8371a45c0 100644 From e9521dbb8cb37efd756b23898783bb6f800f517b Mon Sep 17 00:00:00 2001 From: jakirkham Date: Mon, 22 Jul 2024 16:46:48 -0700 Subject: [PATCH 087/121] Fix patch format --- ...Add-CMake-option-to-build-with-external-CCCL.patch | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch b/recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch index 153b618d..18a236c6 100644 --- a/recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch +++ b/recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch @@ -9,10 +9,10 @@ Subject: [PATCH] [CMake] Explicitly link with CCCL (standalone or CTK) 2 files changed, 7 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index dc0f7e654..8371a45c0 100644 +index 034d52164..311a2bc31 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -224,6 +224,12 @@ if(USE_CUDA) +@@ -221,6 +221,12 @@ if(USE_CUDA) add_subdirectory(${PROJECT_SOURCE_DIR}/gputreeshap) find_package(CUDAToolkit REQUIRED) @@ -25,13 +25,6 @@ index dc0f7e654..8371a45c0 100644 endif() if(FORCE_COLORED_OUTPUT AND (CMAKE_GENERATOR STREQUAL "Ninja") AND -@@ -422,6 +428,9 @@ else() - set(INSTALL_TARGETS xgboost) - endif() - endif() - - install(TARGETS ${INSTALL_TARGETS} - EXPORT XGBoostTargets diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake index 8659df7c3..01dca611c 100644 --- a/cmake/Utils.cmake From c08b35cd1bfa3e8f76eb101e8648a3b8e1e7b05f Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Mon, 22 Jul 2024 18:09:12 -0700 Subject: [PATCH 088/121] Update patch --- ...e-option-to-build-with-external-CCCL.patch | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch b/recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch index 18a236c6..c453a4f5 100644 --- a/recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch +++ b/recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch @@ -1,26 +1,37 @@ -From 4165b0eb2665d27142d005b5a062ce6d84fe0432 Mon Sep 17 00:00:00 2001 +From 683d24cf9ae591308176b1365544cbe9c57b60c5 Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Mon, 22 Jul 2024 12:20:10 -0700 Subject: [PATCH] [CMake] Explicitly link with CCCL (standalone or CTK) --- - CMakeLists.txt | 6 ++++++ - cmake/Utils.cmake | 1 + - 2 files changed, 7 insertions(+) + CMakeLists.txt | 17 +++++++++++++++++ + cmake/Utils.cmake | 1 + + 2 files changed, 18 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 034d52164..311a2bc31 100644 +index dc0f7e654..20dccd087 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -221,6 +221,12 @@ if(USE_CUDA) +@@ -224,6 +224,23 @@ if(USE_CUDA) add_subdirectory(${PROJECT_SOURCE_DIR}/gputreeshap) find_package(CUDAToolkit REQUIRED) + find_package(CCCL CONFIG) + if(NOT CCCL_FOUND) -+ message(STATUS "Standalone CCCL not found. Attempting to use CCCL from CTK...") -+ find_package(CCCL REQUIRED CONFIG -+ PATHS ${CUDAToolkit_LIBRARY_DIR}/cmake/cccl) ++ message(STATUS "Standalone CCCL not found. Attempting to use CCCL from CUDA Toolkit...") ++ find_package(CCCL CONFIG ++ HINTS ${CUDAToolkit_LIBRARY_DIR}/cmake) ++ if(NOT CCCL_FOUND) ++ message(STATUS "Could not locate CCCL from CUDA Toolkit. Using Thrust and CUB from CUDA Toolkit...") ++ find_package(Thrust CONFIG REQUIRED ++ HINTS ${CUDAToolkit_LIBRARY_DIR}/cmake) ++ find_package(CUB CONFIG REQUIRED ++ HINTS ${CUDAToolkit_LIBRARY_DIR}/cmake) ++ find_package(libcudacxx CONFIG REQUIRED ++ HINTS ${CUDAToolkit_LIBRARY_DIR}/cmake) ++ add_library(CCCL::CCCL INTERFACE IMPORTED GLOBAL) ++ target_link_libraries(CCCL::CCCL INTERFACE Thrust::Thrust CUB::CUB libcudacxx::libcudacxx) ++ endif() + endif() endif() From ad7fd0d6e7ee757cef19ae1012c731f10e4a3f8e Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Tue, 23 Jul 2024 01:01:02 -0700 Subject: [PATCH 089/121] Show build command on Win --- recipe/bld.bat | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index e2348a35..de12b95b 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -16,7 +16,8 @@ cmake -G "Ninja" ^ "%SRC_DIR%" if errorlevel 1 exit 1 -cmake --build . --target install --config Release +cmake --build . --target install --config Release ^ + /m "/consoleloggerparameters:ShowCommandLine;Verbosity=minimal" if errorlevel 1 exit 1 popd From 5599b57cbefb9f2dc303153af27188dee72da770 Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Tue, 23 Jul 2024 06:58:10 -0700 Subject: [PATCH 090/121] missing -- --- recipe/bld.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index de12b95b..b62c931a 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -17,7 +17,7 @@ cmake -G "Ninja" ^ if errorlevel 1 exit 1 cmake --build . --target install --config Release ^ - /m "/consoleloggerparameters:ShowCommandLine;Verbosity=minimal" + -- /m "/consoleloggerparameters:ShowCommandLine;Verbosity=minimal" if errorlevel 1 exit 1 popd From 062224071b7ded87ea968799c1b11b911b3a8431 Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Tue, 23 Jul 2024 08:16:25 -0700 Subject: [PATCH 091/121] Remove /m --- recipe/bld.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index b62c931a..1ad7816d 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -17,7 +17,7 @@ cmake -G "Ninja" ^ if errorlevel 1 exit 1 cmake --build . --target install --config Release ^ - -- /m "/consoleloggerparameters:ShowCommandLine;Verbosity=minimal" + -- "/consoleloggerparameters:ShowCommandLine;Verbosity=minimal" if errorlevel 1 exit 1 popd From 660f31a8f6dc290ca5e9cf067176626bc1dd7614 Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Tue, 23 Jul 2024 11:49:33 -0700 Subject: [PATCH 092/121] Use -v --- recipe/bld.bat | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 1ad7816d..91558782 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -16,8 +16,7 @@ cmake -G "Ninja" ^ "%SRC_DIR%" if errorlevel 1 exit 1 -cmake --build . --target install --config Release ^ - -- "/consoleloggerparameters:ShowCommandLine;Verbosity=minimal" +cmake --build . --target install --config Release -- -v if errorlevel 1 exit 1 popd From 3a77d9770bd783c3c3741e9e1c585e24a5249f7e Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Tue, 23 Jul 2024 18:47:12 -0700 Subject: [PATCH 093/121] Update patch --- ...link-with-CCCL-standalone-or-CTK-10.patch} | 35 ++++++++++++------- recipe/meta.yaml | 2 +- 2 files changed, 23 insertions(+), 14 deletions(-) rename recipe/{0005-Add-CMake-option-to-build-with-external-CCCL.patch => 0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK-10.patch} (63%) diff --git a/recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch b/recipe/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK-10.patch similarity index 63% rename from recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch rename to recipe/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK-10.patch index c453a4f5..ebefa8f8 100644 --- a/recipe/0005-Add-CMake-option-to-build-with-external-CCCL.patch +++ b/recipe/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK-10.patch @@ -1,18 +1,19 @@ -From 683d24cf9ae591308176b1365544cbe9c57b60c5 Mon Sep 17 00:00:00 2001 -From: Hyunsu Cho -Date: Mon, 22 Jul 2024 12:20:10 -0700 +From 67f98c3ee7361a2b39c0b5ea05419f68ed7be00c Mon Sep 17 00:00:00 2001 +From: Philip Hyunsu Cho +Date: Tue, 23 Jul 2024 18:42:54 -0700 Subject: [PATCH] [CMake] Explicitly link with CCCL (standalone or CTK) + (#10624) --- - CMakeLists.txt | 17 +++++++++++++++++ - cmake/Utils.cmake | 1 + - 2 files changed, 18 insertions(+) + CMakeLists.txt | 18 ++++++++++++++++++ + cmake/Utils.cmake | 5 ++--- + 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index dc0f7e654..20dccd087 100644 +index dc0f7e654..aa078405f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -224,6 +224,23 @@ if(USE_CUDA) +@@ -224,6 +224,24 @@ if(USE_CUDA) add_subdirectory(${PROJECT_SOURCE_DIR}/gputreeshap) find_package(CUDAToolkit REQUIRED) @@ -23,24 +24,25 @@ index dc0f7e654..20dccd087 100644 + HINTS ${CUDAToolkit_LIBRARY_DIR}/cmake) + if(NOT CCCL_FOUND) + message(STATUS "Could not locate CCCL from CUDA Toolkit. Using Thrust and CUB from CUDA Toolkit...") -+ find_package(Thrust CONFIG REQUIRED ++ find_package(libcudacxx CONFIG REQUIRED + HINTS ${CUDAToolkit_LIBRARY_DIR}/cmake) + find_package(CUB CONFIG REQUIRED + HINTS ${CUDAToolkit_LIBRARY_DIR}/cmake) -+ find_package(libcudacxx CONFIG REQUIRED ++ find_package(Thrust CONFIG REQUIRED + HINTS ${CUDAToolkit_LIBRARY_DIR}/cmake) ++ thrust_create_target(Thrust HOST CPP DEVICE CUDA) + add_library(CCCL::CCCL INTERFACE IMPORTED GLOBAL) -+ target_link_libraries(CCCL::CCCL INTERFACE Thrust::Thrust CUB::CUB libcudacxx::libcudacxx) ++ target_link_libraries(CCCL::CCCL INTERFACE libcudacxx::libcudacxx CUB::CUB Thrust) + endif() + endif() endif() if(FORCE_COLORED_OUTPUT AND (CMAKE_GENERATOR STREQUAL "Ninja") AND diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake -index 8659df7c3..01dca611c 100644 +index 8659df7c3..b4cfb66ac 100644 --- a/cmake/Utils.cmake +++ b/cmake/Utils.cmake -@@ -108,6 +108,7 @@ function(xgboost_set_cuda_flags target) +@@ -108,12 +108,11 @@ function(xgboost_set_cuda_flags target) target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_NVTX=1) endif() @@ -48,6 +50,13 @@ index 8659df7c3..01dca611c 100644 target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_CUDA=1) target_include_directories( ${target} PRIVATE +- ${xgboost_SOURCE_DIR}/gputreeshap +- ${xgboost_SOURCE_DIR}/rabit/include +- ${CUDAToolkit_INCLUDE_DIRS}) ++ ${xgboost_SOURCE_DIR}/gputreeshap) + + if(MSVC) + target_compile_options(${target} PRIVATE -- 2.34.1 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ac1cfacd..e79c6d7e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,7 +18,7 @@ source: - 0002-Enable-latest-libcxx-on-MacOS.patch # [osx] - 0003-Use-mingw-w64-path.patch - 0004-Undo-dmlc-xgboost-9436.patch - - 0005-Add-CMake-option-to-build-with-external-CCCL.patch + - 0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK-10.patch build: number: {{ build_number }} From 5bee750d88b3881d83d3f2f26817c0c250f3c965 Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Tue, 23 Jul 2024 18:50:11 -0700 Subject: [PATCH 094/121] Fix lint --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e79c6d7e..bfb2547b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -22,7 +22,6 @@ source: build: number: {{ build_number }} - noarch: python requirements: build: From bd7aa6596f54d56cde9a9cf068bbe2c9ac994980 Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Tue, 23 Jul 2024 18:54:06 -0700 Subject: [PATCH 095/121] MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.37.1, and conda-forge-pinning 2024.07.23.22.35.38 --- ...ernvcccuda_compiler_version11.8cxx_compiler_version11.yaml | 4 ++++ ...erNonecuda_compiler_versionNonecxx_compiler_version12.yaml | 4 ++++ ...a-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml index 79b44eaa..e3ccb914 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml @@ -32,7 +32,11 @@ 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/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml index ca2c96a8..91102458 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml @@ -32,7 +32,11 @@ 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/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml index 772f0755..ca128ee9 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml @@ -32,7 +32,11 @@ 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: From fd2bca968ef4be66a6582e7000dd05b89a07f42a Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Tue, 23 Jul 2024 19:16:14 -0700 Subject: [PATCH 096/121] Revert "MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.37.1, and conda-forge-pinning 2024.07.23.22.35.38" This reverts commit bd7aa6596f54d56cde9a9cf068bbe2c9ac994980. --- ...ernvcccuda_compiler_version11.8cxx_compiler_version11.yaml | 4 ---- ...erNonecuda_compiler_versionNonecxx_compiler_version12.yaml | 4 ---- ...a-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml | 4 ---- 3 files changed, 12 deletions(-) diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml index e3ccb914..79b44eaa 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_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/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml index 91102458..ca2c96a8 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_64_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/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml index ca128ee9..772f0755 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_64_c_compiler_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: From 3b96b9e3ccd25988e410ce0c50f314603c4986a5 Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Tue, 23 Jul 2024 19:17:58 -0700 Subject: [PATCH 097/121] Revert "Fix lint" This reverts commit 5bee750d88b3881d83d3f2f26817c0c250f3c965. --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index bfb2547b..e79c6d7e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -22,6 +22,7 @@ source: build: number: {{ build_number }} + noarch: python requirements: build: From e971233bec56b23569d3c18cbc97ee670d9f2974 Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Tue, 23 Jul 2024 19:48:20 -0700 Subject: [PATCH 098/121] Add back CUDA include path, but as SYSTEM --- ...itly-link-with-CCCL-standalone-or-CTK-10.patch | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/recipe/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK-10.patch b/recipe/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK-10.patch index ebefa8f8..f7e78dd0 100644 --- a/recipe/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK-10.patch +++ b/recipe/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK-10.patch @@ -1,4 +1,4 @@ -From 67f98c3ee7361a2b39c0b5ea05419f68ed7be00c Mon Sep 17 00:00:00 2001 +From 15b7012f54793f3cf807501453a61b6a6c1fb3c3 Mon Sep 17 00:00:00 2001 From: Philip Hyunsu Cho Date: Tue, 23 Jul 2024 18:42:54 -0700 Subject: [PATCH] [CMake] Explicitly link with CCCL (standalone or CTK) @@ -6,8 +6,8 @@ Subject: [PATCH] [CMake] Explicitly link with CCCL (standalone or CTK) --- CMakeLists.txt | 18 ++++++++++++++++++ - cmake/Utils.cmake | 5 ++--- - 2 files changed, 20 insertions(+), 3 deletions(-) + cmake/Utils.cmake | 6 ++++-- + 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dc0f7e654..aa078405f 100644 @@ -39,10 +39,10 @@ index dc0f7e654..aa078405f 100644 if(FORCE_COLORED_OUTPUT AND (CMAKE_GENERATOR STREQUAL "Ninja") AND diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake -index 8659df7c3..b4cfb66ac 100644 +index 8659df7c3..443b77c7b 100644 --- a/cmake/Utils.cmake +++ b/cmake/Utils.cmake -@@ -108,12 +108,11 @@ function(xgboost_set_cuda_flags target) +@@ -108,11 +108,13 @@ function(xgboost_set_cuda_flags target) target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_NVTX=1) endif() @@ -52,11 +52,12 @@ index 8659df7c3..b4cfb66ac 100644 ${target} PRIVATE - ${xgboost_SOURCE_DIR}/gputreeshap - ${xgboost_SOURCE_DIR}/rabit/include -- ${CUDAToolkit_INCLUDE_DIRS}) + ${xgboost_SOURCE_DIR}/gputreeshap) ++ target_include_directories( ++ ${target} SYSTEM PRIVATE + ${CUDAToolkit_INCLUDE_DIRS}) if(MSVC) - target_compile_options(${target} PRIVATE -- 2.34.1 From 0350fc8fe3d9e6cb81072d83b8301fc1a0806bd2 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 23 Jul 2024 20:15:09 -0700 Subject: [PATCH 099/121] Set min Python once and fix lint --- recipe/meta.yaml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e79c6d7e..eb2a3aea 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,7 @@ {% set name = "xgboost" %} {% set version = "2.1.0" %} {% set build_number = 0 %} +{% set min_python = "3.8" %} {% set string_prefix = "cuda" ~ (cuda_compiler_version | replace('.', '')) %} # [cuda_compiler_version != "None"] {% set string_prefix = "cpu" %} # [cuda_compiler_version == "None"] @@ -22,7 +23,9 @@ source: build: number: {{ build_number }} - noarch: python + {% if python is defined %} + skip: {{ python.split(".")[:2] != min_python.split(".")[:2] }} + {% endif %} requirements: build: @@ -108,13 +111,13 @@ outputs: host: - {{ pin_subpackage('_py-xgboost-mutex', exact=True) }} - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} - - python >=3.8 + - python >={{ min_python }} - hatchling >=1.12.1 - pip run: - {{ pin_subpackage('_py-xgboost-mutex', exact=True) }} - {{ pin_subpackage('libxgboost', max_pin='x.x.x') }} - - python >=3.8 + - python >={{ min_python }} - numpy - scipy - scikit-learn @@ -132,10 +135,10 @@ outputs: skip: True # [cuda_compiler != "None"] requirements: host: - - python >=3.8 + - python >={{ min_python }} - {{ pin_subpackage('py-xgboost', exact=True) }} run: - - python >=3.8 + - python >={{ min_python }} - {{ pin_subpackage('py-xgboost', exact=True) }} test: requires: @@ -149,10 +152,10 @@ outputs: skip: True # [cuda_compiler == "None"] requirements: host: - - python >=3.8 + - python >={{ min_python }} - {{ pin_subpackage('py-xgboost', exact=True) }} run: - - python >=3.8 + - python >={{ min_python }} - {{ pin_subpackage('py-xgboost', exact=True) }} - __cuda # [cuda_compiler != "None"] test: @@ -167,10 +170,10 @@ outputs: string: {{ string_prefix }}_pyh{{ PKG_HASH }}_{{ PKG_BUILDNUM }} requirements: host: - - python >=3.8 + - python >={{ min_python }} - {{ pin_subpackage('py-xgboost', exact=True) }} run: - - python >=3.8 + - python >={{ min_python }} - {{ pin_subpackage('py-xgboost', exact=True) }} - __cuda # [cuda_compiler != "None"] test: From a89803e1b782ae024016cc3d653d7665ba481e48 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 03:17:58 +0000 Subject: [PATCH 100/121] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and conda-forge-pinning 2024.07.23.22.35.38 --- .azure-pipelines/azure-pipelines-linux.yml | 36 ++++++------ .azure-pipelines/azure-pipelines-osx.yml | 8 +-- .azure-pipelines/azure-pipelines-win.yml | 12 ++-- ...piler_version11python3.8.____cpython.yaml} | 2 +- ...piler_version12python3.8.____cpython.yaml} | 2 +- ...piler_version12python3.8.____cpython.yaml} | 2 +- ...piler_version11python3.8.____cpython.yaml} | 5 ++ ...piler_version12python3.8.____cpython.yaml} | 5 ++ ...piler_version12python3.8.____cpython.yaml} | 5 ++ ...piler_version11python3.8.____cpython.yaml} | 5 ++ ...piler_version12python3.8.____cpython.yaml} | 5 ++ ...piler_version12python3.8.____cpython.yaml} | 5 ++ ...yaml => osx_64_python3.8.____cpython.yaml} | 5 ++ ...l => osx_arm64_python3.8.____cpython.yaml} | 5 ++ ...ler_versionNonepython3.8.____cpython.yaml} | 6 ++ ...ler_version12.0python3.8.____cpython.yaml} | 6 ++ ...ler_version11.8python3.8.____cpython.yaml} | 6 ++ README.md | 56 +++++++++---------- 18 files changed, 117 insertions(+), 59 deletions(-) rename .ci_support/{linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml => linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml} (97%) rename .ci_support/{linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml => linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython.yaml} (97%) rename .ci_support/{linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml => linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml} (97%) rename .ci_support/{linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml => linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml} (90%) rename .ci_support/{linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml => linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython.yaml} (90%) rename .ci_support/{linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml => linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml} (90%) rename .ci_support/{linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml => linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml} (89%) rename .ci_support/{linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml => linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython.yaml} (89%) rename .ci_support/{linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml => linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml} (89%) rename .ci_support/{osx_64_.yaml => osx_64_python3.8.____cpython.yaml} (89%) rename .ci_support/{osx_arm64_.yaml => osx_arm64_python3.8.____cpython.yaml} (89%) rename .ci_support/{win_64_cuda_compilerNonecuda_compiler_versionNone.yaml => win_64_cuda_compilerNonecuda_compiler_versionNonepython3.8.____cpython.yaml} (79%) rename .ci_support/{win_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml => win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.8.____cpython.yaml} (79%) rename .ci_support/{win_64_cuda_compilernvcccuda_compiler_version11.8.yaml => win_64_cuda_compilernvcccuda_compiler_version11.8python3.8.____cpython.yaml} (79%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 81213b3d..95316a93 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,40 +8,40 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11: - CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11 + linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython: + CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 - linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12: - CONFIG: linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12 + linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython: + CONFIG: linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12: - CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12 + linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython: + CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11: - CONFIG: linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11 + linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython: + CONFIG: linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 - linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12: - CONFIG: linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12 + linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython: + CONFIG: linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12: - CONFIG: linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12 + ? linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython + : CONFIG: linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11: - CONFIG: linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11 + linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython: + CONFIG: linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 - linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12: - CONFIG: linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12 + linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython: + CONFIG: linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12: - CONFIG: linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12 + ? linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython + : CONFIG: linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 7708e23e..1fa96779 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,11 +8,11 @@ jobs: vmImage: macOS-12 strategy: matrix: - osx_64_: - CONFIG: osx_64_ + osx_64_python3.8.____cpython: + CONFIG: osx_64_python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_: - CONFIG: osx_arm64_ + osx_arm64_python3.8.____cpython: + CONFIG: osx_arm64_python3.8.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 6f521937..55e84af3 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,14 +8,14 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_cuda_compilerNonecuda_compiler_versionNone: - CONFIG: win_64_cuda_compilerNonecuda_compiler_versionNone + win_64_cuda_compilerNonecuda_compiler_versionNonepython3.8.____cpython: + CONFIG: win_64_cuda_compilerNonecuda_compiler_versionNonepython3.8.____cpython UPLOAD_PACKAGES: 'True' - win_64_cuda_compilercuda-nvcccuda_compiler_version12.0: - CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.0 + win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.8.____cpython: + CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.8.____cpython UPLOAD_PACKAGES: 'True' - win_64_cuda_compilernvcccuda_compiler_version11.8: - CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.8 + win_64_cuda_compilernvcccuda_compiler_version11.8python3.8.____cpython: + CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.8python3.8.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml rename to .ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml index 79b44eaa..39a7d270 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml @@ -32,7 +32,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.12.* *_cpython +- 3.8.* *_cpython r_base: - '4.3' target_platform: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml rename to .ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython.yaml index ca2c96a8..41f97b22 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython.yaml @@ -32,7 +32,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.12.* *_cpython +- 3.8.* *_cpython r_base: - '4.3' target_platform: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml similarity index 97% rename from .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml rename to .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml index 772f0755..68282f6d 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml @@ -32,7 +32,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.12.* *_cpython +- 3.8.* *_cpython r_base: - '4.3' target_platform: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml similarity index 90% rename from .ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml rename to .ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml index 0b20ed6a..ccae5a60 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml @@ -29,9 +29,14 @@ docker_image: nccl: - '2' pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x r-base: min_pin: x.x max_pin: x.x +python: +- 3.8.* *_cpython r_base: - '4.3' target_platform: diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython.yaml similarity index 90% rename from .ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml rename to .ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython.yaml index eecb67d1..50ca0462 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython.yaml @@ -29,9 +29,14 @@ docker_image: nccl: - '2' pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x r-base: min_pin: x.x max_pin: x.x +python: +- 3.8.* *_cpython r_base: - '4.3' target_platform: diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml similarity index 90% rename from .ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml rename to .ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml index b0a65eef..ff0389b6 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml @@ -29,9 +29,14 @@ docker_image: nccl: - '2' pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x r-base: min_pin: x.x max_pin: x.x +python: +- 3.8.* *_cpython r_base: - '4.3' target_platform: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml similarity index 89% rename from .ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml rename to .ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml index 7847bd4f..50d14e70 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml @@ -25,9 +25,14 @@ docker_image: nccl: - '2' pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x r-base: min_pin: x.x max_pin: x.x +python: +- 3.8.* *_cpython r_base: - '4.3' target_platform: diff --git a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython.yaml similarity index 89% rename from .ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml rename to .ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython.yaml index a87dd650..40693da5 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython.yaml @@ -25,9 +25,14 @@ docker_image: nccl: - '2' pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x r-base: min_pin: x.x max_pin: x.x +python: +- 3.8.* *_cpython r_base: - '4.3' target_platform: diff --git a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml similarity index 89% rename from .ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml rename to .ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml index 88a6fb8c..d1218ae8 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml @@ -25,9 +25,14 @@ docker_image: nccl: - '2' pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x r-base: min_pin: x.x max_pin: x.x +python: +- 3.8.* *_cpython r_base: - '4.3' target_platform: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml similarity index 89% rename from .ci_support/osx_64_.yaml rename to .ci_support/osx_64_python3.8.____cpython.yaml index 15200256..0c7d1009 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_python3.8.____cpython.yaml @@ -27,9 +27,14 @@ llvm_openmp: macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x r-base: min_pin: x.x max_pin: x.x +python: +- 3.8.* *_cpython r_base: - '4.3' target_platform: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_python3.8.____cpython.yaml similarity index 89% rename from .ci_support/osx_arm64_.yaml rename to .ci_support/osx_arm64_python3.8.____cpython.yaml index 64bad6aa..7e2f503a 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_python3.8.____cpython.yaml @@ -27,9 +27,14 @@ llvm_openmp: macos_machine: - arm64-apple-darwin20.0.0 pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x r-base: min_pin: x.x max_pin: x.x +python: +- 3.8.* *_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_versionNonepython3.8.____cpython.yaml similarity index 79% rename from .ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml rename to .ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonepython3.8.____cpython.yaml index 3fa468c3..b5458e05 100644 --- a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml +++ b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonepython3.8.____cpython.yaml @@ -16,6 +16,12 @@ m2w64_c_compiler: - m2w64-toolchain m2w64_cxx_compiler: - m2w64-toolchain +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.8.* *_cpython 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.0python3.8.____cpython.yaml similarity index 79% rename from .ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml rename to .ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.8.____cpython.yaml index d7beb725..485a6cc5 100644 --- a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml +++ b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.8.____cpython.yaml @@ -16,6 +16,12 @@ m2w64_c_compiler: - m2w64-toolchain m2w64_cxx_compiler: - m2w64-toolchain +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.8.* *_cpython 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.8python3.8.____cpython.yaml similarity index 79% rename from .ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml rename to .ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.8.____cpython.yaml index dd81f582..7ddfc800 100644 --- a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8.yaml +++ b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.8.____cpython.yaml @@ -16,6 +16,12 @@ m2w64_c_compiler: - m2w64-toolchain m2w64_cxx_compiler: - m2w64-toolchain +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.8.* *_cpython target_platform: - win-64 zip_keys: diff --git a/README.md b/README.md index dbbb8ddc..a8a66c06 100644 --- a/README.md +++ b/README.md @@ -41,101 +41,101 @@ Current build status - + - + - + - + - + - + - + - + - + - + - + - + - + - + From 82d28a38212d182551f1a986812c42063cd5bf9b Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 23 Jul 2024 20:23:14 -0700 Subject: [PATCH 101/121] Try `AFTER` with CTK includes --- ...5-CMake-Explicitly-link-with-CCCL-standalone-or-CTK-10.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK-10.patch b/recipe/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK-10.patch index f7e78dd0..603d4ff9 100644 --- a/recipe/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK-10.patch +++ b/recipe/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK-10.patch @@ -54,7 +54,7 @@ index 8659df7c3..443b77c7b 100644 - ${xgboost_SOURCE_DIR}/rabit/include + ${xgboost_SOURCE_DIR}/gputreeshap) + target_include_directories( -+ ${target} SYSTEM PRIVATE ++ ${target} AFTER PRIVATE ${CUDAToolkit_INCLUDE_DIRS}) if(MSVC) From 0e0eb0d41fcd0d19d812e4389fcf47e384845b8b Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 23 Jul 2024 23:31:54 -0700 Subject: [PATCH 102/121] Use CMake interface target with CCCL & CTK --- ...-link-with-CCCL-standalone-or-CTK-10.patch | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/recipe/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK-10.patch b/recipe/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK-10.patch index 603d4ff9..0f8b67d5 100644 --- a/recipe/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK-10.patch +++ b/recipe/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK-10.patch @@ -6,11 +6,11 @@ Subject: [PATCH] [CMake] Explicitly link with CCCL (standalone or CTK) --- CMakeLists.txt | 18 ++++++++++++++++++ - cmake/Utils.cmake | 6 ++++-- - 2 files changed, 22 insertions(+), 2 deletions(-) + cmake/Utils.cmake | 5 ++--- + 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index dc0f7e654..aa078405f 100644 +index dc0f7e6..aa07840 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -224,6 +224,24 @@ if(USE_CUDA) @@ -39,25 +39,21 @@ index dc0f7e654..aa078405f 100644 if(FORCE_COLORED_OUTPUT AND (CMAKE_GENERATOR STREQUAL "Ninja") AND diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake -index 8659df7c3..443b77c7b 100644 +index 8659df7..546359c 100644 --- a/cmake/Utils.cmake +++ b/cmake/Utils.cmake -@@ -108,11 +108,13 @@ function(xgboost_set_cuda_flags target) +@@ -108,12 +108,11 @@ function(xgboost_set_cuda_flags target) target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_NVTX=1) endif() -+ target_link_libraries(${target} PRIVATE CCCL::CCCL) ++ target_link_libraries(${target} INTERFACE CCCL::CCCL CUDA::toolkit) target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_CUDA=1) target_include_directories( ${target} PRIVATE - ${xgboost_SOURCE_DIR}/gputreeshap - ${xgboost_SOURCE_DIR}/rabit/include +- ${CUDAToolkit_INCLUDE_DIRS}) + ${xgboost_SOURCE_DIR}/gputreeshap) -+ target_include_directories( -+ ${target} AFTER PRIVATE - ${CUDAToolkit_INCLUDE_DIRS}) if(MSVC) --- -2.34.1 - + target_compile_options(${target} PRIVATE From b07a9f202a47c121277169ad18ffed8fab91a1d3 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 23 Jul 2024 23:39:04 -0700 Subject: [PATCH 103/121] Consolidate patches into a directory --- recipe/meta.yaml | 10 +++++----- ...1-Force-endian-flag-in-cross-compilation-mode.patch | 0 .../0002-Enable-latest-libcxx-on-MacOS.patch | 0 recipe/{ => patches}/0003-Use-mingw-w64-path.patch | 0 recipe/{ => patches}/0004-Undo-dmlc-xgboost-9436.patch | 0 ...xplicitly-link-with-CCCL-standalone-or-CTK-10.patch | 0 6 files changed, 5 insertions(+), 5 deletions(-) rename recipe/{ => patches}/0001-Force-endian-flag-in-cross-compilation-mode.patch (100%) rename recipe/{ => patches}/0002-Enable-latest-libcxx-on-MacOS.patch (100%) rename recipe/{ => patches}/0003-Use-mingw-w64-path.patch (100%) rename recipe/{ => patches}/0004-Undo-dmlc-xgboost-9436.patch (100%) rename recipe/{ => patches}/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK-10.patch (100%) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index eb2a3aea..978696ed 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,11 +15,11 @@ source: sha256: 28bec8e821b1fefcea722d96add66024adba399063f723bc5c815f7af4a5f5e4 patches: # xgboost patches - - 0001-Force-endian-flag-in-cross-compilation-mode.patch # [arm64 or aarch64 or ppc64le] - - 0002-Enable-latest-libcxx-on-MacOS.patch # [osx] - - 0003-Use-mingw-w64-path.patch - - 0004-Undo-dmlc-xgboost-9436.patch - - 0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK-10.patch + - patches/0001-Force-endian-flag-in-cross-compilation-mode.patch # [arm64 or aarch64 or ppc64le] + - patches/0002-Enable-latest-libcxx-on-MacOS.patch # [osx] + - patches/0003-Use-mingw-w64-path.patch + - patches/0004-Undo-dmlc-xgboost-9436.patch + - patches/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK-10.patch build: number: {{ build_number }} diff --git a/recipe/0001-Force-endian-flag-in-cross-compilation-mode.patch b/recipe/patches/0001-Force-endian-flag-in-cross-compilation-mode.patch similarity index 100% rename from recipe/0001-Force-endian-flag-in-cross-compilation-mode.patch rename to recipe/patches/0001-Force-endian-flag-in-cross-compilation-mode.patch diff --git a/recipe/0002-Enable-latest-libcxx-on-MacOS.patch b/recipe/patches/0002-Enable-latest-libcxx-on-MacOS.patch similarity index 100% rename from recipe/0002-Enable-latest-libcxx-on-MacOS.patch rename to recipe/patches/0002-Enable-latest-libcxx-on-MacOS.patch diff --git a/recipe/0003-Use-mingw-w64-path.patch b/recipe/patches/0003-Use-mingw-w64-path.patch similarity index 100% rename from recipe/0003-Use-mingw-w64-path.patch rename to recipe/patches/0003-Use-mingw-w64-path.patch diff --git a/recipe/0004-Undo-dmlc-xgboost-9436.patch b/recipe/patches/0004-Undo-dmlc-xgboost-9436.patch similarity index 100% rename from recipe/0004-Undo-dmlc-xgboost-9436.patch rename to recipe/patches/0004-Undo-dmlc-xgboost-9436.patch diff --git a/recipe/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK-10.patch b/recipe/patches/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK-10.patch similarity index 100% rename from recipe/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK-10.patch rename to recipe/patches/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK-10.patch From f7f1fce5a4bc17197c1ae8c3f59d5708ead3494d Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 24 Jul 2024 00:49:34 -0700 Subject: [PATCH 104/121] Link `CUDA::cudart_static` instead --- ...plicitly-link-with-CCCL-standalone-or-CTK-10.patch | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/recipe/patches/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK-10.patch b/recipe/patches/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK-10.patch index 0f8b67d5..7862cde9 100644 --- a/recipe/patches/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK-10.patch +++ b/recipe/patches/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK-10.patch @@ -6,8 +6,8 @@ Subject: [PATCH] [CMake] Explicitly link with CCCL (standalone or CTK) --- CMakeLists.txt | 18 ++++++++++++++++++ - cmake/Utils.cmake | 5 ++--- - 2 files changed, 20 insertions(+), 3 deletions(-) + cmake/Utils.cmake | 6 +++--- + 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dc0f7e6..aa07840 100644 @@ -39,14 +39,15 @@ index dc0f7e6..aa07840 100644 if(FORCE_COLORED_OUTPUT AND (CMAKE_GENERATOR STREQUAL "Ninja") AND diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake -index 8659df7..546359c 100644 +index 8659df7..ec69278 100644 --- a/cmake/Utils.cmake +++ b/cmake/Utils.cmake -@@ -108,12 +108,11 @@ function(xgboost_set_cuda_flags target) +@@ -108,12 +108,12 @@ function(xgboost_set_cuda_flags target) target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_NVTX=1) endif() -+ target_link_libraries(${target} INTERFACE CCCL::CCCL CUDA::toolkit) ++ target_link_libraries(${target} INTERFACE CCCL::CCCL) ++ target_link_libraries(${target} PUBLIC CUDA::cudart_static) target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_CUDA=1) target_include_directories( ${target} PRIVATE From 29250fad08af965f3b648f45f25ff8e7fdb7a2ad Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Wed, 24 Jul 2024 11:03:34 -0700 Subject: [PATCH 105/121] Allow building with CCCL that's newer than CTK --- recipe/meta.yaml | 2 +- ...ly-link-with-CCCL-standalone-or-CTK.patch} | 50 ++++++++++++++----- 2 files changed, 39 insertions(+), 13 deletions(-) rename recipe/patches/{0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK-10.patch => 0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK.patch} (57%) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 978696ed..50abd261 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -19,7 +19,7 @@ source: - patches/0002-Enable-latest-libcxx-on-MacOS.patch # [osx] - patches/0003-Use-mingw-w64-path.patch - patches/0004-Undo-dmlc-xgboost-9436.patch - - patches/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK-10.patch + - patches/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK.patch build: number: {{ build_number }} diff --git a/recipe/patches/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK-10.patch b/recipe/patches/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK.patch similarity index 57% rename from recipe/patches/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK-10.patch rename to recipe/patches/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK.patch index 7862cde9..5f9e08e9 100644 --- a/recipe/patches/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK-10.patch +++ b/recipe/patches/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK.patch @@ -1,16 +1,19 @@ -From 15b7012f54793f3cf807501453a61b6a6c1fb3c3 Mon Sep 17 00:00:00 2001 -From: Philip Hyunsu Cho -Date: Tue, 23 Jul 2024 18:42:54 -0700 +From 7210f056f80c09c003056fb7ef0864ab859104c8 Mon Sep 17 00:00:00 2001 +From: Hyunsu Cho +Date: Wed, 24 Jul 2024 11:00:56 -0700 Subject: [PATCH] [CMake] Explicitly link with CCCL (standalone or CTK) - (#10624) +Also allow building with CCCL that's newer than CTK + +Co-authored-by: jakirkham --- - CMakeLists.txt | 18 ++++++++++++++++++ - cmake/Utils.cmake | 6 +++--- - 2 files changed, 21 insertions(+), 3 deletions(-) + CMakeLists.txt | 18 ++++++++++++++++++ + cmake/Utils.cmake | 7 ++++--- + src/common/quantile.h | 8 ++++++++ + 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index dc0f7e6..aa07840 100644 +index dc0f7e654..aa078405f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -224,6 +224,24 @@ if(USE_CUDA) @@ -39,15 +42,16 @@ index dc0f7e6..aa07840 100644 if(FORCE_COLORED_OUTPUT AND (CMAKE_GENERATOR STREQUAL "Ninja") AND diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake -index 8659df7..ec69278 100644 +index 8659df7c3..982d4068b 100644 --- a/cmake/Utils.cmake +++ b/cmake/Utils.cmake -@@ -108,12 +108,12 @@ function(xgboost_set_cuda_flags target) +@@ -108,12 +108,13 @@ function(xgboost_set_cuda_flags target) target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_NVTX=1) endif() -+ target_link_libraries(${target} INTERFACE CCCL::CCCL) -+ target_link_libraries(${target} PUBLIC CUDA::cudart_static) ++ target_link_libraries(${target} ++ INTERFACE CCCL::CCCL ++ PUBLIC CUDA::cudart_static) target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_CUDA=1) target_include_directories( ${target} PRIVATE @@ -58,3 +62,25 @@ index 8659df7..ec69278 100644 if(MSVC) target_compile_options(${target} PRIVATE +diff --git a/src/common/quantile.h b/src/common/quantile.h +index 59bc3a4f7..ff3530ab2 100644 +--- a/src/common/quantile.h ++++ b/src/common/quantile.h +@@ -71,6 +71,14 @@ struct WQSummary { + << "value: " << e.value; + return os; + } ++ ++ XGBOOST_DEVICE inline bool operator==(Entry const& rhs) const { ++ return (rmin == rhs.rmin) && (rmax == rhs.rmax) ++ && (wmin == rhs.wmin) && (value == rhs.value); ++ } ++ XGBOOST_DEVICE inline bool operator!=(Entry const& rhs) const { ++ return !operator==(rhs); ++ } + }; + /*! \brief input data queue before entering the summary */ + struct Queue { +-- +2.34.1 + From cc02f33aea7b78a2606654c8b1600da5677c02bd Mon Sep 17 00:00:00 2001 From: Philip Hyunsu Cho Date: Wed, 24 Jul 2024 12:22:45 -0700 Subject: [PATCH 106/121] Exclude 2.4.0, 2.5.0 versions of CCCL Co-authored-by: jakirkham --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 50abd261..d7d32df6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -40,8 +40,8 @@ requirements: - libgomp # [linux] - ninja host: - - cccl # [cuda_compiler != "None"] - - nccl # [linux and cuda_compiler != "None"] + - cccl !=2.4.0,!=2.5.0 # [cuda_compiler != "None"] + - nccl # [linux and cuda_compiler != "None"] outputs: - name: libxgboost From bc5fec0a7bd6682c6f81c00f022c038aa592bdc8 Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Wed, 24 Jul 2024 12:27:59 -0700 Subject: [PATCH 107/121] Update patches --- recipe/meta.yaml | 1 + ...tly-link-with-CCCL-standalone-or-CTK.patch | 37 +++-------- .../0006-Partial-fix-for-CTK-12.5-10574.patch | 65 +++++++++++++++++++ 3 files changed, 74 insertions(+), 29 deletions(-) create mode 100644 recipe/patches/0006-Partial-fix-for-CTK-12.5-10574.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d7d32df6..bbef40f1 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -20,6 +20,7 @@ source: - patches/0003-Use-mingw-w64-path.patch - patches/0004-Undo-dmlc-xgboost-9436.patch - patches/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK.patch + - patches/0006-Partial-fix-for-CTK-12.5-10574.patch build: number: {{ build_number }} diff --git a/recipe/patches/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK.patch b/recipe/patches/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK.patch index 5f9e08e9..bce9467c 100644 --- a/recipe/patches/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK.patch +++ b/recipe/patches/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK.patch @@ -1,16 +1,15 @@ -From 7210f056f80c09c003056fb7ef0864ab859104c8 Mon Sep 17 00:00:00 2001 +From 6e58a81cf201d27c3acb304cdcd991cd46aa421f Mon Sep 17 00:00:00 2001 From: Hyunsu Cho -Date: Wed, 24 Jul 2024 11:00:56 -0700 +Date: Wed, 24 Jul 2024 12:25:04 -0700 Subject: [PATCH] [CMake] Explicitly link with CCCL (standalone or CTK) Also allow building with CCCL that's newer than CTK Co-authored-by: jakirkham --- - CMakeLists.txt | 18 ++++++++++++++++++ - cmake/Utils.cmake | 7 ++++--- - src/common/quantile.h | 8 ++++++++ - 3 files changed, 30 insertions(+), 3 deletions(-) + CMakeLists.txt | 18 ++++++++++++++++++ + cmake/Utils.cmake | 6 +++--- + 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dc0f7e654..aa078405f 100644 @@ -42,16 +41,15 @@ index dc0f7e654..aa078405f 100644 if(FORCE_COLORED_OUTPUT AND (CMAKE_GENERATOR STREQUAL "Ninja") AND diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake -index 8659df7c3..982d4068b 100644 +index 8659df7c3..c1f19fdbb 100644 --- a/cmake/Utils.cmake +++ b/cmake/Utils.cmake -@@ -108,12 +108,13 @@ function(xgboost_set_cuda_flags target) +@@ -108,12 +108,12 @@ function(xgboost_set_cuda_flags target) target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_NVTX=1) endif() + target_link_libraries(${target} -+ INTERFACE CCCL::CCCL -+ PUBLIC CUDA::cudart_static) ++ PRIVATE CCCL::CCCL CUDA::cudart_static) target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_CUDA=1) target_include_directories( ${target} PRIVATE @@ -62,25 +60,6 @@ index 8659df7c3..982d4068b 100644 if(MSVC) target_compile_options(${target} PRIVATE -diff --git a/src/common/quantile.h b/src/common/quantile.h -index 59bc3a4f7..ff3530ab2 100644 ---- a/src/common/quantile.h -+++ b/src/common/quantile.h -@@ -71,6 +71,14 @@ struct WQSummary { - << "value: " << e.value; - return os; - } -+ -+ XGBOOST_DEVICE inline bool operator==(Entry const& rhs) const { -+ return (rmin == rhs.rmin) && (rmax == rhs.rmax) -+ && (wmin == rhs.wmin) && (value == rhs.value); -+ } -+ XGBOOST_DEVICE inline bool operator!=(Entry const& rhs) const { -+ return !operator==(rhs); -+ } - }; - /*! \brief input data queue before entering the summary */ - struct Queue { -- 2.34.1 diff --git a/recipe/patches/0006-Partial-fix-for-CTK-12.5-10574.patch b/recipe/patches/0006-Partial-fix-for-CTK-12.5-10574.patch new file mode 100644 index 00000000..e2d63261 --- /dev/null +++ b/recipe/patches/0006-Partial-fix-for-CTK-12.5-10574.patch @@ -0,0 +1,65 @@ +From 5fa754ff95d7f7bca4a68c1c23c299417de86de0 Mon Sep 17 00:00:00 2001 +From: Jiaming Yuan +Date: Tue, 16 Jul 2024 17:41:50 +0800 +Subject: [PATCH] Partial fix for CTK 12.5 (#10574) + +--- + src/tree/updater_gpu_common.cuh | 21 ++++++++------------- + src/tree/updater_gpu_hist.cu | 1 + + 2 files changed, 9 insertions(+), 13 deletions(-) + +diff --git a/src/tree/updater_gpu_common.cuh b/src/tree/updater_gpu_common.cuh +index 1c3e6a552..5d999d6d6 100644 +--- a/src/tree/updater_gpu_common.cuh ++++ b/src/tree/updater_gpu_common.cuh +@@ -1,18 +1,13 @@ +-/*! +- * Copyright 2017-2019 XGBoost contributors ++/** ++ * Copyright 2017-2024, XGBoost contributors + */ + #pragma once +-#include +-#include +-#include +-#include +-#include +-#include +-#include "../common/categorical.h" +-#include "../common/device_helpers.cuh" +-#include "../common/random.h" ++#include // for numeric_limits ++#include // for ostream ++ + #include "gpu_hist/histogram.cuh" + #include "param.h" ++#include "xgboost/base.h" + + namespace xgboost::tree { + struct GPUTrainingParam { +@@ -54,8 +49,8 @@ enum DefaultDirection { + }; + + struct DeviceSplitCandidate { +- float loss_chg {-FLT_MAX}; +- DefaultDirection dir {kLeftDir}; ++ float loss_chg{-std::numeric_limits::max()}; ++ DefaultDirection dir{kLeftDir}; + int findex {-1}; + float fvalue {0}; + // categorical split, either it's the split category for OHE or the threshold for partition-based +diff --git a/src/tree/updater_gpu_hist.cu b/src/tree/updater_gpu_hist.cu +index 958fa0331..e126aeb31 100644 +--- a/src/tree/updater_gpu_hist.cu ++++ b/src/tree/updater_gpu_hist.cu +@@ -19,6 +19,7 @@ + #include "../common/cuda_context.cuh" // CUDAContext + #include "../common/device_helpers.cuh" + #include "../common/hist_util.h" ++#include "../common/random.h" // for ColumnSampler, GlobalRandom + #include "../common/timer.h" + #include "../data/ellpack_page.cuh" + #include "../data/ellpack_page.h" +-- +2.34.1 + From 98aa52a198fda0c162f0e15cd2bdbb336c361e74 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 24 Jul 2024 16:33:12 -0700 Subject: [PATCH 108/121] Switch to VS 2022 --- recipe/conda_build_config.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 recipe/conda_build_config.yaml diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml new file mode 100644 index 00000000..362c1d93 --- /dev/null +++ b/recipe/conda_build_config.yaml @@ -0,0 +1,4 @@ +c_compiler: # [win] +- vs2022 # [win] +cxx_compiler: # [win] +- vs2022 # [win] From 5a42d4a3dc8e1fb0f7d7acaf7c32b7a175e0f41a Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 23:35:23 +0000 Subject: [PATCH 109/121] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and conda-forge-pinning 2024.07.24.15.58.55 --- ...lerNonecuda_compiler_versionNonepython3.8.____cpython.yaml | 4 ++-- ...da-nvcccuda_compiler_version12.0python3.8.____cpython.yaml | 4 ++-- ...lernvcccuda_compiler_version11.8python3.8.____cpython.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonepython3.8.____cpython.yaml b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonepython3.8.____cpython.yaml index b5458e05..7e4433d6 100644 --- a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonepython3.8.____cpython.yaml +++ b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonepython3.8.____cpython.yaml @@ -1,5 +1,5 @@ c_compiler: -- vs2019 +- vs2022 c_stdlib: - vs channel_sources: @@ -11,7 +11,7 @@ cuda_compiler: cuda_compiler_version: - None cxx_compiler: -- vs2019 +- vs2022 m2w64_c_compiler: - m2w64-toolchain m2w64_cxx_compiler: diff --git a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.8.____cpython.yaml b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.8.____cpython.yaml index 485a6cc5..a3516764 100644 --- a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.8.____cpython.yaml +++ b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.8.____cpython.yaml @@ -1,5 +1,5 @@ c_compiler: -- vs2019 +- vs2022 c_stdlib: - vs channel_sources: @@ -11,7 +11,7 @@ cuda_compiler: cuda_compiler_version: - '12.0' cxx_compiler: -- vs2019 +- vs2022 m2w64_c_compiler: - m2w64-toolchain m2w64_cxx_compiler: diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.8.____cpython.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.8.____cpython.yaml index 7ddfc800..f3e2434f 100644 --- a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.8.____cpython.yaml +++ b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.8.____cpython.yaml @@ -1,5 +1,5 @@ c_compiler: -- vs2019 +- vs2022 c_stdlib: - vs channel_sources: @@ -11,7 +11,7 @@ cuda_compiler: cuda_compiler_version: - '11.8' cxx_compiler: -- vs2019 +- vs2022 m2w64_c_compiler: - m2w64-toolchain m2w64_cxx_compiler: From 25340c176638bd6c667c70bb37f2b64ca4f27963 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 24 Jul 2024 17:09:38 -0700 Subject: [PATCH 110/121] Downgrade to VS 2017 --- recipe/conda_build_config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 362c1d93..fd35f08e 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,4 +1,4 @@ c_compiler: # [win] -- vs2022 # [win] +- vs2017 # [win] cxx_compiler: # [win] -- vs2022 # [win] +- vs2017 # [win] From e28655bba23cbcad7483065da6438279085dceec Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 00:11:58 +0000 Subject: [PATCH 111/121] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and conda-forge-pinning 2024.07.24.15.58.55 --- ...lerNonecuda_compiler_versionNonepython3.8.____cpython.yaml | 4 ++-- ...da-nvcccuda_compiler_version12.0python3.8.____cpython.yaml | 4 ++-- ...lernvcccuda_compiler_version11.8python3.8.____cpython.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonepython3.8.____cpython.yaml b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonepython3.8.____cpython.yaml index 7e4433d6..b84ef7e2 100644 --- a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonepython3.8.____cpython.yaml +++ b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonepython3.8.____cpython.yaml @@ -1,5 +1,5 @@ c_compiler: -- vs2022 +- vs2017 c_stdlib: - vs channel_sources: @@ -11,7 +11,7 @@ cuda_compiler: cuda_compiler_version: - None cxx_compiler: -- vs2022 +- vs2017 m2w64_c_compiler: - m2w64-toolchain m2w64_cxx_compiler: diff --git a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.8.____cpython.yaml b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.8.____cpython.yaml index a3516764..5927a610 100644 --- a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.8.____cpython.yaml +++ b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.8.____cpython.yaml @@ -1,5 +1,5 @@ c_compiler: -- vs2022 +- vs2017 c_stdlib: - vs channel_sources: @@ -11,7 +11,7 @@ cuda_compiler: cuda_compiler_version: - '12.0' cxx_compiler: -- vs2022 +- vs2017 m2w64_c_compiler: - m2w64-toolchain m2w64_cxx_compiler: diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.8.____cpython.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.8.____cpython.yaml index f3e2434f..86cbe6db 100644 --- a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.8.____cpython.yaml +++ b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.8.____cpython.yaml @@ -1,5 +1,5 @@ c_compiler: -- vs2022 +- vs2017 c_stdlib: - vs channel_sources: @@ -11,7 +11,7 @@ cuda_compiler: cuda_compiler_version: - '11.8' cxx_compiler: -- vs2022 +- vs2017 m2w64_c_compiler: - m2w64-toolchain m2w64_cxx_compiler: From 02290495a058154cfd2f7c6703596677a31cbb17 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 24 Jul 2024 18:44:17 -0700 Subject: [PATCH 112/121] Revert `conda_build_config.yaml` --- recipe/conda_build_config.yaml | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 recipe/conda_build_config.yaml diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml deleted file mode 100644 index fd35f08e..00000000 --- a/recipe/conda_build_config.yaml +++ /dev/null @@ -1,4 +0,0 @@ -c_compiler: # [win] -- vs2017 # [win] -cxx_compiler: # [win] -- vs2017 # [win] From 1249f1c060ba5caa31658a75f7feaad641b3204a Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 01:46:17 +0000 Subject: [PATCH 113/121] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and conda-forge-pinning 2024.07.24.15.58.55 --- ...lerNonecuda_compiler_versionNonepython3.8.____cpython.yaml | 4 ++-- ...da-nvcccuda_compiler_version12.0python3.8.____cpython.yaml | 4 ++-- ...lernvcccuda_compiler_version11.8python3.8.____cpython.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonepython3.8.____cpython.yaml b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonepython3.8.____cpython.yaml index b84ef7e2..b5458e05 100644 --- a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonepython3.8.____cpython.yaml +++ b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonepython3.8.____cpython.yaml @@ -1,5 +1,5 @@ c_compiler: -- vs2017 +- vs2019 c_stdlib: - vs channel_sources: @@ -11,7 +11,7 @@ cuda_compiler: cuda_compiler_version: - None cxx_compiler: -- vs2017 +- vs2019 m2w64_c_compiler: - m2w64-toolchain m2w64_cxx_compiler: diff --git a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.8.____cpython.yaml b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.8.____cpython.yaml index 5927a610..485a6cc5 100644 --- a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.8.____cpython.yaml +++ b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.8.____cpython.yaml @@ -1,5 +1,5 @@ c_compiler: -- vs2017 +- vs2019 c_stdlib: - vs channel_sources: @@ -11,7 +11,7 @@ cuda_compiler: cuda_compiler_version: - '12.0' cxx_compiler: -- vs2017 +- vs2019 m2w64_c_compiler: - m2w64-toolchain m2w64_cxx_compiler: diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.8.____cpython.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.8.____cpython.yaml index 86cbe6db..7ddfc800 100644 --- a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.8.____cpython.yaml +++ b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.8.____cpython.yaml @@ -1,5 +1,5 @@ c_compiler: -- vs2017 +- vs2019 c_stdlib: - vs channel_sources: @@ -11,7 +11,7 @@ cuda_compiler: cuda_compiler_version: - '11.8' cxx_compiler: -- vs2017 +- vs2019 m2w64_c_compiler: - m2w64-toolchain m2w64_cxx_compiler: From d46872a28277d12bc0b4bc4ab42456bc6c0788ab Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 24 Jul 2024 18:52:43 -0700 Subject: [PATCH 114/121] On Windows, set `__cplusplus` to C++ standard --- recipe/bld.bat | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index 91558782..c69aed96 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -3,6 +3,18 @@ mkdir %SRC_DIR%\build pushd %SRC_DIR%\build +:: CCCL has different logic depending on the `__cplusplus` macro. +:: However Visual Studio leaves `__cplusplus` as `199711L` by default. +:: As a result code paths needing new C++ standard won't be run. +:: This happens in spite of the fact that VS 2019 & 2022 default to C++14. +:: To make sure `__cplusplus` matches, we pass an additional flag to VC. +:: Ideally other tooling would do this for us, for now we do it ourselves. +:: +:: https://github.com/NVIDIA/cccl/blob/82a3ed0282893d6316abde04394f59a9a37a3747/libcudacxx/include/nv/target#L27-L30 +:: https://github.com/NVIDIA/cutlass/issues/1403#issuecomment-2130383392 +:: https://gitlab.kitware.com/cmake/cmake/-/issues/18837 +set "CXXFLAGS=%CXXFLAGS% /Zc:__cplusplus" + if not "%cuda_compiler_version%" == "None" ( set "CMAKE_ARGS=-DUSE_CUDA=ON %CMAKE_ARGS%" ) From 2ad8f99efb00e5f228341733af75a7223cbab52a Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 24 Jul 2024 18:55:59 -0700 Subject: [PATCH 115/121] Add Microsoft links to `/Zc:__cplusplus` comment --- recipe/bld.bat | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index c69aed96..39992d40 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -10,6 +10,8 @@ pushd %SRC_DIR%\build :: To make sure `__cplusplus` matches, we pass an additional flag to VC. :: Ideally other tooling would do this for us, for now we do it ourselves. :: +:: https://learn.microsoft.com/en-us/cpp/build/reference/zc-cplusplus?view=msvc-160 +:: https://learn.microsoft.com/en-us/cpp/build/reference/zc-cplusplus?view=msvc-170 :: https://github.com/NVIDIA/cccl/blob/82a3ed0282893d6316abde04394f59a9a37a3747/libcudacxx/include/nv/target#L27-L30 :: https://github.com/NVIDIA/cutlass/issues/1403#issuecomment-2130383392 :: https://gitlab.kitware.com/cmake/cmake/-/issues/18837 From 2bc4e87b325bd31f9f1e071159e9d213963cac7e Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 24 Jul 2024 19:08:01 -0700 Subject: [PATCH 116/121] Link Microsoft blog on `/Zc:__cplusplus` --- recipe/bld.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index 39992d40..775cda03 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -10,6 +10,7 @@ pushd %SRC_DIR%\build :: To make sure `__cplusplus` matches, we pass an additional flag to VC. :: Ideally other tooling would do this for us, for now we do it ourselves. :: +:: https://devblogs.microsoft.com/cppblog/msvc-now-correctly-reports-__cplusplus/ :: https://learn.microsoft.com/en-us/cpp/build/reference/zc-cplusplus?view=msvc-160 :: https://learn.microsoft.com/en-us/cpp/build/reference/zc-cplusplus?view=msvc-170 :: https://github.com/NVIDIA/cccl/blob/82a3ed0282893d6316abde04394f59a9a37a3747/libcudacxx/include/nv/target#L27-L30 From 1f90186bbc6a8a698c784ddeaa50617aa19b97ea Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 24 Jul 2024 20:19:33 -0700 Subject: [PATCH 117/121] Pass `/Zc:__cplusplus` from `nvcc` to `cl` --- recipe/bld.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index 775cda03..9f69de23 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -17,6 +17,7 @@ pushd %SRC_DIR%\build :: https://github.com/NVIDIA/cutlass/issues/1403#issuecomment-2130383392 :: https://gitlab.kitware.com/cmake/cmake/-/issues/18837 set "CXXFLAGS=%CXXFLAGS% /Zc:__cplusplus" +set "CUDAFLAGS=%CUDAFLAGS% -Xcompiler /Zc:__cplusplus" if not "%cuda_compiler_version%" == "None" ( set "CMAKE_ARGS=-DUSE_CUDA=ON %CMAKE_ARGS%" From f7636eb42feba09d9e3b626535df3d5d95d7323e Mon Sep 17 00:00:00 2001 From: Philip Hyunsu Cho Date: Wed, 24 Jul 2024 22:42:08 -0700 Subject: [PATCH 118/121] Update recipe/meta.yaml Co-authored-by: jakirkham --- recipe/meta.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index bbef40f1..f642033d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -24,6 +24,9 @@ source: build: number: {{ build_number }} + # Windows CUDA 11.8 fails due to a compilation error + # xref: https://github.com/conda-forge/xgboost-feedstock/issues/173 + skip: True # [win and cuda_compiler_version == "11.8"] {% if python is defined %} skip: {{ python.split(".")[:2] != min_python.split(".")[:2] }} {% endif %} From 72e01f30774687226273f7f61a44d005ad977a17 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Wed, 24 Jul 2024 22:42:53 -0700 Subject: [PATCH 119/121] Drop Windows `__cplusplus` workaround --- recipe/bld.bat | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 9f69de23..91558782 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -3,22 +3,6 @@ mkdir %SRC_DIR%\build pushd %SRC_DIR%\build -:: CCCL has different logic depending on the `__cplusplus` macro. -:: However Visual Studio leaves `__cplusplus` as `199711L` by default. -:: As a result code paths needing new C++ standard won't be run. -:: This happens in spite of the fact that VS 2019 & 2022 default to C++14. -:: To make sure `__cplusplus` matches, we pass an additional flag to VC. -:: Ideally other tooling would do this for us, for now we do it ourselves. -:: -:: https://devblogs.microsoft.com/cppblog/msvc-now-correctly-reports-__cplusplus/ -:: https://learn.microsoft.com/en-us/cpp/build/reference/zc-cplusplus?view=msvc-160 -:: https://learn.microsoft.com/en-us/cpp/build/reference/zc-cplusplus?view=msvc-170 -:: https://github.com/NVIDIA/cccl/blob/82a3ed0282893d6316abde04394f59a9a37a3747/libcudacxx/include/nv/target#L27-L30 -:: https://github.com/NVIDIA/cutlass/issues/1403#issuecomment-2130383392 -:: https://gitlab.kitware.com/cmake/cmake/-/issues/18837 -set "CXXFLAGS=%CXXFLAGS% /Zc:__cplusplus" -set "CUDAFLAGS=%CUDAFLAGS% -Xcompiler /Zc:__cplusplus" - if not "%cuda_compiler_version%" == "None" ( set "CMAKE_ARGS=-DUSE_CUDA=ON %CMAKE_ARGS%" ) From f0e8fc3abec64580c1aff607fb6fd767e50ac2f0 Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Thu, 25 Jul 2024 16:33:21 -0700 Subject: [PATCH 120/121] Try bringing back `noarch: python` --- .azure-pipelines/azure-pipelines-linux.yml | 36 +++++------ .azure-pipelines/azure-pipelines-osx.yml | 8 +-- .azure-pipelines/azure-pipelines-win.yml | 11 ++-- ...er_version11.8cxx_compiler_version11.yaml} | 2 +- ...er_versionNonecxx_compiler_version12.yaml} | 2 +- ...er_version12.0cxx_compiler_version12.yaml} | 2 +- ...er_version11.8cxx_compiler_version11.yaml} | 5 -- ...er_versionNonecxx_compiler_version12.yaml} | 5 -- ...er_version12.0cxx_compiler_version12.yaml} | 5 -- ...er_version11.8cxx_compiler_version11.yaml} | 5 -- ...er_versionNonecxx_compiler_version12.yaml} | 5 -- ...er_version12.0cxx_compiler_version12.yaml} | 5 -- ...ython3.8.____cpython.yaml => osx_64_.yaml} | 5 -- ...on3.8.____cpython.yaml => osx_arm64_.yaml} | 5 -- ...ompilerNonecuda_compiler_versionNone.yaml} | 6 -- ...ercuda-nvcccuda_compiler_version12.0.yaml} | 6 -- ...iler_version11.8python3.8.____cpython.yaml | 29 --------- README.md | 59 ++++++++----------- recipe/meta.yaml | 4 +- 19 files changed, 56 insertions(+), 149 deletions(-) rename .ci_support/{linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml => linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml} (97%) rename .ci_support/{linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython.yaml => linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml} (97%) rename .ci_support/{linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml => linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml} (97%) rename .ci_support/{linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml => linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml} (90%) rename .ci_support/{linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython.yaml => linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml} (90%) rename .ci_support/{linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml => linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml} (90%) rename .ci_support/{linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml => linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml} (89%) rename .ci_support/{linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython.yaml => linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml} (89%) rename .ci_support/{linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml => linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml} (89%) rename .ci_support/{osx_64_python3.8.____cpython.yaml => osx_64_.yaml} (89%) rename .ci_support/{osx_arm64_python3.8.____cpython.yaml => osx_arm64_.yaml} (89%) rename .ci_support/{win_64_cuda_compilerNonecuda_compiler_versionNonepython3.8.____cpython.yaml => win_64_cuda_compilerNonecuda_compiler_versionNone.yaml} (79%) rename .ci_support/{win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.8.____cpython.yaml => win_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml} (79%) delete mode 100644 .ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.8.____cpython.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 95316a93..81213b3d 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,40 +8,40 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython: - CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython + linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11: + CONFIG: linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 - linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython: - CONFIG: linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython + linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12: + CONFIG: linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython: - CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython + linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12: + CONFIG: linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython: - CONFIG: linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython + linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11: + CONFIG: linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 - linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython: - CONFIG: linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython + linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12: + CONFIG: linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - ? linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython - : CONFIG: linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython + linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12: + CONFIG: linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython: - CONFIG: linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython + linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11: + CONFIG: linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cuda:11.8 - linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython: - CONFIG: linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython + linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12: + CONFIG: linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - ? linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython - : CONFIG: linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython + linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12: + CONFIG: linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 1fa96779..7708e23e 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,11 +8,11 @@ jobs: vmImage: macOS-12 strategy: matrix: - osx_64_python3.8.____cpython: - CONFIG: osx_64_python3.8.____cpython + osx_64_: + CONFIG: osx_64_ UPLOAD_PACKAGES: 'True' - osx_arm64_python3.8.____cpython: - CONFIG: osx_arm64_python3.8.____cpython + osx_arm64_: + CONFIG: osx_arm64_ UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 55e84af3..dc397b73 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,14 +8,11 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_cuda_compilerNonecuda_compiler_versionNonepython3.8.____cpython: - CONFIG: win_64_cuda_compilerNonecuda_compiler_versionNonepython3.8.____cpython + win_64_cuda_compilerNonecuda_compiler_versionNone: + CONFIG: win_64_cuda_compilerNonecuda_compiler_versionNone UPLOAD_PACKAGES: 'True' - win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.8.____cpython: - CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.8.____cpython - UPLOAD_PACKAGES: 'True' - win_64_cuda_compilernvcccuda_compiler_version11.8python3.8.____cpython: - CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.8python3.8.____cpython + win_64_cuda_compilercuda-nvcccuda_compiler_version12.0: + CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.0 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: diff --git a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml similarity index 97% rename from .ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml index 39a7d270..79b44eaa 100644 --- a/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml @@ -32,7 +32,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.12.* *_cpython r_base: - '4.3' target_platform: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml similarity index 97% rename from .ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml index 41f97b22..ca2c96a8 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml @@ -32,7 +32,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.12.* *_cpython r_base: - '4.3' target_platform: diff --git a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml similarity index 97% rename from .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml rename to .ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml index 68282f6d..772f0755 100644 --- a/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml +++ b/.ci_support/linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml @@ -32,7 +32,7 @@ pin_run_as_build: min_pin: x.x max_pin: x.x python: -- 3.8.* *_cpython +- 3.12.* *_cpython r_base: - '4.3' target_platform: diff --git a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml similarity index 90% rename from .ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml rename to .ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml index ccae5a60..0b20ed6a 100644 --- a/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml @@ -29,14 +29,9 @@ docker_image: nccl: - '2' pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x r-base: min_pin: x.x max_pin: x.x -python: -- 3.8.* *_cpython r_base: - '4.3' target_platform: diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml similarity index 90% rename from .ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython.yaml rename to .ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml index 50ca0462..eecb67d1 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml @@ -29,14 +29,9 @@ docker_image: nccl: - '2' pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x r-base: min_pin: x.x max_pin: x.x -python: -- 3.8.* *_cpython r_base: - '4.3' target_platform: diff --git a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml similarity index 90% rename from .ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml rename to .ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml index ff0389b6..b0a65eef 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml @@ -29,14 +29,9 @@ docker_image: nccl: - '2' pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x r-base: min_pin: x.x max_pin: x.x -python: -- 3.8.* *_cpython r_base: - '4.3' target_platform: diff --git a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml similarity index 89% rename from .ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml rename to .ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml index 50d14e70..7847bd4f 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml @@ -25,14 +25,9 @@ docker_image: nccl: - '2' pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x r-base: min_pin: x.x max_pin: x.x -python: -- 3.8.* *_cpython r_base: - '4.3' target_platform: diff --git a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml similarity index 89% rename from .ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython.yaml rename to .ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml index 40693da5..a87dd650 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml @@ -25,14 +25,9 @@ docker_image: nccl: - '2' pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x r-base: min_pin: x.x max_pin: x.x -python: -- 3.8.* *_cpython r_base: - '4.3' target_platform: diff --git a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml similarity index 89% rename from .ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml rename to .ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml index d1218ae8..88a6fb8c 100644 --- a/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml @@ -25,14 +25,9 @@ docker_image: nccl: - '2' pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x r-base: min_pin: x.x max_pin: x.x -python: -- 3.8.* *_cpython r_base: - '4.3' target_platform: diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_.yaml similarity index 89% rename from .ci_support/osx_64_python3.8.____cpython.yaml rename to .ci_support/osx_64_.yaml index 0c7d1009..15200256 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_.yaml @@ -27,14 +27,9 @@ llvm_openmp: macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x r-base: min_pin: x.x max_pin: x.x -python: -- 3.8.* *_cpython r_base: - '4.3' target_platform: diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_.yaml similarity index 89% rename from .ci_support/osx_arm64_python3.8.____cpython.yaml rename to .ci_support/osx_arm64_.yaml index 7e2f503a..64bad6aa 100644 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -27,14 +27,9 @@ llvm_openmp: macos_machine: - arm64-apple-darwin20.0.0 pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x r-base: min_pin: x.x max_pin: x.x -python: -- 3.8.* *_cpython r_base: - '4.3' target_platform: diff --git a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonepython3.8.____cpython.yaml b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml similarity index 79% rename from .ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonepython3.8.____cpython.yaml rename to .ci_support/win_64_cuda_compilerNonecuda_compiler_versionNone.yaml index b5458e05..3fa468c3 100644 --- a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonepython3.8.____cpython.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: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython target_platform: - win-64 zip_keys: diff --git a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.8.____cpython.yaml b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml similarity index 79% rename from .ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.8.____cpython.yaml rename to .ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0.yaml index 485a6cc5..d7beb725 100644 --- a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.8.____cpython.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: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython target_platform: - win-64 zip_keys: diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.8.____cpython.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.8.____cpython.yaml deleted file mode 100644 index 7ddfc800..00000000 --- a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8python3.8.____cpython.yaml +++ /dev/null @@ -1,29 +0,0 @@ -c_compiler: -- vs2019 -c_stdlib: -- vs -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- nvcc -cuda_compiler_version: -- '11.8' -cxx_compiler: -- vs2019 -m2w64_c_compiler: -- m2w64-toolchain -m2w64_cxx_compiler: -- m2w64-toolchain -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.8.* *_cpython -target_platform: -- win-64 -zip_keys: -- - cuda_compiler - - cuda_compiler_version diff --git a/README.md b/README.md index a8a66c06..0da9fea6 100644 --- a/README.md +++ b/README.md @@ -41,101 +41,94 @@ Current build status
VariantStatus
linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython - variant + variant
linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython - variant + variant
linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython - variant + variant
linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython - variant + variant
linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython - variant + variant
linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython - variant + variant
linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpython - variant + variant
linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpython - variant + variant
linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpython - variant + variant
osx_64osx_64_python3.8.____cpython - variant + variant
osx_arm64osx_arm64_python3.8.____cpython - variant + variant
win_64_cuda_compilerNonecuda_compiler_versionNonewin_64_cuda_compilerNonecuda_compiler_versionNonepython3.8.____cpython - variant + variant
win_64_cuda_compilercuda-nvcccuda_compiler_version12.0win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.8.____cpython - variant + variant
win_64_cuda_compilernvcccuda_compiler_version11.8win_64_cuda_compilernvcccuda_compiler_version11.8python3.8.____cpython - variant + variant
- + - + - + - + - + - + - + - + - + - + - + - + - + - - - diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f642033d..a8892250 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -24,12 +24,10 @@ source: build: number: {{ build_number }} + noarch: python # Windows CUDA 11.8 fails due to a compilation error # xref: https://github.com/conda-forge/xgboost-feedstock/issues/173 skip: True # [win and cuda_compiler_version == "11.8"] - {% if python is defined %} - skip: {{ python.split(".")[:2] != min_python.split(".")[:2] }} - {% endif %} requirements: build: From 0349fc63ad8ac131bf91fdb05117220a99310658 Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Thu, 25 Jul 2024 16:52:49 -0700 Subject: [PATCH 121/121] Tidy up patches --- recipe/meta.yaml | 4 +- recipe/patches/0004-Backport-fixes.patch | 143 ++++++++++++++++++ .../patches/0004-Undo-dmlc-xgboost-9436.patch | 45 ------ ...tly-link-with-CCCL-standalone-or-CTK.patch | 65 -------- .../0006-Partial-fix-for-CTK-12.5-10574.patch | 65 -------- 5 files changed, 144 insertions(+), 178 deletions(-) create mode 100644 recipe/patches/0004-Backport-fixes.patch delete mode 100644 recipe/patches/0004-Undo-dmlc-xgboost-9436.patch delete mode 100644 recipe/patches/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK.patch delete mode 100644 recipe/patches/0006-Partial-fix-for-CTK-12.5-10574.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a8892250..0f147006 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,9 +18,7 @@ source: - patches/0001-Force-endian-flag-in-cross-compilation-mode.patch # [arm64 or aarch64 or ppc64le] - patches/0002-Enable-latest-libcxx-on-MacOS.patch # [osx] - patches/0003-Use-mingw-w64-path.patch - - patches/0004-Undo-dmlc-xgboost-9436.patch - - patches/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK.patch - - patches/0006-Partial-fix-for-CTK-12.5-10574.patch + - patches/0004-Backport-fixes.patch build: number: {{ build_number }} diff --git a/recipe/patches/0004-Backport-fixes.patch b/recipe/patches/0004-Backport-fixes.patch new file mode 100644 index 00000000..199aac90 --- /dev/null +++ b/recipe/patches/0004-Backport-fixes.patch @@ -0,0 +1,143 @@ +From 7782edc8e004bd3fe10879c52753d6a6de35947d Mon Sep 17 00:00:00 2001 +From: Hyunsu Cho +Date: Fri, 28 Jun 2024 17:38:34 -0700 +Subject: [PATCH] Backport fixes + +* Undo dmlc/xgboost#9436 +* Explicitly link with CCCL (standalone or CTK) (#10624, #10633) +* Partial fix for CTK 12.5 (#10574) +--- + CMakeLists.txt | 27 ++++++++++++++++++--------- + cmake/Utils.cmake | 7 +++---- + src/tree/updater_gpu_common.cuh | 21 ++++++++------------- + src/tree/updater_gpu_hist.cu | 1 + + 4 files changed, 30 insertions(+), 26 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c4ca82937..aa078405f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -224,6 +224,24 @@ if(USE_CUDA) + add_subdirectory(${PROJECT_SOURCE_DIR}/gputreeshap) + + find_package(CUDAToolkit REQUIRED) ++ find_package(CCCL CONFIG) ++ if(NOT CCCL_FOUND) ++ message(STATUS "Standalone CCCL not found. Attempting to use CCCL from CUDA Toolkit...") ++ find_package(CCCL CONFIG ++ HINTS ${CUDAToolkit_LIBRARY_DIR}/cmake) ++ if(NOT CCCL_FOUND) ++ message(STATUS "Could not locate CCCL from CUDA Toolkit. Using Thrust and CUB from CUDA Toolkit...") ++ find_package(libcudacxx CONFIG REQUIRED ++ HINTS ${CUDAToolkit_LIBRARY_DIR}/cmake) ++ find_package(CUB CONFIG REQUIRED ++ HINTS ${CUDAToolkit_LIBRARY_DIR}/cmake) ++ find_package(Thrust CONFIG REQUIRED ++ HINTS ${CUDAToolkit_LIBRARY_DIR}/cmake) ++ thrust_create_target(Thrust HOST CPP DEVICE CUDA) ++ add_library(CCCL::CCCL INTERFACE IMPORTED GLOBAL) ++ target_link_libraries(CCCL::CCCL INTERFACE libcudacxx::libcudacxx CUB::CUB Thrust) ++ endif() ++ endif() + endif() + + if(FORCE_COLORED_OUTPUT AND (CMAKE_GENERATOR STREQUAL "Ninja") AND +@@ -301,15 +319,6 @@ add_subdirectory(${xgboost_SOURCE_DIR}/plugin) + + if(PLUGIN_RMM) + find_package(rmm REQUIRED) +- +- # Patch the rmm targets so they reference the static cudart +- # Remove this patch once RMM stops specifying cudart requirement +- # (since RMM is a header-only library, it should not specify cudart in its CMake config) +- get_target_property(rmm_link_libs rmm::rmm INTERFACE_LINK_LIBRARIES) +- list(REMOVE_ITEM rmm_link_libs CUDA::cudart) +- list(APPEND rmm_link_libs CUDA::cudart_static) +- set_target_properties(rmm::rmm PROPERTIES INTERFACE_LINK_LIBRARIES "${rmm_link_libs}") +- get_target_property(rmm_link_libs rmm::rmm INTERFACE_LINK_LIBRARIES) + endif() + + if(PLUGIN_SYCL) +diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake +index d555f5edf..c1f19fdbb 100644 +--- a/cmake/Utils.cmake ++++ b/cmake/Utils.cmake +@@ -108,12 +108,12 @@ function(xgboost_set_cuda_flags target) + target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_NVTX=1) + endif() + ++ target_link_libraries(${target} ++ PRIVATE CCCL::CCCL CUDA::cudart_static) + target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_CUDA=1) + target_include_directories( + ${target} PRIVATE +- ${xgboost_SOURCE_DIR}/gputreeshap +- ${xgboost_SOURCE_DIR}/rabit/include +- ${CUDAToolkit_INCLUDE_DIRS}) ++ ${xgboost_SOURCE_DIR}/gputreeshap) + + if(MSVC) + target_compile_options(${target} PRIVATE +@@ -240,7 +240,6 @@ macro(xgboost_target_link_libraries target) + + if(USE_CUDA) + xgboost_set_cuda_flags(${target}) +- target_link_libraries(${target} PUBLIC CUDA::cudart_static) + endif() + + if(PLUGIN_RMM) +diff --git a/src/tree/updater_gpu_common.cuh b/src/tree/updater_gpu_common.cuh +index 1c3e6a552..5d999d6d6 100644 +--- a/src/tree/updater_gpu_common.cuh ++++ b/src/tree/updater_gpu_common.cuh +@@ -1,18 +1,13 @@ +-/*! +- * Copyright 2017-2019 XGBoost contributors ++/** ++ * Copyright 2017-2024, XGBoost contributors + */ + #pragma once +-#include +-#include +-#include +-#include +-#include +-#include +-#include "../common/categorical.h" +-#include "../common/device_helpers.cuh" +-#include "../common/random.h" ++#include // for numeric_limits ++#include // for ostream ++ + #include "gpu_hist/histogram.cuh" + #include "param.h" ++#include "xgboost/base.h" + + namespace xgboost::tree { + struct GPUTrainingParam { +@@ -54,8 +49,8 @@ enum DefaultDirection { + }; + + struct DeviceSplitCandidate { +- float loss_chg {-FLT_MAX}; +- DefaultDirection dir {kLeftDir}; ++ float loss_chg{-std::numeric_limits::max()}; ++ DefaultDirection dir{kLeftDir}; + int findex {-1}; + float fvalue {0}; + // categorical split, either it's the split category for OHE or the threshold for partition-based +diff --git a/src/tree/updater_gpu_hist.cu b/src/tree/updater_gpu_hist.cu +index 958fa0331..e126aeb31 100644 +--- a/src/tree/updater_gpu_hist.cu ++++ b/src/tree/updater_gpu_hist.cu +@@ -19,6 +19,7 @@ + #include "../common/cuda_context.cuh" // CUDAContext + #include "../common/device_helpers.cuh" + #include "../common/hist_util.h" ++#include "../common/random.h" // for ColumnSampler, GlobalRandom + #include "../common/timer.h" + #include "../data/ellpack_page.cuh" + #include "../data/ellpack_page.h" +-- +2.45.2 + diff --git a/recipe/patches/0004-Undo-dmlc-xgboost-9436.patch b/recipe/patches/0004-Undo-dmlc-xgboost-9436.patch deleted file mode 100644 index ef25bb7b..00000000 --- a/recipe/patches/0004-Undo-dmlc-xgboost-9436.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 3660a4216763d02d48cb1db63f5fee7ad02ad7d4 Mon Sep 17 00:00:00 2001 -From: Hyunsu Cho -Date: Fri, 28 Jun 2024 17:38:34 -0700 -Subject: [PATCH] [PATCH] Undo dmlc/xgboost#9436 - ---- - CMakeLists.txt | 9 --------- - cmake/Utils.cmake | 1 - - 2 files changed, 10 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c4ca82937..dc0f7e654 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -301,15 +301,6 @@ add_subdirectory(${xgboost_SOURCE_DIR}/plugin) - - if(PLUGIN_RMM) - find_package(rmm REQUIRED) -- -- # Patch the rmm targets so they reference the static cudart -- # Remove this patch once RMM stops specifying cudart requirement -- # (since RMM is a header-only library, it should not specify cudart in its CMake config) -- get_target_property(rmm_link_libs rmm::rmm INTERFACE_LINK_LIBRARIES) -- list(REMOVE_ITEM rmm_link_libs CUDA::cudart) -- list(APPEND rmm_link_libs CUDA::cudart_static) -- set_target_properties(rmm::rmm PROPERTIES INTERFACE_LINK_LIBRARIES "${rmm_link_libs}") -- get_target_property(rmm_link_libs rmm::rmm INTERFACE_LINK_LIBRARIES) - endif() - - if(PLUGIN_SYCL) -diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake -index d555f5edf..8659df7c3 100644 ---- a/cmake/Utils.cmake -+++ b/cmake/Utils.cmake -@@ -240,7 +240,6 @@ macro(xgboost_target_link_libraries target) - - if(USE_CUDA) - xgboost_set_cuda_flags(${target}) -- target_link_libraries(${target} PUBLIC CUDA::cudart_static) - endif() - - if(PLUGIN_RMM) --- -2.34.1 - diff --git a/recipe/patches/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK.patch b/recipe/patches/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK.patch deleted file mode 100644 index bce9467c..00000000 --- a/recipe/patches/0005-CMake-Explicitly-link-with-CCCL-standalone-or-CTK.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 6e58a81cf201d27c3acb304cdcd991cd46aa421f Mon Sep 17 00:00:00 2001 -From: Hyunsu Cho -Date: Wed, 24 Jul 2024 12:25:04 -0700 -Subject: [PATCH] [CMake] Explicitly link with CCCL (standalone or CTK) - -Also allow building with CCCL that's newer than CTK - -Co-authored-by: jakirkham ---- - CMakeLists.txt | 18 ++++++++++++++++++ - cmake/Utils.cmake | 6 +++--- - 2 files changed, 21 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index dc0f7e654..aa078405f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -224,6 +224,24 @@ if(USE_CUDA) - add_subdirectory(${PROJECT_SOURCE_DIR}/gputreeshap) - - find_package(CUDAToolkit REQUIRED) -+ find_package(CCCL CONFIG) -+ if(NOT CCCL_FOUND) -+ message(STATUS "Standalone CCCL not found. Attempting to use CCCL from CUDA Toolkit...") -+ find_package(CCCL CONFIG -+ HINTS ${CUDAToolkit_LIBRARY_DIR}/cmake) -+ if(NOT CCCL_FOUND) -+ message(STATUS "Could not locate CCCL from CUDA Toolkit. Using Thrust and CUB from CUDA Toolkit...") -+ find_package(libcudacxx CONFIG REQUIRED -+ HINTS ${CUDAToolkit_LIBRARY_DIR}/cmake) -+ find_package(CUB CONFIG REQUIRED -+ HINTS ${CUDAToolkit_LIBRARY_DIR}/cmake) -+ find_package(Thrust CONFIG REQUIRED -+ HINTS ${CUDAToolkit_LIBRARY_DIR}/cmake) -+ thrust_create_target(Thrust HOST CPP DEVICE CUDA) -+ add_library(CCCL::CCCL INTERFACE IMPORTED GLOBAL) -+ target_link_libraries(CCCL::CCCL INTERFACE libcudacxx::libcudacxx CUB::CUB Thrust) -+ endif() -+ endif() - endif() - - if(FORCE_COLORED_OUTPUT AND (CMAKE_GENERATOR STREQUAL "Ninja") AND -diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake -index 8659df7c3..c1f19fdbb 100644 ---- a/cmake/Utils.cmake -+++ b/cmake/Utils.cmake -@@ -108,12 +108,12 @@ function(xgboost_set_cuda_flags target) - target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_NVTX=1) - endif() - -+ target_link_libraries(${target} -+ PRIVATE CCCL::CCCL CUDA::cudart_static) - target_compile_definitions(${target} PRIVATE -DXGBOOST_USE_CUDA=1) - target_include_directories( - ${target} PRIVATE -- ${xgboost_SOURCE_DIR}/gputreeshap -- ${xgboost_SOURCE_DIR}/rabit/include -- ${CUDAToolkit_INCLUDE_DIRS}) -+ ${xgboost_SOURCE_DIR}/gputreeshap) - - if(MSVC) - target_compile_options(${target} PRIVATE --- -2.34.1 - diff --git a/recipe/patches/0006-Partial-fix-for-CTK-12.5-10574.patch b/recipe/patches/0006-Partial-fix-for-CTK-12.5-10574.patch deleted file mode 100644 index e2d63261..00000000 --- a/recipe/patches/0006-Partial-fix-for-CTK-12.5-10574.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 5fa754ff95d7f7bca4a68c1c23c299417de86de0 Mon Sep 17 00:00:00 2001 -From: Jiaming Yuan -Date: Tue, 16 Jul 2024 17:41:50 +0800 -Subject: [PATCH] Partial fix for CTK 12.5 (#10574) - ---- - src/tree/updater_gpu_common.cuh | 21 ++++++++------------- - src/tree/updater_gpu_hist.cu | 1 + - 2 files changed, 9 insertions(+), 13 deletions(-) - -diff --git a/src/tree/updater_gpu_common.cuh b/src/tree/updater_gpu_common.cuh -index 1c3e6a552..5d999d6d6 100644 ---- a/src/tree/updater_gpu_common.cuh -+++ b/src/tree/updater_gpu_common.cuh -@@ -1,18 +1,13 @@ --/*! -- * Copyright 2017-2019 XGBoost contributors -+/** -+ * Copyright 2017-2024, XGBoost contributors - */ - #pragma once --#include --#include --#include --#include --#include --#include --#include "../common/categorical.h" --#include "../common/device_helpers.cuh" --#include "../common/random.h" -+#include // for numeric_limits -+#include // for ostream -+ - #include "gpu_hist/histogram.cuh" - #include "param.h" -+#include "xgboost/base.h" - - namespace xgboost::tree { - struct GPUTrainingParam { -@@ -54,8 +49,8 @@ enum DefaultDirection { - }; - - struct DeviceSplitCandidate { -- float loss_chg {-FLT_MAX}; -- DefaultDirection dir {kLeftDir}; -+ float loss_chg{-std::numeric_limits::max()}; -+ DefaultDirection dir{kLeftDir}; - int findex {-1}; - float fvalue {0}; - // categorical split, either it's the split category for OHE or the threshold for partition-based -diff --git a/src/tree/updater_gpu_hist.cu b/src/tree/updater_gpu_hist.cu -index 958fa0331..e126aeb31 100644 ---- a/src/tree/updater_gpu_hist.cu -+++ b/src/tree/updater_gpu_hist.cu -@@ -19,6 +19,7 @@ - #include "../common/cuda_context.cuh" // CUDAContext - #include "../common/device_helpers.cuh" - #include "../common/hist_util.h" -+#include "../common/random.h" // for ColumnSampler, GlobalRandom - #include "../common/timer.h" - #include "../data/ellpack_page.cuh" - #include "../data/ellpack_page.h" --- -2.34.1 -
VariantStatus
linux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpythonlinux_64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11 - variant + variant
linux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpythonlinux_64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12 - variant + variant
linux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpythonlinux_64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12 - variant + variant
linux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpythonlinux_aarch64_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11 - variant + variant
linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpythonlinux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12 - variant + variant
linux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpythonlinux_aarch64_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12 - variant + variant
linux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11python3.8.____cpythonlinux_ppc64le_c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11 - variant + variant
linux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12python3.8.____cpythonlinux_ppc64le_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12 - variant + variant
linux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12python3.8.____cpythonlinux_ppc64le_c_compiler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12 - variant + variant
osx_64_python3.8.____cpythonosx_64 - variant + variant
osx_arm64_python3.8.____cpythonosx_arm64 - variant + variant
win_64_cuda_compilerNonecuda_compiler_versionNonepython3.8.____cpythonwin_64_cuda_compilerNonecuda_compiler_versionNone - variant + variant
win_64_cuda_compilercuda-nvcccuda_compiler_version12.0python3.8.____cpythonwin_64_cuda_compilercuda-nvcccuda_compiler_version12.0 - variant - -
win_64_cuda_compilernvcccuda_compiler_version11.8python3.8.____cpython - - variant + variant