Skip to content

Commit 524876e

Browse files
AyodeAweAyodeAwe
authored
Merge pull request rapidsai#19429 from davidwendt/branch-25.10-merge-branch-25.08
branch-25.10-merge-branch-25.08
2 parents a45d4a3 + 3767b7d commit 524876e

File tree

46 files changed

+1463
-836
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1463
-836
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
arch: "amd64"
8383
branch: ${{ inputs.branch }}
8484
build_type: ${{ inputs.build_type || 'branch' }}
85-
container_image: "rapidsai/ci-conda:latest"
85+
container_image: "rapidsai/ci-conda:25.10-latest"
8686
date: ${{ inputs.date }}
8787
node_type: "gpu-l4-latest-1"
8888
script: "ci/build_docs.sh"

‎.github/workflows/pr.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ jobs:
197197
build_type: pull-request
198198
node_type: "gpu-l4-latest-1"
199199
arch: "amd64"
200-
container_image: "rapidsai/ci-conda:latest"
200+
container_image: "rapidsai/ci-conda:25.10-latest"
201201
script: "ci/test_java.sh"
202202
conda-notebook-tests:
203203
needs: [conda-python-build, changed-files]
@@ -208,7 +208,7 @@ jobs:
208208
build_type: pull-request
209209
node_type: "gpu-l4-latest-1"
210210
arch: "amd64"
211-
container_image: "rapidsai/ci-conda:latest"
211+
container_image: "rapidsai/ci-conda:25.10-latest"
212212
script: "ci/test_notebooks.sh"
213213
docs-build:
214214
needs: conda-python-build
@@ -218,7 +218,7 @@ jobs:
218218
build_type: pull-request
219219
node_type: "gpu-l4-latest-1"
220220
arch: "amd64"
221-
container_image: "rapidsai/ci-conda:latest"
221+
container_image: "rapidsai/ci-conda:25.10-latest"
222222
script: "ci/build_docs.sh"
223223
wheel-build-libcudf:
224224
needs: checks
@@ -378,7 +378,7 @@ jobs:
378378
date: ${{ inputs.date }}
379379
sha: ${{ inputs.sha }}
380380
node_type: "gpu-l4-latest-1"
381-
container_image: "rapidsai/ci-conda:latest"
381+
container_image: "rapidsai/ci-conda:25.10-latest"
382382
script: ci/test_narwhals.sh
383383
spark-rapids-jni:
384384
needs: changed-files

‎.github/workflows/test.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
sha: ${{ inputs.sha }}
5050
node_type: "gpu-l4-latest-1"
5151
arch: "amd64"
52-
container_image: "rapidsai/ci-conda:latest"
52+
container_image: "rapidsai/ci-conda:25.10-latest"
5353
script: "ci/test_cpp_memcheck.sh"
5454
cpp-linters:
5555
secrets: inherit
@@ -90,7 +90,7 @@ jobs:
9090
sha: ${{ inputs.sha }}
9191
node_type: "gpu-l4-latest-1"
9292
arch: "amd64"
93-
container_image: "rapidsai/ci-conda:latest"
93+
container_image: "rapidsai/ci-conda:25.10-latest"
9494
script: "ci/test_java.sh"
9595
conda-notebook-tests:
9696
secrets: inherit
@@ -102,7 +102,7 @@ jobs:
102102
sha: ${{ inputs.sha }}
103103
node_type: "gpu-l4-latest-1"
104104
arch: "amd64"
105-
container_image: "rapidsai/ci-conda:latest"
105+
container_image: "rapidsai/ci-conda:25.10-latest"
106106
script: "ci/test_notebooks.sh"
107107
wheel-tests-cudf:
108108
secrets: inherit
@@ -170,5 +170,5 @@ jobs:
170170
date: ${{ inputs.date }}
171171
sha: ${{ inputs.sha }}
172172
node_type: "gpu-l4-latest-1"
173-
container_image: "rapidsai/ci-conda:latest"
173+
container_image: "rapidsai/ci-conda:25.10-latest"
174174
script: ci/test_narwhals.sh

‎build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ function buildAll {
114114
}
115115

