Skip to content

Forward-merge branch-25.06 into branch-25.08 #683

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

Merged
merged 3 commits into from
May 8, 2025
Merged
Show file tree
Hide file tree
Changes from all 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
13 changes: 7 additions & 6 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ concurrency:
jobs:
python-build:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.06
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@python-3.13
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand All @@ -37,7 +37,7 @@ jobs:
upload-conda:
needs: [python-build]
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-25.06
uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@python-3.13
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand All @@ -47,7 +47,7 @@ jobs:
if: github.ref_type == 'branch'
needs: python-build
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.06
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@python-3.13
with:
arch: "amd64"
branch: ${{ inputs.branch }}
Expand All @@ -59,7 +59,7 @@ jobs:
sha: ${{ inputs.sha }}
wheel-build:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@python-3.13
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
Expand All @@ -68,16 +68,17 @@ jobs:
script: ci/build_wheel.sh
# This selects "ARCH=amd64 + the latest supported Python + CUDA".
matrix_filter: map(select(.ARCH == "amd64")) | group_by(.CUDA_VER|split(".")|map(tonumber)|.[0]) | map(max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))]))
package-name: cuxfilter
package-type: python
wheel-name: cuxfilter
pure-wheel: true
wheel-publish:
needs: wheel-build
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.06
uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@python-3.13
with:
build_type: ${{ inputs.build_type || 'branch' }}
branch: ${{ inputs.branch }}
sha: ${{ inputs.sha }}
date: ${{ inputs.date }}
package-name: cuxfilter
package-type: python
20 changes: 10 additions & 10 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- wheel-tests
- telemetry-setup
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-25.06
uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@python-3.13
if: always()
with:
needs: ${{ toJSON(needs) }}
Expand All @@ -40,7 +40,7 @@ jobs:
changed-files:
secrets: inherit
needs: telemetry-setup
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@branch-25.06
uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@python-3.13
with:
files_yaml: |
test_notebooks:
Expand All @@ -60,27 +60,27 @@ jobs:
checks:
secrets: inherit
needs: telemetry-setup
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-25.06
uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@python-3.13
with:
ignored_pr_jobs: telemetry-summarize
conda-python-build:
needs: checks
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.06
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@python-3.13
with:
build_type: pull-request
conda-python-tests:
needs: [conda-python-build, changed-files]
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.06
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@python-3.13
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
with:
build_type: pull-request
run_codecov: false
conda-notebook-tests:
needs: [conda-python-build, changed-files]
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.06
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@python-3.13
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_notebooks
with:
build_type: pull-request
Expand All @@ -91,7 +91,7 @@ jobs:
docs-build:
needs: conda-python-build
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.06
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@python-3.13
with:
build_type: pull-request
node_type: "gpu-l4-latest-1"
Expand All @@ -101,19 +101,19 @@ jobs:
wheel-build:
needs: checks
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@python-3.13
with:
build_type: pull-request
script: ci/build_wheel.sh
# This selects "ARCH=amd64 + the latest supported Python + CUDA".
matrix_filter: map(select(.ARCH == "amd64")) | group_by(.CUDA_VER|split(".")|map(tonumber)|.[0]) | map(max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))]))
package-name: cuxfilter
package-type: python
wheel-name: cuxfilter
pure-wheel: true
wheel-tests:
needs: [wheel-build, changed-files]
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.06
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@python-3.13
if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python
with:
build_type: pull-request
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-external.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ on:
jobs:
test-external:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.06
uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@python-3.13
with:
build_type: branch
node_type: "gpu-l4-latest-1"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ on:
jobs:
conda-python-tests:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.06
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@python-3.13
with:
build_type: ${{ inputs.build_type }}
branch: ${{ inputs.branch }}
date: ${{ inputs.date }}
sha: ${{ inputs.sha }}
wheel-tests:
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.06
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@python-3.13
with:
build_type: ${{ inputs.build_type }}
branch: ${{ inputs.branch }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/trigger-breaking-change-alert.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
trigger-notifier:
if: contains(github.event.pull_request.labels.*.name, 'breaking')
secrets: inherit
uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@branch-25.06
uses: rapidsai/shared-workflows/.github/workflows/breaking-change-alert.yaml@python-3.13
with:
sender_login: ${{ github.event.sender.login }}
sender_avatar: ${{ github.event.sender.avatar_url }}
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -156,26 +156,26 @@ For the nightly version of `cuxfilter`:
```bash
# for CUDA 12
conda install -c rapidsai-nightly -c conda-forge -c nvidia \
cuxfilter=25.06 python=3.12 cuda-version=12.8
cuxfilter=25.06 python=3.13 cuda-version=12.8

# for CUDA 11
conda install -c rapidsai-nightly -c conda-forge -c nvidia \
cuxfilter=25.06 python=3.12 cuda-version=11.8
cuxfilter=25.06 python=3.13 cuda-version=11.8
```

For the stable version of `cuxfilter`:

```bash
# for CUDA 12
conda install -c rapidsai -c conda-forge -c nvidia \
cuxfilter python=3.12 cuda-version=12.8
cuxfilter python=3.13 cuda-version=12.8

# for CUDA 11
conda install -c rapidsai -c conda-forge -c nvidia \
cuxfilter python=3.12 cuda-version=11.8
cuxfilter python=3.13 cuda-version=11.8
```

Note: cuxfilter is supported only on Linux, and with Python versions 3.10, 3.11, and 3.12.
Note: cuxfilter is supported only on Linux, and with Python versions 3.10, 3.11, 3.12, and 3.13.

> Above are sample install snippets for cuxfilter, see the [Get RAPIDS version picker](https://rapids.ai/start.html) for installing the latest `cuxfilter` version.

Expand Down
2 changes: 1 addition & 1 deletion ci/build_docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -euo pipefail

rapids-logger "Downloading artifacts from previous jobs"
PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
PYTHON_CHANNEL=$(rapids-download-conda-from-github python)

rapids-logger "Create test conda environment"
. /opt/conda/etc/profile.d/conda.sh
Expand Down
2 changes: 1 addition & 1 deletion ci/build_python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export RAPIDS_PACKAGE_VERSION
# populates `RATTLER_CHANNELS` array and `RATTLER_ARGS` array
source rapids-rattler-channel-string

rapids-logger "Building cuxfilter"
rapids-logger "Building cuxfilter python package"

# TODO: Remove `--test skip` flag once importing on a CPU works
# --no-build-id allows for caching with `sccache`
Expand Down
1 change: 0 additions & 1 deletion ci/release/update-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ DEPENDENCIES=(
dask-cuda
dask-cudf
cugraph
cuspatial
)
for DEP in "${DEPENDENCIES[@]}"; do
for FILE in dependencies.yaml conda/environments/*.yaml; do
Expand Down
2 changes: 1 addition & 1 deletion ci/test_notebooks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -euo pipefail
. /opt/conda/etc/profile.d/conda.sh

rapids-logger "Downloading artifacts from previous jobs"
PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
PYTHON_CHANNEL=$(rapids-download-conda-from-github python)

rapids-logger "Generate notebook testing dependencies"
rapids-dependency-file-generator \
Expand Down
2 changes: 1 addition & 1 deletion ci/test_python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -euo pipefail
. /opt/conda/etc/profile.d/conda.sh

rapids-logger "Downloading artifacts from previous jobs"
PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
PYTHON_CHANNEL=$(rapids-download-conda-from-github python)

rapids-logger "Generate Python testing dependencies"
rapids-dependency-file-generator \
Expand Down
4 changes: 2 additions & 2 deletions ci/test_wheel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
set -eou pipefail

RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})"
RAPIDS_PY_WHEEL_NAME="cuxfilter_${RAPIDS_PY_CUDA_SUFFIX}" RAPIDS_PY_WHEEL_PURE="1" rapids-download-wheels-from-s3 ./dist
CUXFILTER_WHEELHOUSE=$(RAPIDS_PY_WHEEL_NAME="cuxfilter_${RAPIDS_PY_CUDA_SUFFIX}" RAPIDS_PY_WHEEL_PURE="1" rapids-download-wheels-from-github python)

# echo to expand wildcard before adding `[extra]` requires for pip
rapids-pip-retry install $(echo ./dist/cuxfilter*.whl)[test]
rapids-pip-retry install $(echo "${CUXFILTER_WHEELHOUSE}"/cuxfilter*.whl)[test]

python -m pytest -n 8 ./python/cuxfilter/tests
5 changes: 2 additions & 3 deletions conda/environments/all_cuda-118_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ dependencies:
- cudf==25.6.*,>=0.0.0a0
- cugraph==25.6.*,>=0.0.0a0
- cupy>=12.0.0
- cuspatial==25.6.*,>=0.0.0a0
- dask-cuda==25.6.*,>=0.0.0a0
- dask-cudf==25.6.*,>=0.0.0a0
- datashader>=0.15
Expand All @@ -27,7 +26,7 @@ dependencies:
- nbsphinx
- nodejs>=18
- notebook>=0.5.0
- numba>=0.59.1,<0.61.0a0
- numba>=0.59.1,<0.62.0a0
- numpy>=1.23,<3.0a0
- numpydoc
- packaging
Expand All @@ -38,7 +37,7 @@ dependencies:
- pytest
- pytest-cov
- pytest-xdist
- python>=3.10,<3.13
- python>=3.10,<3.14
- rapids-build-backend>=0.3.0,<0.4.0.dev0
- recommonmark
- setuptools
Expand Down
5 changes: 2 additions & 3 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ dependencies:
- cudf==25.6.*,>=0.0.0a0
- cugraph==25.6.*,>=0.0.0a0
- cupy>=12.0.0
- cuspatial==25.6.*,>=0.0.0a0
- dask-cuda==25.6.*,>=0.0.0a0
- dask-cudf==25.6.*,>=0.0.0a0
- datashader>=0.15
Expand All @@ -27,7 +26,7 @@ dependencies:
- nbsphinx
- nodejs>=18
- notebook>=0.5.0
- numba>=0.59.1,<0.61.0a0
- numba>=0.59.1,<0.62.0a0
- numpy>=1.23,<3.0a0
- numpydoc
- packaging
Expand All @@ -38,7 +37,7 @@ dependencies:
- pytest
- pytest-cov
- pytest-xdist
- python>=3.10,<3.13
- python>=3.10,<3.14
- rapids-build-backend>=0.3.0,<0.4.0.dev0
- recommonmark
- setuptools
Expand Down
5 changes: 2 additions & 3 deletions conda/environments/all_cuda-128_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ dependencies:
- cudf==25.6.*,>=0.0.0a0
- cugraph==25.6.*,>=0.0.0a0
- cupy>=12.0.0
- cuspatial==25.6.*,>=0.0.0a0
- dask-cuda==25.6.*,>=0.0.0a0
- dask-cudf==25.6.*,>=0.0.0a0
- datashader>=0.15
Expand All @@ -26,7 +25,7 @@ dependencies:
- nbsphinx
- nodejs>=18
- notebook>=0.5.0
- numba>=0.59.1,<0.61.0a0
- numba>=0.59.1,<0.62.0a0
- numpy>=1.23,<3.0a0
- numpydoc
- packaging
Expand All @@ -37,7 +36,7 @@ dependencies:
- pytest
- pytest-cov
- pytest-xdist
- python>=3.10,<3.13
- python>=3.10,<3.14
- rapids-build-backend>=0.3.0,<0.4.0.dev0
- recommonmark
- setuptools
Expand Down
5 changes: 2 additions & 3 deletions conda/environments/all_cuda-128_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ dependencies:
- cudf==25.6.*,>=0.0.0a0
- cugraph==25.6.*,>=0.0.0a0
- cupy>=12.0.0
- cuspatial==25.6.*,>=0.0.0a0
- dask-cuda==25.6.*,>=0.0.0a0
- dask-cudf==25.6.*,>=0.0.0a0
- datashader>=0.15
Expand All @@ -26,7 +25,7 @@ dependencies:
- nbsphinx
- nodejs>=18
- notebook>=0.5.0
- numba>=0.59.1,<0.61.0a0
- numba>=0.59.1,<0.62.0a0
- numpy>=1.23,<3.0a0
- numpydoc
- packaging
Expand All @@ -37,7 +36,7 @@ dependencies:
- pytest
- pytest-cov
- pytest-xdist
- python>=3.10,<3.13
- python>=3.10,<3.14
- rapids-build-backend>=0.3.0,<0.4.0.dev0
- recommonmark
- setuptools
Expand Down
3 changes: 1 addition & 2 deletions conda/recipes/cuxfilter/recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,14 @@ requirements:
- ${{ pin_compatible("cuda-version", upper_bound="x", lower_bound="x") }}
- cudf =${{ minor_version }}
- cupy >=12.0.0
- cuspatial =${{ minor_version }}
- dask-cudf =${{ minor_version }}
- datashader >=0.15
- geopandas >=0.11.0
- holoviews>=1.16
- jupyter-server-proxy
- libwebp-base
- nodejs >=14
- numba >=0.59.1,<0.61.0a0
- numba >=0.59.1,<0.62.0a0
- numpy >=1.23,<3.0a0
- packaging
- panel >=1.0
Expand Down
Loading
Loading