Skip to content

Commit 5ec8771

Browse files
achirkinachirkin
authored
Merge branch 'main' into fix-dataset-api-benchmark-regressions
2 parents 8be966a + abfb8b9 commit 5ec8771

55 files changed

Lines changed: 739 additions & 321 deletions

Some content is hidden

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

‎.github/workflows/build.yaml‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ concurrency:
3535
permissions: {}
3636

3737
jobs:
38+
build-details:
39+
uses: rapidsai/shared-workflows/.github/workflows/compute-build-details.yaml@main
3840
cpp-build:
41+
needs: [build-details]
3942
permissions:
4043
actions: read
4144
contents: read
@@ -46,6 +49,7 @@ jobs:
4649
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@main
4750
with:
4851
build_type: ${{ inputs.build_type || 'branch' }}
52+
build-datetime: ${{ needs.build-details.outputs.build-datetime }}
4953
branch: ${{ inputs.branch }}
5054
date: ${{ inputs.date }}
5155
node_type: cpu16
@@ -60,7 +64,7 @@ jobs:
6064
build_type: pull-request
6165
matrix_name: conda-cpp-build
6266
rocky8-clib-standalone-build:
63-
needs: rocky8-clib-standalone-build-matrix
67+
needs: [build-details, rocky8-clib-standalone-build-matrix]
6468
permissions:
6569
actions: read
6670
contents: read
@@ -74,6 +78,7 @@ jobs:
7478
matrix: ${{ fromJSON(needs.rocky8-clib-standalone-build-matrix.outputs.matrix) }}
7579
with:
7680
build_type: ${{ inputs.build_type || 'branch' }}
81+
build-datetime: ${{ needs.build-details.outputs.build-datetime }}
7782
branch: ${{ inputs.branch }}
7883
arch: "${{matrix.ARCH}}"
7984
date: ${{ inputs.date }}
@@ -185,7 +190,7 @@ jobs:
185190
file_to_upload: "java/cuvs-java/target/"
186191
sha: ${{ inputs.sha }}
187192
python-build:
188-
needs: [cpp-build]
193+
needs: [build-details, cpp-build]
189194
permissions:
190195
actions: read
191196
contents: read
@@ -196,6 +201,7 @@ jobs:
196201
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@main
197202
with:
198203
build_type: ${{ inputs.build_type || 'branch' }}
204+
build-datetime: ${{ needs.build-details.outputs.build-datetime }}
199205
branch: ${{ inputs.branch }}
200206
date: ${{ inputs.date }}
201207
script: ci/build_python.sh
@@ -247,6 +253,7 @@ jobs:
247253
script: "ci/build_docs.sh"
248254
sha: ${{ inputs.sha }}
249255
wheel-build-libcuvs:
256+
needs: [build-details]
250257
permissions:
251258
actions: read
252259
contents: read
@@ -257,6 +264,7 @@ jobs:
257264
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
258265
with:
259266
build_type: ${{ inputs.build_type || 'branch' }}
267+
build-datetime: ${{ needs.build-details.outputs.build-datetime }}
260268
branch: ${{ inputs.branch }}
261269
sha: ${{ inputs.sha }}
262270
date: ${{ inputs.date }}
@@ -287,7 +295,7 @@ jobs:
287295
package-type: cpp
288296
publish-wheel-search-key: cuvs_wheel_cpp_libcuvs
289297
wheel-build-cuvs:
290-
needs: wheel-build-libcuvs
298+
needs: [build-details, wheel-build-libcuvs]
291299
permissions:
292300
actions: read
293301
contents: read
@@ -298,6 +306,7 @@ jobs:
298306
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
299307
with:
300308
build_type: ${{ inputs.build_type || 'branch' }}
309+
build-datetime: ${{ needs.build-details.outputs.build-datetime }}
301310
branch: ${{ inputs.branch }}
302311
sha: ${{ inputs.sha }}
303312
date: ${{ inputs.date }}

‎.github/workflows/pr.yaml‎

