From 6d49e5f70840b4e4b2d3ade7b2097de2891967f3 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 31 Jul 2024 02:16:39 +0000 Subject: [PATCH 1/3] updated v2.1.1 --- recipe/meta.yaml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4fe6dbfe..03f56fe4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,3 +1,4 @@ +{% set string_prefix = "cpu" %} {% set name = "xgboost" %} {% set version = "2.1.1" %} {% set build_number = 0 %} @@ -27,10 +28,7 @@ build: # xref: https://github.com/conda-forge/xgboost-feedstock/issues/173 {% if python is defined and cuda_compiler_version is defined %} skip: >- - {{ ( - python.split(".")[:2] != min_python.split(".")[:2] or - (win and cuda_compiler_version == "11.8") - ) }} + {{ ( python.split(".")[:2] != min_python.split(".")[:2] or (win and cuda_compiler_version == "11.8") ) }} {% endif %} requirements: @@ -54,7 +52,7 @@ outputs: script: install-libxgboost.sh # [not win] script: install-win-wrapper.bat # [win] build: - activate_in_script: True + activate_in_script: true string: {{ string_prefix }}_h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} ignore_run_exports_from: - {{ compiler('cuda') }} # [(cuda_compiler_version or "").startswith("11")] @@ -138,7 +136,7 @@ outputs: - name: py-xgboost-cpu build: noarch: python - skip: True # [cuda_compiler != "None"] + skip: true # [cuda_compiler != "None"] requirements: host: - python >={{ min_python }} @@ -155,7 +153,7 @@ outputs: - name: py-xgboost-gpu build: noarch: python - skip: True # [cuda_compiler == "None"] + skip: true # [cuda_compiler == "None"] requirements: host: - python >={{ min_python }} @@ -200,7 +198,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 @@ -257,8 +255,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 @@ -275,8 +273,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 f586eb4994fbcbbd39a60ca418a184aa92efe6c1 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 30 Jul 2024 19:30:17 -0700 Subject: [PATCH 2/3] Consolidate `set string_prefix` in single line Rewrite to keep the autoupdate bot happy. --- recipe/meta.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 03f56fe4..23ea40c3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,11 +1,9 @@ -{% set string_prefix = "cpu" %} {% set name = "xgboost" %} {% set version = "2.1.1" %} {% 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"] +{% set string_prefix = "cuda" ~ (cuda_compiler_version | replace('.', '')) if cuda_compiler_version != "None" else "cpu" %} package: name: xgboost-split From d73b84642552f8c6d0dc05230bafe527348c57f5 Mon Sep 17 00:00:00 2001 From: jakirkham Date: Tue, 30 Jul 2024 19:35:38 -0700 Subject: [PATCH 3/3] Handle `cuda_compiler_version` as `undefined` --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 23ea40c3..cb68c656 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -3,7 +3,7 @@ {% set build_number = 0 %} {% set min_python = "3.8" %} -{% set string_prefix = "cuda" ~ (cuda_compiler_version | replace('.', '')) if cuda_compiler_version != "None" else "cpu" %} +{% set string_prefix = "cuda" ~ (cuda_compiler_version | replace('.', '')) if (cuda_compiler_version or "None") != "None" else "cpu" %} package: name: xgboost-split