Merge pull request #54 from jakirkham-feedstocks/merge_upstream_10

rapidsai · Mar 22, 2024 · b055a94 · b055a94
2 parents a713479 + b563b5a
commit b055a94
Show file tree

Hide file tree

Showing 13 changed files with 77 additions and 56 deletions.
diff --git a/...c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/...c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml
@@ -43,7 +43,7 @@ target_platform:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
-  - cdt_name
   - docker_image
diff --git a/...piler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/...piler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml
@@ -43,7 +43,7 @@ target_platform:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
-  - cdt_name
   - docker_image
diff --git a/...c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/...c_compiler_version11cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml
@@ -47,7 +47,7 @@ target_platform:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
-  - cdt_name
   - docker_image
diff --git a/...piler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/...piler_version12cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml
@@ -47,7 +47,7 @@ target_platform:
 zip_keys:
 - - c_compiler_version
   - cxx_compiler_version
+  - cdt_name
   - cuda_compiler
   - cuda_compiler_version
-  - cdt_name
   - docker_image
diff --git a/.ci_support/migrations/cuda120.yaml b/.ci_support/migrations/cuda120.yaml
@@ -36,13 +36,25 @@ __migrator:
       - quay.io/condaforge/linux-anvil-cuda:10.2          # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
       - quay.io/condaforge/linux-anvil-cuda:11.0          # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
       - quay.io/condaforge/linux-anvil-cuda:11.1          # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
+
+      # case: CUDA 11.2
       - quay.io/condaforge/linux-anvil-cuda:11.2          # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
       # case: native compilation (build == target)
       - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.2  # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"]
       - quay.io/condaforge/linux-anvil-aarch64-cuda:11.2  # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"]
       # case: cross-compilation (build != target)
       - quay.io/condaforge/linux-anvil-cuda:11.2          # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-64"]
       - quay.io/condaforge/linux-anvil-cuda:11.2          # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
+
+      # case: CUDA 11.8
+      - quay.io/condaforge/linux-anvil-cuda:11.8          # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
+      # case: native compilation (build == target)
+      - quay.io/condaforge/linux-anvil-ppc64le-cuda:11.8  # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-ppc64le"]
+      - quay.io/condaforge/linux-anvil-aarch64-cuda:11.8  # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-aarch64"]
+      # case: cross-compilation (build != target)
+      - quay.io/condaforge/linux-anvil-cuda:11.8          # [ppc64le and os.environ.get("BUILD_PLATFORM") == "linux-64"]
+      - quay.io/condaforge/linux-anvil-cuda:11.8          # [aarch64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
+
       # case: non-CUDA builds
       - quay.io/condaforge/linux-anvil-cos7-x86_64        # [linux64 and os.environ.get("BUILD_PLATFORM") == "linux-64"]
     cuda_compiler_version:
@@ -51,6 +63,7 @@ __migrator:
       - 11.0                       # [(linux64 or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
       - 11.1                       # [(linux64 or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
       - 11.2                       # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
+      - 11.8                       # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
       - 12.0                       # [(linux or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
   commit_message: |
     Rebuild for CUDA 12 w/arch + Windows support
@@ -77,6 +90,9 @@ cxx_compiler_version:          # [linux and os.environ.get("CF_CUDA_ENABLED", "F
 fortran_compiler_version:      # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
   - 12                         # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
 
+c_stdlib_version:              # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
+  - 2.17                       # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
+
 cdt_name:                      # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
   - cos7                       # [linux and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
 

diff --git a/.ci_support/migrations/python312.yaml b/.ci_support/migrations/python312.yaml
@@ -1,33 +1,33 @@
 migrator_ts: 1695046563
 __migrator:
-    migration_number: 1
-    operation: key_add
-    primary_key: python
-    ordering:
-        python:
-            - 3.6.* *_cpython
-            - 3.7.* *_cpython
-            - 3.8.* *_cpython
-            - 3.9.* *_cpython
-            - 3.10.* *_cpython
-            - 3.11.* *_cpython
-            - 3.12.* *_cpython  # new entry
-            - 3.6.* *_73_pypy
-            - 3.7.* *_73_pypy
-            - 3.8.* *_73_pypy
-            - 3.9.* *_73_pypy
-    paused: false
-    longterm: True
-    pr_limit: 30
-    max_solver_attempts: 6  # this will make the bot retry "not solvable" stuff 6 times
-    exclude:
-      # this shouldn't attempt to modify the python feedstocks
-      - python
-      - pypy3.6
-      - pypy-meta
-      - cross-python
-      - python_abi
-    exclude_pinned_pkgs: false
+  migration_number: 1
+  operation: key_add
+  primary_key: python
+  ordering:
+    python:
+      - 3.6.* *_cpython
+      - 3.7.* *_cpython
+      - 3.8.* *_cpython
+      - 3.9.* *_cpython
+      - 3.10.* *_cpython
+      - 3.11.* *_cpython
+      - 3.12.* *_cpython  # new entry
+      - 3.6.* *_73_pypy
+      - 3.7.* *_73_pypy
+      - 3.8.* *_73_pypy
+      - 3.9.* *_73_pypy
+  paused: false
+  longterm: True
+  pr_limit: 30
+  max_solver_attempts: 6  # this will make the bot retry "not solvable" stuff 6 times
+  exclude:
+    # this shouldn't attempt to modify the python feedstocks
+    - python
+    - pypy3.6
+    - pypy-meta
+    - cross-python
+    - python_abi
+  exclude_pinned_pkgs: false
 
 python:
   - 3.12.* *_cpython

diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml
@@ -43,14 +43,6 @@ jobs:
             os: ubuntu
             runs_on: ['ubuntu-latest']
             DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64
-          - CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.0
-            UPLOAD_PACKAGES: True
-            os: windows
-            runs_on: ['windows-latest']
-          - CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.8
-            UPLOAD_PACKAGES: True
-            os: windows
-            runs_on: ['windows-latest']
           - CONFIG: osx_64_
             UPLOAD_PACKAGES: True
             os: macos
@@ -59,6 +51,14 @@ jobs:
             UPLOAD_PACKAGES: True
             os: macos
             runs_on: ['macos-latest']
+          - CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.0
+            UPLOAD_PACKAGES: True
+            os: windows
+            runs_on: ['windows-latest']
+          - CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.8
+            UPLOAD_PACKAGES: True
+            os: windows
+            runs_on: ['windows-latest']
     steps:
 
     - name: Manage disk space
@@ -82,11 +82,10 @@ jobs:
                                  microsoft-edge-stable
         sudo apt-get autoremove -y >& /dev/null
         sudo apt-get autoclean -y >& /dev/null
-        sudo docker image prune --all --force
         df -h
 
     - name: Checkout code
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Build on Linux
       if: matrix.os == 'ubuntu'

diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/build-locally.py b/build-locally.py
diff --git a/conda-forge.yml b/conda-forge.yml
@@ -18,10 +18,14 @@ github_actions:
   artifact_retention_days: 7
   free_disk_space: true
   upload_packages: true
+os_version:
+  linux_64: cos7
+  linux_aarch64: cos7
+  linux_ppc64le: cos7
 provider:
   linux: github_actions
   linux_aarch64: github_actions
   osx: github_actions
   win: github_actions
-test_on_native_only: true
+test: native_and_emulated
 upload_on_branch: main
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,6 +1,6 @@
 {% set name = "xgboost" %}
 {% set version = "2.0.3" %}
-{% set build_number = 2 %}
+{% set build_number = 3 %}
 
 package:
   name: xgboost-split
@@ -27,8 +27,7 @@ requirements:
     - {{ compiler('c') }}
     - {{ compiler('cxx') }}
     - {{ compiler('cuda') }}  # [cuda_compiler != "None" and cuda_compiler_version != "None"]
-    - git                     # [not win]
-    - m2-git                  # [win]
+    - sysroot_{{ target_platform }} 2.17  # [linux]
     - cmake
     - llvm-openmp  # [osx]
     - libgomp      # [linux]
@@ -56,6 +55,7 @@ outputs:
         - {{ compiler('c') }}
         - {{ compiler('cxx') }}
         - {{ compiler('cuda') }}  # [cuda_compiler != "None"]
+        - sysroot_{{ target_platform }} 2.17  # [linux]
         - git
         - cmake
         - make
@@ -137,6 +137,7 @@ outputs:
         - {{ compiler('m2w64_cxx') }}  # [win]
         - {{ compiler('c') }}
         - {{ compiler('cxx') }}
+        - sysroot_{{ target_platform }} 2.17  # [linux]
         - llvm-openmp                  # [osx]
         - libgomp                      # [linux]
         - git