Skip to content

Commit e05c9a5

Browse files
GPUtesterGPUtester
authored
Merge pull request #7505 from rapidsai/release/25.12
Forward-merge release/25.12 into main
2 parents 6719b6c + dde0290 commit e05c9a5

File tree

9 files changed

+71
-16
lines changed

9 files changed

+71
-16
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,12 @@ jobs:
3737
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@main
3838
with:
3939
build_type: ${{ inputs.build_type || 'branch' }}
40+
node_type: cpu16
4041
branch: ${{ inputs.branch }}
4142
date: ${{ inputs.date }}
4243
script: ci/build_cpp.sh
4344
sha: ${{ inputs.sha }}
45+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
4446
docs-build:
4547
if: github.ref_type == 'branch'
4648
needs: [python-build]
@@ -65,6 +67,7 @@ jobs:
6567
date: ${{ inputs.date }}
6668
script: ci/build_python.sh
6769
sha: ${{ inputs.sha }}
70+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
6871
upload-conda:
6972
needs: [cpp-build, python-build]
7073
secrets: inherit
@@ -82,11 +85,13 @@ jobs:
8285
branch: ${{ inputs.branch }}
8386
sha: ${{ inputs.sha }}
8487
date: ${{ inputs.date }}
88+
node_type: cpu16
8589
script: ci/build_wheel_libcuml.sh
8690
# build for every combination of arch and CUDA version, but only for the latest Python
8791
matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber)))
8892
package-name: libcuml
8993
package-type: cpp
94+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
9095
wheel-publish-libcuml:
9196
needs: wheel-build-libcuml
9297
secrets: inherit
@@ -107,9 +112,11 @@ jobs:
107112
branch: ${{ inputs.branch }}
108113
sha: ${{ inputs.sha }}
109114
date: ${{ inputs.date }}
115+
node_type: cpu8
110116
script: ci/build_wheel_cuml.sh
111117
package-name: cuml
112118
package-type: python
119+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
113120
wheel-publish-cuml:
114121
needs: wheel-build-cuml
115122
secrets: inherit

‎.github/workflows/pr.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,9 @@ jobs:
115115
uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@main
116116
with:
117117
build_type: pull-request
118+
node_type: cpu16
118119
script: ci/build_cpp.sh
120+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
119121
conda-cpp-tests:
120122
needs: [conda-cpp-build, changed-files]
121123
secrets: inherit
@@ -124,6 +126,7 @@ jobs:
124126
with:
125127
build_type: pull-request
126128
script: ci/test_cpp.sh
129+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
127130
conda-cpp-checks:
128131
needs: conda-cpp-build
129132
secrets: inherit
@@ -145,6 +148,7 @@ jobs:
145148
with:
146149
build_type: pull-request
147150
script: "ci/test_python_singlegpu.sh"
151+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
148152
optional-job-conda-python-tests-cudf-pandas-integration:
149153
needs: [conda-python-build, changed-files]
150154
secrets: inherit
@@ -155,6 +159,7 @@ jobs:
155159
matrix_filter: map(select(.ARCH=="amd64")) | [max_by([.CUDA_VER,.PY_VER]|map(split(".")|map(tonumber)))]
156160
build_type: pull-request
157161
script: "ci/test_python_integration.sh"
162+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
158163
conda-python-tests-dask:
159164
needs: [conda-python-build, changed-files]
160165
secrets: inherit
@@ -163,6 +168,7 @@ jobs:
163168
with:
164169
build_type: pull-request
165170
script: "ci/test_python_dask.sh"
171+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
166172
conda-python-scikit-learn-accel-tests:
167173
needs: [conda-python-build, changed-files]
168174
secrets: inherit
@@ -171,6 +177,7 @@ jobs:
171177
with:
172178
build_type: pull-request
173179
script: "ci/test_python_scikit_learn_tests.sh"
180+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
174181
# One run for each dependencies config on amd64, breaking ties by highest Python version
175182
matrix_filter: '(
176183
map(select(.ARCH == "amd64"))
@@ -194,6 +201,7 @@ jobs:
194201
script: "ci/test_python_cuml_accel_upstream.sh"
195202
# One run for each dependencies config on amd64, breaking ties by highest Python version
196203
matrix_filter: map(select(.ARCH == "amd64")) | sort_by(.PY_VER) | unique_by(.DEPENDENCIES)
204+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
197205
conda-notebook-tests:
198206
needs: [conda-python-build, changed-files]
199207
secrets: inherit
@@ -224,20 +232,24 @@ jobs:
224232
branch: ${{ inputs.branch }}
225233
sha: ${{ inputs.sha }}
226234
date: ${{ inputs.date }}
235+
node_type: cpu16
227236
script: ci/build_wheel_libcuml.sh
228237
# build for every combination of arch and CUDA version, but only for the latest Python
229238
matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber)))
230239
package-name: libcuml
231240
package-type: cpp
241+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
232242
wheel-build-cuml:
233243
needs: [checks, wheel-build-libcuml]
234244
secrets: inherit
235245
uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@main
236246
with:
237247
build_type: pull-request
248+
node_type: cpu8
238249
script: ci/build_wheel_cuml.sh
239250
package-name: cuml
240251
package-type: python
252+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
241253
wheel-tests-cuml:
242254
needs: [wheel-build-cuml, changed-files]
243255
secrets: inherit
@@ -246,6 +258,7 @@ jobs:
246258
with:
247259
build_type: pull-request
248260
script: ci/test_wheel.sh
261+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
249262
wheel-tests-cuml-dask:
250263
needs: [wheel-build-cuml, changed-files]
251264
secrets: inherit
@@ -254,6 +267,7 @@ jobs:
254267
with:
255268
build_type: pull-request
256269
script: ci/test_wheel_dask.sh
270+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
257271
devcontainer:
258272
needs: telemetry-setup
259273
secrets: inherit