Lines changed: 51 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ permissions: {}
1010
jobs:
1111
pr-builder:
1212
needs:
13+
- build-details
1314
- check-nightly-ci
1415
- changed-files
1516
- checks
@@ -52,6 +53,8 @@ jobs:
5253
- name: Telemetry setup
5354
if: ${{ vars.TELEMETRY_ENABLED == 'true' }}
5455
uses: rapidsai/shared-actions/telemetry-dispatch-stash-base-env-vars@main
56+
build-details:
57+
uses: rapidsai/shared-workflows/.github/workflows/compute-build-details.yaml@main
5558
check-nightly-ci:
5659
runs-on: ubuntu-latest
5760
permissions:
@@ -93,8 +96,14 @@ jobs:
9396
- '!.github/labeler.yml'
9497
- '!.github/ops-bot.yaml'
9598
- '!.github/release.yml'
99+
- '!.github/workflows/build.yaml'
100+
- '!.github/workflows/check-c-abi.yaml'
101+
- '!.github/workflows/labeler.yml'
96102
- '!.github/workflows/publish-rust.yaml'
103+
- '!.github/workflows/store-c-abi-baseline.yaml'
104+
- '!.github/workflows/test.yaml'
97105
- '!.github/workflows/trigger-breaking-change-alert.yaml'
106+
- '!.github/workflows/update-c-abi-baseline.yaml'
98107
- '!.pre-commit-config.yaml'
99108
- '!.shellcheckrc'
100109
- '!.yamllint.yaml'
@@ -119,8 +128,14 @@ jobs:
119128
- '!.github/labeler.yml'
120129
- '!.github/ops-bot.yaml'
121130
- '!.github/release.yml'
131+
- '!.github/workflows/build.yaml'
132+
- '!.github/workflows/check-c-abi.yaml'
133+
- '!.github/workflows/labeler.yml'
122134
- '!.github/workflows/publish-rust.yaml'
135+
- '!.github/workflows/store-c-abi-baseline.yaml'
136+
- '!.github/workflows/test.yaml'
123137
- '!.github/workflows/trigger-breaking-change-alert.yaml'
138+
- '!.github/workflows/update-c-abi-baseline.yaml'
124139
- '!.pre-commit-config.yaml'
125140
- '!.shellcheckrc'
126141
- '!.yamllint.yaml'
@@ -158,8 +173,14 @@ jobs:
158173
- '!.github/labeler.yml'
159174
- '!.github/ops-bot.yaml'
160175
- '!.github/release.yml'
176+
- '!.github/workflows/build.yaml'
177+
- '!.github/workflows/check-c-abi.yaml'
178+
- '!.github/workflows/labeler.yml'
161179
- '!.github/workflows/publish-rust.yaml'
180+
- '!.github/workflows/store-c-abi-baseline.yaml'
181+
- '!.github/workflows/test.yaml'
162182
- '!.github/workflows/trigger-breaking-change-alert.yaml'
183+
- '!.github/workflows/update-c-abi-baseline.yaml'
163184
- '!.pre-commit-config.yaml'
164185
- '!.shellcheckrc'
165186
- '!.yamllint.yaml'
@@ -204,10 +225,12 @@ jobs:
204225
- '!.github/labeler.yml'
205226
- '!.github/ops-bot.yaml'
206227
- '!.github/release.yml'
228+
- '!.github/workflows/build.yaml'
207229
- '!.github/workflows/check-c-abi.yaml'
208230
- '!.github/workflows/labeler.yml'
209231
- '!.github/workflows/publish-rust.yaml'
210232
- '!.github/workflows/store-c-abi-baseline.yaml'
233+
- '!.github/workflows/test.yaml'
211234
- '!.github/workflows/trigger-breaking-change-alert.yaml'
212235
- '!.github/workflows/update-c-abi-baseline.yaml'
213236
- '!.pre-commit-config.yaml'
@@ -251,8 +274,14 @@ jobs:
251274
- '!.github/labeler.yml'
252275
- '!.github/ops-bot.yaml'
253276
- '!.github/release.yml'
277+
- '!.github/workflows/build.yaml'
278+
- '!.github/workflows/check-c-abi.yaml'
279+
- '!.github/workflows/labeler.yml'
254280
- '!.github/workflows/publish-rust.yaml'
281+
- '!.github/workflows/store-c-abi-baseline.yaml'
282+
- '!.github/workflows/test.yaml'
255283
- '!.github/workflows/trigger-breaking-change-alert.yaml'
284+
- '!.github/workflows/update-c-abi-baseline.yaml'
256285
- '!.pre-commit-config.yaml'
257286
- '!.shellcheckrc'
258287
- '!.yamllint.yaml'
@@ -299,8 +328,14 @@ jobs:
299328
- '!.github/labeler.yml'
300329
- '!.github/ops-bot.yaml'
301330
- '!.github/release.yml'
331+
- '!.github/workflows/build.yaml'
332+
- '!.github/workflows/check-c-abi.yaml'
333+
- '!.github/workflows/labeler.yml'
302334
- '!.github/workflows/publish-rust.yaml'
335+
- '!.github/workflows/store-c-abi-baseline.yaml'
336+
- '!.github/workflows/test.yaml'
303337
- '!.github/workflows/trigger-breaking-change-alert.yaml'
338+
- '!.github/workflows/update-c-abi-baseline.yaml'
304339
- '!.pre-commit-config.yaml'
305340
- '!.shellcheckrc'
306341
- '!.yamllint.yaml'
@@ -342,8 +377,14 @@ jobs:
342377
- '!.github/labeler.yml'
343378
- '!.github/ops-bot.yaml'
344379
- '!.github/release.yml'
380+
- '!.github/workflows/build.yaml'
381+
- '!.github/workflows/check-c-abi.yaml'
382+
- '!.github/workflows/labeler.yml'
345383
- '!.github/workflows/publish-rust.yaml'
384+
- '!.github/workflows/store-c-abi-baseline.yaml'
385+
- '!.github/workflows/test.yaml'
346386
- '!.github/workflows/trigger-breaking-change-alert.yaml'
387+
- '!.github/workflows/update-c-abi-baseline.yaml'
347388
- '!.pre-commit-config.yaml'
348389
- '!.shellcheckrc'
349390
- '!.yamllint.yaml'
@@ -391,7 +432,7 @@ jobs:
391432
pull-requests: read
392433
uses: ./.github/workflows/check-c-abi.yaml
393434
conda-cpp-build:
394-
needs: checks
435+
needs: [build-details, checks]
395436
permissions:
396437
actions: read
397438
contents: read
@@ -402,6 +443,7 @@ jobs:
402443
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@main
403444
with:
404445
build_type: pull-request
446+
build-datetime: ${{ needs.build-details.outputs.build-datetime }}
405447
node_type: cpu16
406448
script: ci/build_cpp.sh
407449
conda-cpp-tests:
@@ -432,7 +474,7 @@ jobs:
432474
symbol_exclusions: (void (thrust::|cub::))
433475
package_name: libcuvs
434476
conda-python-build:
435-
needs: conda-cpp-build
477+
needs: [build-details, conda-cpp-build]
436478
permissions:
437479
actions: read
438480
contents: read
@@ -443,6 +485,7 @@ jobs:
443485
uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@main
444486
with:
445487
build_type: pull-request
488+
build-datetime: ${{ needs.build-details.outputs.build-datetime }}
446489
script: ci/build_python.sh
447490
# Build a conda package for each CUDA x ARCH x minimum supported Python version
448491
matrix_filter: group_by({CUDA_VER, ARCH}) | map(min_by(.PY_VER | split(".") | map(tonumber)))
@@ -469,7 +512,7 @@ jobs:
469512
build_type: pull-request
470513
matrix_name: conda-cpp-build
471514
rocky8-clib-standalone-build:
472-
needs: rocky8-clib-standalone-build-matrix
515+
needs: [build-details, rocky8-clib-standalone-build-matrix]
473516
permissions:
474517
actions: read
475518
contents: read
@@ -483,6 +526,7 @@ jobs:
483526
matrix: ${{ fromJSON(needs.rocky8-clib-standalone-build-matrix.outputs.matrix) }}
484527
with:
485528
build_type: pull-request
529+
build-datetime: ${{ needs.build-details.outputs.build-datetime }}
486530
arch: "${{matrix.arch}}"
487531
date: ${{ inputs.date }}_c
488532
container_image: "rapidsai/ci-wheel:26.10-cuda${{ matrix.CUDA_VER }}-${{ matrix.LINUX_VER }}-py${{ matrix.PY_VER }}"
@@ -633,7 +677,7 @@ jobs:
633677
container_image: "rapidsai/ci-conda:26.10-latest"
634678
script: "ci/build_docs.sh"
635679
wheel-build-libcuvs:
636-
needs: checks
680+
needs: [build-details, checks]
637681
permissions:
638682
actions: read
639683
contents: read
@@ -644,14 +688,15 @@ jobs:
644688
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
645689
with:
646690
build_type: pull-request
691+
build-datetime: ${{ needs.build-details.outputs.build-datetime }}
647692
node_type: cpu16
648693
script: ci/build_wheel_libcuvs.sh
649694
# build for every combination of arch and CUDA version, but only for the latest Python
650695
matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber)))
651696
package-name: libcuvs
652697
package-type: cpp
653698
wheel-build-cuvs:
654-
needs: wheel-build-libcuvs
699+
needs: [build-details, wheel-build-libcuvs]
655700
permissions:
656701
actions: read
657702
contents: read
@@ -662,6 +707,7 @@ jobs:
662707
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
663708
with:
664709
build_type: pull-request
710+
build-datetime: ${{ needs.build-details.outputs.build-datetime }}
665711
node_type: cpu8
666712
script: ci/build_wheel_cuvs.sh
667713
package-name: cuvs