116116
function buildLibCudfJniInDocker {
117-
local cudaVersion="11.8.0"
117+
local cudaVersion="12.9.1"
118118
local imageName="cudf-build:${cudaVersion}-devel-rocky8"
119119
local CMAKE_GENERATOR="${CMAKE_GENERATOR:-Ninja}"
120120
local workspaceDir="/rapids"

‎ci/release/update-version.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ DEPENDENCIES=(
6363
)
6464
for DEP in "${DEPENDENCIES[@]}"; do
6565
for FILE in dependencies.yaml conda/environments/*.yaml python/cudf/cudf_pandas_tests/third_party_integration_tests/dependencies.yaml; do
66-
sed_runner "/-.* ${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}.*,>=0.0.0a0/g" "${FILE}"
66+
sed_runner "/-.* ${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}\(\[.*\]\)\{0,1\}==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}.*,>=0.0.0a0/g" "${FILE}"
6767
done
6868
for FILE in python/*/pyproject.toml; do
6969
sed_runner "/\"${DEP}==/ s/==.*\"/==${NEXT_SHORT_TAG_PEP440}.*,>=0.0.0a0\"/g" "${FILE}"
@@ -83,6 +83,7 @@ sed_runner "s/CUDF_TAG branch-${CURRENT_SHORT_TAG}/CUDF_TAG branch-${NEXT_SHORT_
8383
for FILE in .github/workflows/*.yaml .github/workflows/*.yml; do
8484
sed_runner "/shared-workflows/ s/@.*/@branch-${NEXT_SHORT_TAG}/g" "${FILE}"
8585
sed_runner "s/dask-cuda.git@branch-[^\"\s]\+/dask-cuda.git@branch-${NEXT_SHORT_TAG}/g" "${FILE}"
86+
sed_runner "s/:[0-9]*\\.[0-9]*-/:${NEXT_SHORT_TAG}-/g" "${FILE}"
8687
done
8788
sed_runner "s/branch-[0-9]\+\.[0-9]\+/branch-${NEXT_SHORT_TAG}/g" ci/test_wheel_cudf_polars.sh
8889
sed_runner "s/branch-[0-9]\+\.[0-9]\+/branch-${NEXT_SHORT_TAG}/g" ci/test_cudf_polars_polars_tests.sh

‎conda/environments/all_cuda-129_arch-aarch64.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,12 @@ dependencies:
5454
- nbsphinx
5555
- ninja
5656
- notebook
57-
- numba-cuda>=0.16.0,<0.17.0a0
57+
- numba-cuda>=0.14.0,<0.15.0a0
5858
- numba>=0.59.1,<0.62.0a0
5959
- numpy>=1.23,<3.0a0
6060
- numpydoc
6161
- nvcomp==4.2.0.11
62+
- nvidia-ml-py
6263
- nvtx>=0.2.1
6364
- openpyxl
6465
- packaging
@@ -69,6 +70,7 @@ dependencies:
6970
- pre-commit
7071
- pyarrow>=14.0.0,<20.0.0a0
7172
- pydata-sphinx-theme>=0.15.4
73+
- pynvjitlink>=0.0.0a0
7274
- pynvml>=12.0.0,<13.0.0a0
7375
- pytest
7476
- pytest-benchmark

‎conda/environments/all_cuda-129_arch-x86_64.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,12 @@ dependencies:
5555
- nbsphinx
5656
- ninja
5757
- notebook
58-
- numba-cuda>=0.16.0,<0.17.0a0
58+
- numba-cuda>=0.14.0,<0.15.0a0
5959
- numba>=0.59.1,<0.62.0a0
6060
- numpy>=1.23,<3.0a0
6161
- numpydoc
6262
- nvcomp==4.2.0.11
63+
- nvidia-ml-py
6364
- nvtx>=0.2.1
6465
- openpyxl
6566
- packaging
@@ -70,6 +71,7 @@ dependencies:
7071
- pre-commit
7172
- pyarrow>=14.0.0,<20.0.0a0
7273
- pydata-sphinx-theme>=0.15.4
74+
- pynvjitlink>=0.0.0a0
7375
- pynvml>=12.0.0,<13.0.0a0
7476
- pytest
7577
- pytest-benchmark

‎conda/recipes/cudf/recipe.yaml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ requirements:
6969
- typing_extensions >=4.0.0
7070
- pandas >=2.0,<2.4.0dev0
7171
- cupy >=12.0.0
72-
- numba-cuda >=0.16.0,<0.17.0a0
72+
- numba-cuda >=0.14.0,<0.15.0a0
7373
- numba >=0.59.1,<0.62.0a0
7474
- numpy >=1.23,<3.0a0
7575
- pyarrow>=14.0.0,<20.0.0a0
@@ -78,7 +78,13 @@ requirements:
7878
- ${{ pin_compatible("rmm", upper_bound="x.x") }}
7979
- fsspec >=0.6.0
8080
- cuda-cudart
81+
# Needed by Numba for CUDA support
82+
- cuda-nvcc-impl
83+
# TODO: Add nvjitlink here
84+
# xref: https://github.com/rapidsai/cudf/issues/12822
85+
- cuda-nvrtc
8186
- cuda-python >=12.6.2,<13.0a0
87+
- pynvjitlink
8288
- if: linux and x86_64
8389
then:
8490
- libcufile

‎cpp/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -692,6 +692,7 @@ add_library(
692692
src/sort/stable_segmented_sort.cu
693693
src/sort/stable_sort_column.cu
694694
src/sort/stable_sort.cu
695+
src/sort/top_k.cu
695696
src/stream_compaction/apply_boolean_mask.cu
696697
src/stream_compaction/distinct.cu
697698
src/stream_compaction/distinct_count.cu
@@ -756,6 +757,7 @@ add_library(
756757
src/strings/slice.cu
757758
src/strings/split/partition.cu
758759
src/strings/split/split.cu
760+
src/strings/split/split_part.cu
759761
src/strings/split/split_re.cu
760762
src/strings/split/split_record.cu
761763
src/strings/strings_column_factories.cu

‎cpp/benchmarks/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ ConfigureNVBench(SEARCH_NVBENCH search/contains_scalar.cpp search/contains_table
206206
# * sort benchmark --------------------------------------------------------------------------------
207207
ConfigureNVBench(
208208
SORT_NVBENCH sort/rank.cpp sort/rank_lists.cpp sort/rank_structs.cpp sort/segmented_sort.cpp
209-
sort/sort.cpp sort/sort_lists.cpp sort/sort_strings.cpp sort/sort_structs.cpp
209+
sort/sort.cpp sort/sort_lists.cpp sort/sort_strings.cpp sort/sort_structs.cpp sort/top_k.cpp
210210
)
211211

212212
# ##################################################################################################

0 commit comments

Comments
 (0)