‎.github/workflows/test.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ jobs:
4141
date: ${{ inputs.date }}
4242
script: ci/test_cpp.sh
4343
sha: ${{ inputs.sha }}
44+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
4445
conda-python-tests-singlegpu:
4546
secrets: inherit
4647
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@main
@@ -50,6 +51,7 @@ jobs:
5051
date: ${{ inputs.date }}
5152
sha: ${{ inputs.sha }}
5253
script: "ci/test_python_singlegpu.sh"
54+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
5355
conda-python-tests-dask:
5456
secrets: inherit
5557
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@main
@@ -59,6 +61,7 @@ jobs:
5961
date: ${{ inputs.date }}
6062
sha: ${{ inputs.sha }}
6163
script: "ci/test_python_dask.sh"
64+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
6265
conda-python-scikit-learn-accel-tests:
6366
secrets: inherit
6467
uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@main
@@ -68,6 +71,7 @@ jobs:
6871
date: ${{ inputs.date }}
6972
sha: ${{ inputs.sha }}
7073
script: "ci/test_python_scikit_learn_tests.sh"
74+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
7175
# Select amd64 and one job per major CUDA version with the latest CUDA and Python versions
7276
# Add an "intermediate" entry based on the "oldest" entry
7377
matrix_filter: '(
@@ -93,6 +97,7 @@ jobs:
9397
script: "ci/test_python_cuml_accel_upstream.sh"
9498
# Select amd64 and one job per major CUDA version with the latest CUDA and Python versions
9599
matrix_filter: map(select(.ARCH == "amd64")) | group_by(.CUDA_VER|split(".")|map(tonumber)|.[0]) | map(max_by([.CUDA_VER,.PY_VER]|map(split(".")|map(tonumber))))
100+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
96101
wheel-tests-cuml:
97102
secrets: inherit
98103
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@main
@@ -102,6 +107,7 @@ jobs:
102107
date: ${{ inputs.date }}
103108
sha: ${{ inputs.sha }}
104109
script: ci/test_wheel.sh
110+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
105111
wheel-tests-cuml-dask:
106112
secrets: inherit
107113
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@main
@@ -111,6 +117,7 @@ jobs:
111117
date: ${{ inputs.date }}
112118
sha: ${{ inputs.sha }}
113119
script: ci/test_wheel_dask.sh
120+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN
114121
wheel-tests-integrations:
115122
secrets: inherit
116123
uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@main
@@ -122,3 +129,4 @@ jobs:
122129
script: ci/test_wheel_integrations.sh
123130
# Test all CUDA major versions with latest dependencies and respective latest Python version
124131
matrix_filter: map(select(.DEPENDENCIES == "latest")) | group_by(.CUDA_VER|split(".")|.[0]) | map(max_by(.PY_VER|split(".")|map(tonumber)))
132+
sccache-dist-token-secret-name: GIST_REPO_READ_ORG_GITHUB_TOKEN

‎ci/build_cpp.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
set -euo pipefail
66

77
source rapids-configure-sccache
8-
98
source rapids-date-string
109

1110
export CMAKE_GENERATOR=Ninja
@@ -14,7 +13,7 @@ rapids-print-env
1413

1514
rapids-logger "Begin cpp build"
1615

17-
sccache --zero-stats
16+
sccache --stop-server 2>/dev/null || true
1817

1918
RAPIDS_PACKAGE_VERSION=$(rapids-generate-version)
2019
export RAPIDS_PACKAGE_VERSION

‎ci/build_python.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
set -euo pipefail
66

77
source rapids-configure-sccache
8-
98
source rapids-date-string
109

