Files
project_6_89d52222/cccl_upstream/docs/maintainers/branching_strategy.rst

33 lines
1.3 KiB
ReStructuredText
Raw Normal View History

feat(cccl): integrate missing CCCL directories — python/, ci/, .agent/, docs/, test/ Sparse-checkout from NVIDIA/cccl main branch to complete cccl_upstream: Added: - python/cuda_cccl/ (226 files) — Python bindings for device-level algorithms Critical for muh toolchain: cuda.compute.reduce_into, scan, radix_sort, etc. Includes 204 .py files with full test coverage for all 27 algorithms - ci/ (163 files) — Build/test infrastructure build_cub.sh, test_cub.sh, build_and_test_targets.sh, matrix.yaml Directly maps to our [INFRA-CI] and [INFRA-BUILD] items - .agent/skills/ (7 files) — NVIDIA's own agent skills for CCCL cccl-style/SKILL.md, cccl-test/SKILL.md, sass-diff/SKILL.md - docs/ (491 files) — Official CCCL documentation CI references, CMake guides, Python compute docs, libcudacxx PTX docs - test/ (12 files) — Top-level integration tests (cuda_smoke, stdpar) - Root configs: .clang-format, .clang-tidy, CONTRIBUTING.md, pyproject.toml - CLAUDE.md symlink → AGENTS.md (NVIDIA's standard) cccl_upstream now mirrors full NVIDIA/cccl structure: Before: 42M (cub + thrust + libcudacxx + cudax + c + examples + benchmarks) After: 53M (+python +ci +docs +.agent +test +configs) This completes the CCCL base needed for: - [muh-bench] items: ci/util/build_and_test_targets.sh for targeted builds - [CCCL-verify] items: python/cuda_cccl/tests/ as reference implementations - [CCCL-test] items: ci/test_cub.sh, ci/test_thrust.sh - Agent workflow: .agent/skills/ for consistent style and test patterns
2026-08-07 02:34:33 +00:00
Git Methodology
=========================
This page defines the canonical branch model used for CCCL development and
release maintenance.
Canonical branches
------------------
- ``main``
- The default development branch.
- Updates should be made via pull requests following our :doc:`contributing guidelines </cccl/contributing>`.
- ``branch/X.Y.x``
- Branches from ``main`` meant for stabilizing and publishing tagged releases.
- Created via release automation.
- Changes should be made via the :doc:`backport process <backport_process>`.
- ``ctk/X.Y.x``
- Branches from ``branch/X.Y.x`` meant for representing exact contents of CUDA Toolkit Releases
- Created by NVIDIA. May contain internally developed features that are additive with the release it was based on.
- This is a read-only branch and is created when the CTK or relevant documentation becomes available.
Tagging conventions
-------------------
- ``vX.Y.Z``: finalized release tags on release branches
- ``vX.Y.Z-ctkN.M.K``: finalized release tags exactly equivalent to the CCCL contents in NVIDIA CUDA Toolkit release `N.M.K`.
- ``vX.Y.Z-rcN``: release-candidate tags for pre-release validation.
- ``vX.Y.Z.dev``: the first commit of development for ``X.Y.Z`` (the commit that increments the library version)