Skip to content

Commit d184d81

Browse files
rwgkrwgk
committed
Drop cosmetic CI labels and share bindings build environment
Signed-off-by: Ralf W. Grosse-Kunstleve <rgrossekunst@nvidia.com>
1 parent 48b789f commit d184d81

5 files changed

Lines changed: 11 additions & 72 deletions

File tree

‎.github/workflows/build-wheel.yml‎

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ jobs:
275275
output-dir: ${{ env.CURRENT_BINDINGS_ARTIFACTS_DIR }}
276276
extras: uv
277277
python-path: ${{ steps.host-python.outputs.python-path }}
278-
env:
278+
env: &bindings-wheel-env
279279
CIBW_BUILD: ${{ env.CIBW_BUILD }}
280280
# build[uv]: same PEP 517 orchestration, with uv instead of pip.
281281
# extras: uv puts uv on PATH (required on Windows).
@@ -644,39 +644,13 @@ jobs:
644644
output-dir: ${{ env.MAINTENANCE_BINDINGS_ARTIFACTS_DIR }}
645645
extras: uv
646646
python-path: ${{ steps.host-python.outputs.python-path }}
647-
env:
648-
CIBW_BUILD: ${{ env.CIBW_BUILD }}
649-
# Use the same frontend and constraints as the current package.
650-
CIBW_BUILD_FRONTEND: "build[uv]"
651-
CIBW_ENVIRONMENT_LINUX: >
652-
CUDA_PATH=/host/${{ env.CUDA_PATH }}
653-
CUDA_PYTHON_PARALLEL_LEVEL=${{ env.CUDA_PYTHON_PARALLEL_LEVEL }}
654-
UV_BUILD_CONSTRAINT=/host/${{ github.workspace }}/wheel-constraints/cuda-bindings.txt
655-
UV_CONSTRAINT=/host/${{ github.workspace }}/wheel-constraints/cuda-bindings.txt
656-
CC="/host/${{ env.SCCACHE_PATH }} cc"
657-
CXX="/host/${{ env.SCCACHE_PATH }} c++"
658-
SCCACHE_GHA_ENABLED=true
659-
ACTIONS_RUNTIME_TOKEN=${{ env.ACTIONS_RUNTIME_TOKEN }}
660-
ACTIONS_RUNTIME_URL=${{ env.ACTIONS_RUNTIME_URL }}
661-
ACTIONS_RESULTS_URL=${{ env.ACTIONS_RESULTS_URL }}
662-
ACTIONS_CACHE_URL=${{ env.ACTIONS_CACHE_URL }}
663-
ACTIONS_CACHE_SERVICE_V2=${{ env.ACTIONS_CACHE_SERVICE_V2 }}
664-
CIBW_ENVIRONMENT_WINDOWS: >
665-
CUDA_PATH="$(cygpath -w ${{ env.CUDA_PATH }})"
666-
CUDA_PYTHON_PARALLEL_LEVEL=${{ env.CUDA_PYTHON_PARALLEL_LEVEL }}
667-
UV_BUILD_CONSTRAINT="$(cygpath -w ./wheel-constraints/cuda-bindings.txt)"
668-
UV_CONSTRAINT="$(cygpath -w ./wheel-constraints/cuda-bindings.txt)"
669-
# Dump sccache stats during repair; no dummy test stage.
670-
CIBW_REPAIR_WHEEL_COMMAND_LINUX: >
671-
"/host/${{ env.SCCACHE_PATH }}" --show-adv-stats &&
672-
"/host/${{ env.SCCACHE_PATH }}" --show-stats --stats-format=json > /host/${{ github.workspace }}/sccache_bindings_maintenance.json &&
673-
auditwheel repair -w {dest_dir} {wheel}
647+
env: *bindings-wheel-env
674648

675649
- name: Report sccache stats (cuda.bindings ${{ env.MAINTENANCE_CUDA_MAJOR }})
676650
if: ${{ !inputs.single-cuda-major && env.BUILD_BINDINGS_MAINTENANCE == 'true' && !startsWith(inputs.host-platform, 'win') }}
677651
uses: ./.github/actions/sccache-summary
678652
with:
679-
json-file: sccache_bindings_maintenance.json
653+
json-file: sccache_bindings.json
680654
label: "cuda.bindings ${{ env.MAINTENANCE_CUDA_MAJOR }}"
681655
build-step: "Build cuda.bindings ${{ env.MAINTENANCE_CUDA_MAJOR }} wheel"
682656

