Merge branch 'main' into fix_cudart_link

hcho3 · Aug 2, 2023 · 6320e31 · 6320e31
2 parents da68457 + 19b1ff0
commit 6320e31
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 18 deletions.
diff --git a/...c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml b/...c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml
@@ -34,6 +34,7 @@ python:
 - 3.9.* *_cpython
 r_base:
 - '4.2'
+- '4.3'
 target_platform:
 - linux-64
 zip_keys:

diff --git a/...piler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/...piler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml
@@ -34,6 +34,7 @@ python:
 - 3.9.* *_cpython
 r_base:
 - '4.2'
+- '4.3'
 target_platform:
 - linux-64
 zip_keys:

diff --git a/...c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml b/...c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml
@@ -38,6 +38,7 @@ python:
 - 3.9.* *_cpython
 r_base:
 - '4.2'
+- '4.3'
 target_platform:
 - linux-aarch64
 zip_keys:

diff --git a/.ci_support/migrations/r_base43.yaml b/.ci_support/migrations/r_base43.yaml
@@ -0,0 +1,17 @@
+migrator_ts: 1682187595
+__migrator:
+  kind: version
+  migration_number: 1
+  bump_number: 1
+  operation: key_add
+  commit_message: "Rebuild for r-base 4.3"
+  primary_key: r_base
+  automerge: True
+  longterm: True
+  include_noarch: True
+  pr_limit: 40
+  conda_forge_yml_patches:
+    provider.win_64: win_disabled
+
+r_base:
+  - 4.3   # [not win]
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -34,6 +34,7 @@ python:
 - 3.9.* *_cpython
 r_base:
 - '4.2'
+- '4.3'
 target_platform:
 - osx-64
 zip_keys:

diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -34,6 +34,7 @@ python:
 - 3.9.* *_cpython
 r_base:
 - '4.2'
+- '4.3'
 target_platform:
 - osx-arm64
 zip_keys:

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
diff --git a/README.md b/README.md
diff --git a/conda-forge.yml b/conda-forge.yml
@@ -18,3 +18,5 @@ provider:
   osx: github_actions
   win: github_actions
 test_on_native_only: true
+azure:
+  free_disk_space: true
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,6 +1,6 @@
 {% set name = "xgboost" %}
 {% set version = "1.7.4" %}
-{% set build_number = "3" %}
+{% set build_number = "5" %}
 {% set rapids_version = "23.08" %}
 
 package:
@@ -80,12 +80,14 @@ outputs:
         - python                                 # [build_platform != target_platform]
         - cross-python_{{ target_platform }}     # [build_platform != target_platform]
       host:
-        - {{ pin_subpackage('libxgboost', exact=True) }}
+        - {{ pin_subpackage('libxgboost', max_pin="x.x.x.x.x.x") }}
+        - libxgboost =*=rapidsai_h*_{{ PKG_BUILDNUM }}
         - python
         - setuptools
         - pip
       run:
-        - {{ pin_subpackage('libxgboost', exact=True) }}
+        - {{ pin_subpackage('libxgboost', max_pin="x.x.x.x.x.x") }}
+        - libxgboost =*=rapidsai_h*_{{ PKG_BUILDNUM }}
         - python
         - numpy
         - scipy
@@ -103,7 +105,8 @@ outputs:
         - python
       run:
         - python
-        - {{ pin_subpackage('py-xgboost', exact=True) }}
+        - {{ pin_subpackage('py-xgboost', max_pin="x.x.x.x.x.x") }}
+        - py-xgboost =*=rapidsai_py{{ CONDA_PY }}h*_{{ PKG_BUILDNUM }}
 
   - name: r-xgboost
     script: install-r-xgboost.sh  # [not win]
@@ -114,34 +117,36 @@ outputs:
         - lib/R/lib
     requirements:
       build:
-        - {{ compiler('m2w64_c') }}          # [win]
-        - {{ compiler('m2w64_cxx') }}        # [win]
+        - {{ compiler('m2w64_c') }}    # [win]
+        - {{ compiler('m2w64_cxx') }}  # [win]
         - {{ compiler('c') }}
         - {{ compiler('cxx') }}
         - llvm-openmp            # [osx]
         - libgomp                # [linux]
         - git
-        - make                   # [not win]
-        - posix                  # [win]
+        - 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]
+        - 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', exact=True) }}
+        - {{ pin_subpackage('libxgboost', max_pin="x.x.x.x.x.x") }}
+        - libxgboost =*=rapidsai_h*_{{ PKG_BUILDNUM }}
         - r-base
         - r-matrix
         - r-data.table
         - r-magrittr
         - r-jsonlite
         - r-knitr
       run:
-        - {{ pin_subpackage('libxgboost', exact=True) }}
+        - {{ pin_subpackage('libxgboost', max_pin="x.x.x.x.x.x") }}
+        - libxgboost =*=rapidsai_h*_{{ PKG_BUILDNUM }}
         - r-base
         - r-matrix
         - r-data.table
@@ -178,3 +183,4 @@ extra:
     - jakirkham
     - ksangeek
     - xhochy
+    - mfansler