1110
export CMAKE_GENERATOR=Ninja
@@ -28,7 +27,7 @@ rapids-logger "Prepending channel ${CPP_CHANNEL} to RATTLER_CHANNELS"
2827

2928
RATTLER_CHANNELS=("--channel" "${CPP_CHANNEL}" "${RATTLER_CHANNELS[@]}")
3029

31-
sccache --zero-stats
30+
sccache --stop-server 2>/dev/null || true
3231

3332
rapids-logger "Building cuml"
3433

‎ci/build_wheel.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ rapids-generate-version > ./VERSION
1515

1616
cd "${package_dir}"
1717

18-
sccache --zero-stats
18+
sccache --stop-server 2>/dev/null || true
1919

2020
rapids-logger "Building '${package_name}' wheel"
2121
rapids-pip-retry wheel \

‎cmake/rapids_config.cmake‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,6 @@ if(NOT rapids-cmake-branch)
3535
set(rapids-cmake-branch "${_rapids_branch}")
3636
endif()
3737
include("${CMAKE_CURRENT_LIST_DIR}/RAPIDS.cmake")
38+
39+
# Don't use sccache-dist for CMake's compiler tests
40+
set(ENV{SCCACHE_NO_DIST_COMPILE} "1")

‎conda/recipes/cuml/recipe.yaml‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,30 @@ build:
3535
- AWS_ACCESS_KEY_ID
3636
- AWS_SECRET_ACCESS_KEY
3737
- AWS_SESSION_TOKEN
38+
- SCCACHE_DIST_AUTH_TOKEN
3839
env:
3940
CMAKE_C_COMPILER_LAUNCHER: ${{ env.get("CMAKE_C_COMPILER_LAUNCHER") }}
4041
CMAKE_CUDA_COMPILER_LAUNCHER: ${{ env.get("CMAKE_CUDA_COMPILER_LAUNCHER") }}
4142
CMAKE_CXX_COMPILER_LAUNCHER: ${{ env.get("CMAKE_CXX_COMPILER_LAUNCHER") }}
4243
CMAKE_GENERATOR: ${{ env.get("CMAKE_GENERATOR") }}
43-
SCCACHE_BUCKET: ${{ env.get("SCCACHE_BUCKET") }}
44-
SCCACHE_IDLE_TIMEOUT: ${{ env.get("SCCACHE_IDLE_TIMEOUT") }}
45-
SCCACHE_REGION: ${{ env.get("SCCACHE_REGION") }}
46-
SCCACHE_S3_USE_SSL: ${{ env.get("SCCACHE_S3_USE_SSL") }}
47-
SCCACHE_S3_NO_CREDENTIALS: ${{ env.get("SCCACHE_S3_NO_CREDENTIALS") }}
44+
NVCC_APPEND_FLAGS: ${{ env.get("NVCC_APPEND_FLAGS", default="") }}
45+
PARALLEL_LEVEL: ${{ env.get("PARALLEL_LEVEL", default="8") }}
46+
RAPIDS_ARTIFACTS_DIR: ${{ env.get("RAPIDS_ARTIFACTS_DIR", default="") }}
47+
SCCACHE_BUCKET: ${{ env.get("SCCACHE_BUCKET", default="") }}
48+
SCCACHE_DIST_AUTH_TYPE: ${{ env.get("SCCACHE_DIST_AUTH_TYPE", default="token") }}
49+
SCCACHE_DIST_FALLBACK_TO_LOCAL_COMPILE: ${{ env.get("SCCACHE_DIST_FALLBACK_TO_LOCAL_COMPILE", default="false") }}
50+
SCCACHE_DIST_MAX_RETRIES: ${{ env.get("SCCACHE_DIST_MAX_RETRIES", default="inf") }}
51+
SCCACHE_DIST_REQUEST_TIMEOUT: ${{ env.get("SCCACHE_DIST_REQUEST_TIMEOUT", default="7140") }}
52+
SCCACHE_DIST_SCHEDULER_URL: ${{ env.get("SCCACHE_DIST_SCHEDULER_URL", default="") }}
53+
SCCACHE_ERROR_LOG: ${{ env.get("SCCACHE_ERROR_LOG", default="/tmp/sccache.log") }}
54+
SCCACHE_IDLE_TIMEOUT: ${{ env.get("SCCACHE_IDLE_TIMEOUT", default="0") }}
55+
SCCACHE_NO_CACHE: ${{ env.get("SCCACHE_NO_CACHE", default="") }}
56+
SCCACHE_RECACHE: ${{ env.get("SCCACHE_RECACHE", default="") }}
57+
SCCACHE_REGION: ${{ env.get("SCCACHE_REGION", default="") }}
4858
SCCACHE_S3_KEY_PREFIX: cuml/${{ env.get("RAPIDS_CONDA_ARCH") }}/cuda${{ cuda_major }}
59+
SCCACHE_S3_NO_CREDENTIALS: ${{ env.get("SCCACHE_S3_NO_CREDENTIALS", default="false") }}
60+
SCCACHE_S3_USE_SSL: ${{ env.get("SCCACHE_S3_USE_SSL", default="true") }}
61+
SCCACHE_SERVER_LOG: ${{ env.get("SCCACHE_SERVER_LOG", default="sccache=debug") }}
4962

