Skip to content

Commit 9318881

Browse files
authored
Merge branch 'main' into throttle_followup
2 parents 7d5f04e + 2c2f40a commit 9318881

File tree

110 files changed

+899
-1010
lines changed

Some content is hidden

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

110 files changed

+899
-1010
lines changed

.clang-format

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,28 @@ CompactNamespaces: false
4141
ContinuationIndentWidth: 2
4242
IncludeBlocks: Regroup
4343
IncludeCategories:
44-
- Regex: '^<cub'
44+
- Regex: '^<nvbench'
4545
Priority: 1
46-
- Regex: '^<thrust'
46+
- Regex: '^<cub'
4747
Priority: 2
48-
- Regex: '^<cuda'
48+
- Regex: '^<thrust'
4949
Priority: 3
50-
- Regex: '^<nvbench'
50+
- Regex: '^<cuda/'
5151
Priority: 4
52-
- Regex: '^<[a-z]*>$'
52+
- Regex: '^<cuda'
5353
Priority: 5
54+
- Regex: '^<nvml'
55+
Priority: 6
56+
- Regex: '^<cupti'
57+
Priority: 7
58+
- Regex: '^<nvperf'
59+
Priority: 8
60+
- Regex: '^<nlohmann'
61+
Priority: 9
62+
- Regex: '^<fmt'
63+
Priority: 10
64+
- Regex: '^<[a-z_]*>$'
65+
Priority: 11
5466
IndentCaseLabels: true
5567
IndentPPDirectives: None
5668
IndentWidth: 2