‎.pre-commit-config.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,13 @@ repos:
9393
pass_filenames: false
9494
files: rust/.*
9595
language: rust
96+
- id: spotless-fmt
97+
name: spotless-fmt
98+
entry: ci/checks/run_spotless.sh
99+
pass_filenames: false
100+
files: ^java/cuvs-java/src/.*\.java$
101+
exclude: .*/panama/.*
102+
language: script
96103
- id: clang-format-with-cmake-placeholders
97104
name: clang-format-with-cmake-placeholders
98105
entry: python3 ci/checks/clang_format_with_cmake_placeholders.py

‎ci/build_cpp.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#!/bin/bash
2-
# SPDX-FileCopyrightText: Copyright (c) 2022-2026, NVIDIA CORPORATION.
2+
# SPDX-FileCopyrightText: Copyright (c) 2022-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
33
# SPDX-License-Identifier: Apache-2.0
44

55
set -euo pipefail
66

77
source rapids-configure-sccache
8-
source rapids-date-string
8+
source rapids-datetime-string
99

1010
export CMAKE_GENERATOR=Ninja
1111

‎ci/build_python.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#!/bin/bash
2-
# SPDX-FileCopyrightText: Copyright (c) 2022-2026, NVIDIA CORPORATION.
2+
# SPDX-FileCopyrightText: Copyright (c) 2022-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
33
# SPDX-License-Identifier: Apache-2.0
44