5063
requirements:
5164
build:

‎conda/recipes/libcuml/recipe.yaml‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,30 @@ cache:
3333
- AWS_ACCESS_KEY_ID
3434
- AWS_SECRET_ACCESS_KEY
3535
- AWS_SESSION_TOKEN
36+
- SCCACHE_DIST_AUTH_TOKEN
3637
env:
3738
CMAKE_C_COMPILER_LAUNCHER: ${{ env.get("CMAKE_C_COMPILER_LAUNCHER") }}
3839
CMAKE_CUDA_COMPILER_LAUNCHER: ${{ env.get("CMAKE_CUDA_COMPILER_LAUNCHER") }}
3940
CMAKE_CXX_COMPILER_LAUNCHER: ${{ env.get("CMAKE_CXX_COMPILER_LAUNCHER") }}
4041
CMAKE_GENERATOR: ${{ env.get("CMAKE_GENERATOR") }}
41-
PARALLEL_LEVEL: ${{ env.get("PARALLEL_LEVEL") }}
42-
SCCACHE_BUCKET: ${{ env.get("SCCACHE_BUCKET") }}
43-
SCCACHE_IDLE_TIMEOUT: ${{ env.get("SCCACHE_IDLE_TIMEOUT") }}
44-
SCCACHE_REGION: ${{ env.get("SCCACHE_REGION") }}
45-
SCCACHE_S3_USE_SSL: ${{ env.get("SCCACHE_S3_USE_SSL") }}
46-
SCCACHE_S3_NO_CREDENTIALS: ${{ env.get("SCCACHE_S3_NO_CREDENTIALS") }}
42+
NVCC_APPEND_FLAGS: ${{ env.get("NVCC_APPEND_FLAGS", default="") }}
43+
PARALLEL_LEVEL: ${{ env.get("PARALLEL_LEVEL", default="8") }}
44+
RAPIDS_ARTIFACTS_DIR: ${{ env.get("RAPIDS_ARTIFACTS_DIR", default="") }}
45+
SCCACHE_BUCKET: ${{ env.get("SCCACHE_BUCKET", default="") }}
46+
SCCACHE_DIST_AUTH_TYPE: ${{ env.get("SCCACHE_DIST_AUTH_TYPE", default="token") }}
47+
SCCACHE_DIST_FALLBACK_TO_LOCAL_COMPILE: ${{ env.get("SCCACHE_DIST_FALLBACK_TO_LOCAL_COMPILE", default="false") }}
48+
SCCACHE_DIST_MAX_RETRIES: ${{ env.get("SCCACHE_DIST_MAX_RETRIES", default="inf") }}
49+
SCCACHE_DIST_REQUEST_TIMEOUT: ${{ env.get("SCCACHE_DIST_REQUEST_TIMEOUT", default="7140") }}
50+
SCCACHE_DIST_SCHEDULER_URL: ${{ env.get("SCCACHE_DIST_SCHEDULER_URL", default="") }}
51+
SCCACHE_ERROR_LOG: ${{ env.get("SCCACHE_ERROR_LOG", default="/tmp/sccache.log") }}
52+
SCCACHE_IDLE_TIMEOUT: ${{ env.get("SCCACHE_IDLE_TIMEOUT", default="0") }}
53+
SCCACHE_NO_CACHE: ${{ env.get("SCCACHE_NO_CACHE", default="") }}
54+
SCCACHE_RECACHE: ${{ env.get("SCCACHE_RECACHE", default="") }}
55+
SCCACHE_REGION: ${{ env.get("SCCACHE_REGION", default="") }}
4756
SCCACHE_S3_KEY_PREFIX: libcuml/${{ env.get("RAPIDS_CONDA_ARCH") }}/cuda${{ cuda_major }}
57+
SCCACHE_S3_NO_CREDENTIALS: ${{ env.get("SCCACHE_S3_NO_CREDENTIALS", default="false") }}
58+
SCCACHE_S3_USE_SSL: ${{ env.get("SCCACHE_S3_USE_SSL", default="true") }}
59+
SCCACHE_SERVER_LOG: ${{ env.get("SCCACHE_SERVER_LOG", default="sccache=debug") }}
4860

4961
requirements:
5062
build:

0 commit comments

Comments
 (0)