Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove pins on geospatial libraries, RAPIDS nightlies #722

Merged
merged 8 commits into from
Sep 24, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ jobs:
pr-builder:
needs:
- build
- test-conda-nightly-env
# - test-conda-nightly-env
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
build:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
with:
build_type: pull-request
test-conda-nightly-env:
secrets: inherit
# We use a build workflow so that we get CPU jobs and high matrix coverage
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
with:
build_type: pull-request
script: "ci/test_conda_nightly_env.sh"
# test-conda-nightly-env:
# secrets: inherit
# # We use a build workflow so that we get CPU jobs and high matrix coverage
# uses: rapidsai/shared-workflows/.github/workflows/[email protected]
# with:
# build_type: pull-request
# script: "ci/test_conda_nightly_env.sh"
2 changes: 2 additions & 0 deletions ci/build_python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ source rapids-date-string

CONDA_CONFIG_FILE="conda/recipes/versions.yaml"

source ./ci/use_conda_packages_from_prs.sh

rapids-print-env

rapids-logger "Build rapids-xgboost"
Expand Down
26 changes: 26 additions & 0 deletions ci/use_conda_packages_from_prs.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#!/bin/bash

LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1678 cpp)
RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1678 python)

CUDF_CPP_CHANNEL=$(rapids-get-pr-conda-artifact cudf 16806 cpp)
CUDF_PYTHON_CHANNEL=$(rapids-get-pr-conda-artifact cudf 16806 python)

UCXX_CHANNEL=$(rapids-get-pr-conda-artifact ucxx 278 cpp)

LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 2433 cpp)
RAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 2433 python)

LIBCUSPATIAL_CHANNEL=$(rapids-get-pr-conda-artifact cuspatial 1441 cpp)
CUSPATIAL_CHANNEL=$(rapids-get-pr-conda-artifact cuspatial 1441 python)

conda config --system --add channels "${LIBRMM_CHANNEL}"
conda config --system --add channels "${RMM_CHANNEL}"
conda config --system --add channels "${CUDF_CPP_CHANNEL}"
conda config --system --add channels "${CUDF_PYTHON_CHANNEL}"
conda config --system --add channels "${UCXX_CHANNEL}"
conda config --system --add channels "${LIBRAFT_CHANNEL}"
conda config --system --add channels "${RAFT_CHANNEL}"
conda config --system --add channels "${LIBCUSPATIAL_CHANNEL}"
conda config --system --add channels "${CUSPATIAL_CHANNEL}"

35 changes: 14 additions & 21 deletions conda/recipes/rapids/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,32 +35,25 @@ requirements:
- numpy {{ numpy_version }}
- nvtx {{ nvtx_version }}
- python
# TODO: remove all the floors on specific nightly versions once RAPIDS supports 'fmt>11' and 'spdlog>14'
- cudf ={{ major_minor_version }}.*,>=24.10.00a320
- cuvs ={{ major_minor_version }}.*,>=24.10.00a60
- cugraph ={{ major_minor_version }}.*,>=24.10.00a74
- nx-cugraph ={{ major_minor_version }}.*,>=24.10.00a74
- cuml ={{ major_minor_version }}.*,>=24.10.00a55
- cucim ={{ major_minor_version }}.*,>=24.10.00a17
- cuspatial ={{ major_minor_version }}.*,>=24.10.00a41
- cuproj ={{ major_minor_version }}.*,>=24.10.00a41
- custreamz ={{ major_minor_version }}.*,>=24.10.00a320
- cuxfilter ={{ major_minor_version }}.*,>=24.10.00a19
- dask-cuda ={{ major_minor_version }}.*,>=24.10.00a19
- cudf ={{ major_minor_version }}.*
- cuvs ={{ major_minor_version }}.*
- cugraph ={{ major_minor_version }}.*
- nx-cugraph ={{ major_minor_version }}.*
- cuml ={{ major_minor_version }}.*
- cucim ={{ major_minor_version }}.*
- cuspatial ={{ major_minor_version }}.*
- cuproj ={{ major_minor_version }}.*
- custreamz ={{ major_minor_version }}.*
- cuxfilter ={{ major_minor_version }}.*
- dask-cuda ={{ major_minor_version }}.*
- rapids-xgboost ={{ major_minor_version }}.*
- rmm ={{ major_minor_version }}.*,>=24.10.00a38
- pylibcugraph ={{ major_minor_version }}.*,>=24.10.00a74
- libcugraph_etl ={{ major_minor_version }}.*,>=24.10.00a74
- rmm ={{ major_minor_version }}.*
- pylibcugraph ={{ major_minor_version }}.*
- libcugraph_etl ={{ major_minor_version }}.*
{% if cuda_major == "11" %}
- ptxcompiler # CUDA enhanced compat. See https://github.com/rapidsai/ptxcompiler
{% endif %}
- conda-forge::ucx {{ ucx_version }}
# TODO: remove pins on pyogrio and tiledb once cuspatial supports 'fmt>11' and 'spdlog>14'
# ref:
# * https://github.com/rapidsai/build-planning/issues/56
# * https://github.com/rapidsai/cuspatial/pull/1453#issuecomment-2335527542
- pyogrio <0.8
- tiledb <2.19

test:
requires:
Expand Down