.devcontainer/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ CCCL uses [Development Containers](https://containers.dev/) to provide consisten
3434

3535
- Alternatively, use the Command Palette to start a Dev Container. Press `Ctrl+Shift+P` to open the Command Palette. Type "Remote-Containers: Reopen in Container" and select it.
3636

37-
![Shows "Reopen in Container" in command pallete.](./img/open_in_container_manual.png)
37+
![Shows "Reopen in Container" in command palette.](./img/open_in_container_manual.png)
3838

3939
4. Select an environment with the desired CTK and host compiler from the list:
4040

@@ -136,7 +136,7 @@ For more information, see the `.devcontainer/make_devcontainers.sh --help` messa
136136

137137
2. Install WSL 2 by running:
138138
```bash
139-
wsl --install
139+
wsl --install
140140
```
141141
This should probably install Ubuntu distro as a default.
142142

@@ -182,14 +182,14 @@ then run `sudo systemctl restart docker.service`.
182182
10. Open the CCCL cloned repo in VS Code ( `Ctrl + Shift + P `, select `File: Open Folder...` and select the path where your CCCL clone is located).
183183
184184
11. If prompted, choose `Reopen in Container`.
185-
185+
186186
- If you are not prompted just type `Ctrl + Shift + P` and `Dev Containers: Open Folder in Container ...`.
187187
188188
12. Verify that Dev Container was configured properly by running `nvidia-smi` in your Dev Container terminal. For a proper configuration it is important for the steps in [Install prerequisites and VS Code extensions](#prereqs) to be followed in a precise order.
189189
190190
From that point on, the guide aligns with our [existing Dev Containers native Linux guide](https://github.com/NVIDIA/cccl/blob/main/.devcontainer/README.md) with just one minor potential alteration:
191191
192-
13. If WSL was launched without the X-server enabled, when asked to "authenticate Git with your Github credentials", if you answer **Yes**, the browser might not open automatically, with the following error message.
192+
13. If WSL was launched without the X-server enabled, when asked to "authenticate Git with your Github credentials", if you answer **Yes**, the browser might not open automatically, with the following error message.
193193
194194
> Failed opening a web browser at https://github.com/login/device
195195
exec: "xdg-open,x-www-browser,www-browser,wslview": executable file not found in $PATH

.devcontainer/cuda11.8-gcc11/devcontainer.json

Lines changed: 0 additions & 46 deletions
This file was deleted.

.devcontainer/launch.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,4 +304,3 @@ main() {
304304
}
305305

306306
main "$@"
307-

.git-blame-ignore-revs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
#
1515
# Only add commits that are pure formatting changes (e.g. clang-format version changes, etc).
1616
8f1152d4a22287a35be2dde596e3cf86ace8054a # Increase column limit to 100
17-
17+
3440855dbd405db614861885ad1577fffd882867 # Initial addition of pre-commit.ci formatting.

.pre-commit-config.yaml

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# Copyright (c) 2025, NVIDIA CORPORATION.
2+
ci:
3+
autofix_commit_msg: |
4+
[pre-commit.ci] auto code formatting
5+
autofix_prs: false
6+
autoupdate_branch: ''
7+
autoupdate_commit_msg: '[pre-commit.ci] pre-commit autoupdate'
8+
autoupdate_schedule: quarterly
9+
skip: []
10+
submodules: false
11+
12+
repos:
13+
- repo: https://github.com/pre-commit/pre-commit-hooks
14+
rev: v5.0.0
15+
hooks:
16+
- id: end-of-file-fixer
17+
- id: mixed-line-ending
18+
- id: trailing-whitespace
19+
- repo: https://github.com/pre-commit/mirrors-clang-format
20+
rev: v19.1.6
21+
hooks:
22+
- id: clang-format
23+
types_or: [file]
24+
files: |
25+
(?x)^(
26+
^.*\.c$|
27+
^.*\.cpp$|
28+
^.*\.cu$|
29+
^.*\.cuh$|
30+
^.*\.cxx$|
31+
^.*\.h$|
32+
^.*\.hpp$|
33+
^.*\.inl$|
34+
^.*\.mm$
35+
)
36+
args: ["-fallback-style=none", "-style=file", "-i"]
37+
38+
# TODO/REMINDER: add the Ruff vscode extension to the devcontainers
39+
# Ruff, the Python auto-correcting linter/formatter written in Rust
40+
- repo: https://github.com/astral-sh/ruff-pre-commit
41+
rev: v0.8.6
42+
hooks:
43+
- id: ruff # linter
44+
- id: ruff-format # formatter
45+
46+
# TOML lint & format
47+
- repo: https://github.com/ComPWA/taplo-pre-commit
48+
rev: v0.9.3
49+
hooks:
50+
# See https://github.com/NVIDIA/cccl/issues/3426
51+
# - id: taplo-lint
52+
# exclude: "^docs/"
53+
- id: taplo-format
54+
exclude: "^docs/"
55+
56+
- repo: https://github.com/codespell-project/codespell
57+
rev: v2.3.0
58+
hooks:
59+
- id: codespell
60+
additional_dependencies: [tomli]
61+
args: ["--toml", "pyproject.toml"]
62+
exclude: |
63+
(?x)^(
64+
build|
65+
CITATION.md
66+
)
67+
68+
69+
default_language_version:
70+
python: python3

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ features:
3232
# Supported Compilers and Tools
3333

3434
- CMake > 3.30.4
35-
- CUDA Toolkit + nvcc: 11.8 and above
35+
- CUDA Toolkit + nvcc: 12.0 and above
3636
- g++: 7 -> 14
3737
- clang++: 14 -> 19
3838
- Headers are tested with C++17 -> C++20.

ci/matrix.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ llvm19: &llvm19 { name: 'llvm', version: '19', exe: 'clang++' }
3838
# Configurations that will run for every PR
3939
pull_request:
4040
nvcc:
41-
- {cuda: *cuda_prev_max, os: 'ubuntu22.04', cpu: 'amd64', compiler: *gcc11 }
4241
- {cuda: *cuda_curr_min, os: 'ubuntu20.04', cpu: 'amd64', compiler: *gcc7 }
4342
- {cuda: *cuda_curr_min, os: 'ubuntu20.04', cpu: 'amd64', compiler: *gcc8 }
4443
- {cuda: *cuda_curr_min, os: 'ubuntu20.04', cpu: 'amd64', compiler: *gcc9 }

0 commit comments

Comments
 (0)