‎.github/workflows/ci.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ jobs:
403403
matrix:
404404
host-platform:
405405
- linux-64
406-
name: Build ${{ fromJSON(needs.detect-changes.outputs.workplan).labels.build }} (${{ matrix.host-platform }})
406+
name: Build (${{ matrix.host-platform }})
407407
if: ${{ github.repository_owner == 'nvidia' && !fromJSON(needs.should-skip.outputs.skip) }}
408408
permissions:
409409
actions: read
@@ -426,7 +426,7 @@ jobs:
426426
matrix:
427427
host-platform:
428428
- linux-aarch64
429-
name: Build ${{ fromJSON(needs.detect-changes.outputs.workplan).labels.build_platform }} (${{ matrix.host-platform }})
429+
name: Build (${{ matrix.host-platform }})
430430
if: ${{ github.repository_owner == 'nvidia' &&
431431
!fromJSON(needs.should-skip.outputs.skip) &&
432432
!fromJSON(needs.should-skip.outputs.doc-only) &&
@@ -452,7 +452,7 @@ jobs:
452452
matrix:
453453
host-platform:
454454
- win-64
455-
name: Build ${{ fromJSON(needs.detect-changes.outputs.workplan).labels.build_platform }} (${{ matrix.host-platform }})
455+
name: Build (${{ matrix.host-platform }})
456456
if: ${{ github.repository_owner == 'nvidia' &&
457457
!fromJSON(needs.should-skip.outputs.skip) &&
458458
!fromJSON(needs.should-skip.outputs.doc-only) &&
@@ -474,7 +474,7 @@ jobs:
474474
needs:
475475
- should-skip
476476
- detect-changes
477-
name: Build ${{ fromJSON(needs.detect-changes.outputs.workplan).labels.build_current }} (win-arm64)
477+
name: Build (win-arm64)
478478
if: ${{ github.repository_owner == 'nvidia' &&
479479
!fromJSON(needs.should-skip.outputs.skip) &&
480480
!fromJSON(needs.should-skip.outputs.doc-only) &&
@@ -508,7 +508,7 @@ jobs:
508508
- should-skip
509509
- detect-changes
510510
- build-linux-64
511-
name: Sdist ${{ fromJSON(needs.detect-changes.outputs.workplan).labels.sdist[matrix.package.package_root] }} (linux-64)
511+
name: Sdist ${{ matrix.package.package_root }} (linux-64)
512512
if: ${{ github.repository_owner == 'nvidia' &&
513513
!fromJSON(needs.should-skip.outputs.skip) &&
514514
!fromJSON(needs.should-skip.outputs.doc-only) &&
@@ -534,7 +534,7 @@ jobs:
534534
- detect-changes
535535
- build-linux-64
536536
- build-windows
537-
name: Sdist ${{ fromJSON(needs.detect-changes.outputs.workplan).labels.sdist[matrix.package.package_root] }} (win-64)
537+
name: Sdist ${{ matrix.package.package_root }} (win-64)
538538
if: ${{ github.repository_owner == 'nvidia' &&
539539
!fromJSON(needs.should-skip.outputs.skip) &&
540540
!fromJSON(needs.should-skip.outputs.doc-only) &&

‎.github/workflows/test-sdist-linux.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ permissions:
2727

2828
jobs:
2929
test-sdist:
30-
name: Sdist ${{ fromJSON(inputs.workplan).labels.sdist[fromJSON(inputs.bindings-package).package_root] }}
30+
name: Sdist ${{ fromJSON(inputs.bindings-package).package_root }}
3131
if: ${{ fromJSON(inputs.workplan).jobs.sdist_package_roots[fromJSON(inputs.bindings-package).package_root] }}
3232
env:
3333
BINDINGS_ROOT: ${{ fromJSON(inputs.bindings-package).package_root }}

‎.github/workflows/test-sdist-windows.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ permissions:
3333

3434
jobs:
3535
test-sdist:
36-
name: Sdist ${{ fromJSON(inputs.workplan).labels.sdist[fromJSON(inputs.bindings-package).package_root] }}
36+
name: Sdist ${{ fromJSON(inputs.bindings-package).package_root }}
3737
if: ${{ fromJSON(inputs.workplan).jobs.sdist_package_roots[fromJSON(inputs.bindings-package).package_root] }}
3838
env:
3939
BINDINGS_ROOT: ${{ fromJSON(inputs.bindings-package).package_root }}

‎ci/tools/compute_ci_plan.py‎

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -249,42 +249,7 @@ def flags(module: str, selectors: tuple[str | None, ...]) -> dict[str, bool]:
249249
or any((module, package.package_root) in tests for module in ("bindings", "python"))
250250
}
251251

252-
def build_label(*, universal: bool, current_only: bool = False) -> str:
253-
labels = []
254-
if universal and ("pathfinder", None) in builds:
255-
labels.append("pathfinder")
256-
for module in ("bindings", "core", "python"):
257-
component_label = "meta" if module == "python" else module
258-
if module == "python" and not universal:
259-
continue
260-
for package in bindings_packages:
261-
if current_only and package.release_status != "current":
262-
continue
263-
selector = package.cuda_variant if module == "core" else package.package_root
264-
if (module, selector) in builds:
265-
labels.append(f"{component_label}{package.cuda_major}")
266-
return "+".join(labels) or "baseline wheels and test extensions"
267-
268-
sdist_labels = {}
269-
for package in bindings_packages:
270-
labels = []
271-
if ("pathfinder", None) in builds:
272-
labels.append("pathfinder")
273-
if ("bindings", package.package_root) in builds:
274-
labels.append(f"bindings{package.cuda_major}")
275-
if ("core", package.cuda_variant) in builds:
276-
labels.append(f"core{package.cuda_major}")
277-
if ("python", package.package_root) in builds:
278-
labels.append(f"meta{package.cuda_major}")
279-
sdist_labels[package.package_root] = "+".join(labels) or "excluded"
280-
281252
return {
282-
"labels": {
283-
"build": build_label(universal=True),
284-
"build_platform": build_label(universal=False),
285-
"build_current": build_label(universal=False, current_only=True),
286-
"sdist": sdist_labels,
287-
},
288253
"modules": modules,
289254
"sources": {
290255
# Focused bindings releases intentionally omit unrelated artifacts.

0 commit comments

Comments
 (0)