55
set -euo pipefail
66

77
source rapids-configure-sccache
8-
source rapids-date-string
8+
source rapids-datetime-string
99

1010
export CMAKE_GENERATOR=Ninja
1111

‎ci/build_standalone_c.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION.
2+
# SPDX-FileCopyrightText: Copyright (c) 2025-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
33
# SPDX-License-Identifier: Apache-2.0
44

55
set -euo pipefail
@@ -38,7 +38,7 @@ fi
3838

3939
source rapids-install-sccache
4040
source rapids-configure-sccache
41-
source rapids-date-string
41+
source rapids-datetime-string
4242

4343
rapids-pip-retry install cmake
4444
pyenv rehash

‎ci/build_wheel.sh‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# SPDX-FileCopyrightText: Copyright (c) 2023-2026, NVIDIA CORPORATION.
2+
# SPDX-FileCopyrightText: Copyright (c) 2023-2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
33
# SPDX-License-Identifier: Apache-2.0
44

55
set -euo pipefail
@@ -24,13 +24,14 @@ while [[ $# -gt 0 ]]; do
2424
done
2525

2626
source rapids-configure-sccache
27-
source rapids-date-string
27+
source rapids-datetime-string
2828
source rapids-init-pip
2929

3030
export SCCACHE_S3_PREPROCESSOR_CACHE_KEY_PREFIX="${package_name}/${RAPIDS_CONDA_ARCH}/cuda${RAPIDS_CUDA_VERSION%%.*}/wheel/preprocessor-cache"
3131
export SCCACHE_S3_USE_PREPROCESSOR_CACHE_MODE=true
3232

33-
rapids-generate-version > ./VERSION
33+
RAPIDS_VERSION_SUFFIX=".post${RAPIDS_DATETIME_STRING}" \
34+
rapids-generate-version > ./VERSION
3435

3536
cd "${package_dir}"
3637

‎ci/check_c_abi/check_c_abi/abi.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# SPDX-FileCopyrightText: Copyright (c) 2026, NVIDIA CORPORATION.
2+
# SPDX-FileCopyrightText: Copyright (c) 2026, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
33
# SPDX-License-Identifier: Apache-2.0
44
#
55

@@ -287,6 +287,7 @@ def _analyze_struct_abi(
287287
symbol=name,
288288
location=old_struct.location,
289289
)
290+
continue
290291

291292
for (old_type, old_name), (new_type, new_name) in zip_longest(
292293
old_struct.members,

0 commit comments

Comments
 (0)