Skip to content

Commit

Permalink
Merge branch-25.02 into branch-25.04
Browse files Browse the repository at this point in the history
  • Loading branch information
bdice committed Jan 31, 2025
2 parents 57b07e2 + 49cb3c0 commit 30a0449
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 14 deletions.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -154,23 +154,23 @@ cuxfilter can be installed with conda. You can get a minimal conda installation
For the nightly version of `cuxfilter`:

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

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

For the stable version of `cuxfilter`:

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

# for CUDA 11.8
# for CUDA 11
conda install -c rapidsai -c conda-forge -c nvidia \
cuxfilter python=3.12 cuda-version=11.8
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ channels:
dependencies:
- bokeh>=3.1
- bokeh_sampledata
- cuda-version=12.5
- cuda-version=12.8
- cudf==25.4.*,>=0.0.0a0
- cugraph==25.4.*,>=0.0.0a0
- cupy>=12.0.0
Expand Down Expand Up @@ -45,4 +45,4 @@ dependencies:
- sphinx>=7.2.5
- sphinx_rtd_theme
- sphinxcontrib-websupport
name: all_cuda-125_arch-x86_64
name: all_cuda-128_arch-x86_64
6 changes: 5 additions & 1 deletion dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ files:
all:
output: conda
matrix:
cuda: ["11.8", "12.5"]
cuda: ["11.8", "12.8"]
arch: [x86_64]
includes:
- build_wheels
Expand Down Expand Up @@ -117,6 +117,10 @@ dependencies:
cuda: "12.5"
packages:
- cuda-version=12.5
- matrix:
cuda: "12.8"
packages:
- cuda-version=12.8
cuda:
specific:
- output_types: conda
Expand Down
10 changes: 5 additions & 5 deletions docs/source/user_guide/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ For the most customized way of installing RAPIDS and cuxfilter, visit the select

.. code-block:: bash
# for CUDA 12.5
# for CUDA 12
conda install -c rapidsai -c conda-forge -c nvidia \
cuxfilter=25.04 python=3.10 cuda-version=12.5
cuxfilter=25.04 python=3.10 cuda-version=12.8
# for CUDA 11.8
# for CUDA 11
conda install -c rapidsai -c conda-forge -c nvidia \
cuxfilter=25.04 python=3.10 cuda-version=11.8
Expand All @@ -21,10 +21,10 @@ Install cuxfilter from PyPI using pip:

.. code-block:: bash
# for CUDA 12.5
# for CUDA 12
pip install cuxfilter-cu12 -extra-index-url=https://pypi.nvidia.com
# for CUDA 11.8
# for CUDA 11
pip install cuxfilter-cu11 -extra-index-url=https://pypi.nvidia.com
Expand Down

0 comments on commit 30a0449

Please sign in to comment.